Merge branch 'fc/pull-cleanups'