test 7d36597b-2081-41c7-aad4-3cb1f03ecf07 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote