Merge "Remove coordinate swapping in region sampling" into tm-qpr-dev