test 61d80d4b-9734-4d9d-be0f-e61ab88150b4 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr