Merge branch 'userdataschema-caching' into master-qg