Reduce queries for settings
Merge branch 'refs/heads/2.3/develop' into 3.0/develop