test fdebbb85-caa5-40f6-b47d-0f2fcc76e8d5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue