Merge pull request #760 from david22swan/FM-6956