[ADD][settings_improvement] backport from master