Merge remote-tracking branch 'remotes/origin/Emil-Dev-BN20' into dev-lena-bn20
#CEXT-61 comment -
Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev-BN20
fixes