test 303e4ad1-460b-4766-84b8-c0c57eafa2d8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue