test 092e61fd-387d-4966-9162-89a4a982e3b6 (rebased onto develop)



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

----

This is a call to sandbox.open_pr