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