Set ignore_cached_sublayers to true
Merge branch 'master' into dev