test 1e6cd13d-3dbf-4302-9e32-a6b04ebfd9da (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue