test c557e29c-8f02-4812-a0f5-a703dab9b675 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue