settings now not cached anymore
Merge branch 'release' into develop