test 3c0e0397-099d-45a7-b141-e62b795d5fbd (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue