case-3853 - Position of ding entity buttons
case-3853 - Module fixes
Merge branch 'case-3853' into develop
Merge branch 'develop'