Case 3561 - Fixed parenthesis issues.
Case 3561 - Code review and cleanup.
Merge branch 'case-3561' into develop

* case-3561:
  Case 3561 - Code review and cleanup.
  Case 3561 - Fixed parenthesis issues.