Merge branch 'BC-9'
Merge branch 'BC-10'
Merge branch 'BC-12'
Merge branch 'BC-13'
Merge branch 'master' into dev