Case 2651 - Set proper classes.
Merge branch 'case-2651' into develop

* case-2651:
  Case 2651 - Set proper classes.