Merge branch 'develop' into case-2191
case 2191 - Code style.
Merge branch 'case-2191' into develop