BC-6
BC-7
BC-8
Merge branch 'BC-7'
Merge branch 'BC-8'