test 5b674b52-0d64-4f74-bab6-cf492a2a458f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue