#CEXT-59 fix
Merge remote-tracking branch 'remotes/origin/dev-lena-bn20' into Emil-Dev-BN20
Merge remote-tracking branch 'remotes/origin/dev-lena-bn20' into Emil-Dev-BN20
#CEXT-84 fixed
little fixes
Merge remote-tracking branch 'remotes/origin/Emil-Dev-BN20' into dev-lena-bn20