test 8629849c-0bd5-4b29-9b93-7c5f856a2e6f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue