test a5a39ce2-232a-49c5-bd26-714dcec34854 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue