Settings stored at the Distributed level always have to be set directly
Merge remote-tracking branch 'refs/remotes/origin/release/2.48' into release/2.48