Merge remote-tracking branch 'remotes/elmarco/tags/leaks-for-2.7-pull-request' into...