test ddd9f492-7cc1-4ac5-8585-b6b2644ad860 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote