Merge pull request #865 from tphoney/FM-7709