Merge pull request #2755 from xmcclure/disable-omit-fp