[ADD][settings_improvement] backport from master
Merge pull request #9 from acsone/7.0-bp-settings-improvements

[ADD][settings_improvement] backport from master