Manual Backport of #710
Merge pull request #739 from Gomez/stable7

Manual Backport of #710