test eb36211b-8e0d-4863-aef4-d5ff4f1f202f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue