test cc0a5f14-730b-4bb4-a41b-687b39d7e61c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue