test 2a5d8ab1-6b95-45a4-8a2b-b3f9fc943032 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue