test 6c1f4a43-bbf8-4521-ab95-c361e5fa4890 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue