test e0ac3954-e1ee-49d2-9003-f4ef52a756d4 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue