test 12471093-7d40-46b5-90a0-6cd23cd3aa0b (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr