Patch misc

Commits for #5476 (closed) and a few minor things I ran into.

Merge request reports

Loading