test 7275a07c-3abf-4c04-979b-673c8061879c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue