Merge branch 'master' into feature_reproject
Merge branch 'feature_reproject' into prerelease