Merge branch 'master' into develop
Case 2868 - Removed 'name' attribute.
Case 2868 - Code review.
Merge branch 'case-2868' into develop

* case-2868:
  Case 2868 - Code review.
  Case 2868 - Removed 'name' attribute.
Merge branch 'develop'