Always use settings cache
Merge branch 'upstream'