CW-463 and more things
Merge remote-tracking branch 'origin/develop-theme' into release-R1-bugfix-S4