Several small improvements

See the individual commits for details.

Merge request reports

Loading