Backport 1028, 1029, 1033 to 10.1.x

Backport bug fixes as preparation for 10.1.6 release:

Edited by Anton Joubert

Merge request reports

Loading
Loading