test 39cd55f9-09ae-4056-8d72-cb127d4bdda5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue