Misc FoC fixes
Merge branch 'refs/heads/develop'