test dd0b1007-d916-4fea-987a-2b03ee5277d4 (rebased onto develop)



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

----

This is a call to sandbox.open_pr