Merge branch 'BC-7' into dev
Merge branch 'BC-8' into dev
Merge branch 'master' into dev
BC-11
Merge branch 'BC-11-URGENT'