test 0ab92f21-5928-4550-8656-916e4fc4aede (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue