VE-1337 Fixes from CR - indentation
Merge branch 'VE-1337'