Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2021-05-12' into staging