test 318cebec-92e2-4f78-9e09-40786b388a3f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue