Merge pull request #775 from tphoney/MODULES-7540