Merge branch 'master' into bug/prefetchquery-force