BPC-228 fix
Merge branch 'develop' into refactoring