Merge branch 'develop' into case-2162
case 2162 - Widget styles are fixed.
Merge branch 'case-2162' into develop