Merge pull request #858 from loiccouturier/master

Enhance product FO for simple and variant
Enhance product FO