test 52f929a9-45e3-4da6-adf6-f955880fb2b2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote