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