test 8a71bd44-8116-447f-9993-729842ee4711 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr