Merge pull request #788 from david22swan/MODULES-1630