Merge branch 'fc/cleanups'