test 37bbdfd1-99ee-41d3-a871-f07b1038bce4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue