test 16c21022-af8c-4ec2-93e2-91df256641a2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue