test e87de579-f9be-4c68-aef2-902b7a9c6308 (rebased onto develop)



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

----

This is a call to sandbox.open_pr