Settings stored at the Distributed level always have to be set directly
Merge branch 'release/2.48'