[develop2] Improve settings.rm_safe()
#12379
+41
−11
Merged
settings.rm_safe()
#12379