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