Merge pull request #1650 from hafu/ffp-profile