BPC-279 fix
Merge branch 'develop' into BPC-278