Merge remote-tracking branch 'remotes/kraxel/tags/queue/misc-pull-request' into staging