test d2134429-b755-4cc9-87c3-8313fd01b27d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue