Issue #2941029 by Jon Pugh: Merge remote-tracking branch 'origin/2941029-platform-wide-settings' into 7.x-3.x