test 22f2421f-413f-4383-9ff1-a54613912b83 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue