BPC-272 fix
BPC-246 fix
BPC-223 fix
Merge branch 'BPC-256' into develop