Test location mapping that allows for offline testing.
Merge branch 'develop' into my-develop