test 16e5d4af-d0a6-4a86-93b2-6a13a77c9bbd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue