test 90a896ed-52f9-4ead-8e8d-d73ae9b1052b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue