Merge pull request #1047 from hafu/ffp-profile