Fix FG derp
Merge branch '1710' into 1710_new-permissions