test fe8dde02-7a5e-447a-80fa-4440c0f4529d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue