1.11.1 minor fixes

Merged Melroy van den Berg requested to merge 1.11.1_minor_fixes into main

Merge request reports