BC-6
BC-7
BC-8
Merge branch 'BC-7' into dev
Merge branch 'BC-8' into dev
Merge branch 'BC-7'
Merge branch 'BC-8'
Merge branch 'master' into dev