test 77ebb228-b68d-4f6f-a06e-2b7189bd5c6e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue