test 5ac62b21-a3e7-4fe0-9790-0876b248e120 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue