changes to settings API introduced in 3.6.0

(cherry picked from commit 641f69b70496428cda4856fba918d85d467aa30f)