test 677fc6f0-1f94-4108-bdf4-625498baa4c9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue