test 8856bef0-4ac1-49f6-9dcb-1eb597bf11d1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue