#CEXT-24 #CEXT-20 Fixes
Merge remote-tracking branch 'remotes/origin/Dev-Lena' into Emil-Dev