test 6f0502d5-6a82-4b26-8730-5a2fee4f18a5 (rebased onto develop)



This is the same as gh-318 but rebased onto develop.

----

This is a call to SandboxTest.open_pr