FR update.
FR update 2.
Merge pull request #1499 from 11RDP-LoupVert/patch-31

Patch 31