test d3e88b41-4da7-4f11-9815-c74ec1b2132e (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue