test 63bff405-a917-40b2-9520-33d0ac9a0d3e (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue