Merge branch 'hb-fc'