Merge tag 'bcs' into develop

bcs
bcs2
Merge branch 'release/bcs2'