Merge branch 'develop' into release-1.5.4
Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4
OC-2982: Update Settings