test 337da822-35a8-43e4-b88d-3c2c4dbf1fb2 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr