test 523e9bbb-ad40-4869-81e0-4a3fc22f1b96 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote