Various improvements

One fix - one commit. No P11 related stuff.

Merge request reports

Loading