test df051f92-1ce9-42ba-82fb-181f7d3e1c8f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue