test 598164bc-bca6-447f-94e2-df48736a853d (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr