ca0c5b1 overrides: merge relevant changes from default-settings 5.1.2

Authored and Committed by decathorpe 5 years ago
    overrides: merge relevant changes from default-settings 5.1.2