Merge pull request #796 from david22swan/MODULES-7827