Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-04-29' into staging