test a6bde8b9-daca-41e7-975e-4a4aa6400566 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr