Enhance product FO
Merge pull request #860 from loiccouturier/master

Enhance product FO