Backports from a few merge requests

Edited by Cory Quammen

Merge request reports

Loading