Merge pull request #1651 from hafu/ffp-profile