test bdd98001-6b1b-4148-a13d-03977da55e46 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue