Merge branch 'bssgp_fc'