test 38bda1dd-53d8-4e71-bfec-7b7d36ec3468 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue