Merge branch 'dev' into ve-sprint-22
Merge branch 've-sprint-22' into VE-1341