Merge FGSFDS branch, fix build