Backport python 3 fixes from !785

Merge request reports

Loading