Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging