Merge branch 'master' into auth-preference