test d0556638-1e66-4245-9c9b-92304f93acd1 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr