case 3616 - Style fixes.
Merge branch 'case-3616' into develop