Merge remote-tracking branch 'remotes/elmarco/tags/prop-ptr-pull-request' into staging