changes to settings API introduced in 3.6.0

(cherry picked from commit 9d3ce360b0592c527d3476f2aadf69b4e8f37ab2)