test bc2d214e-9810-46f1-97b0-3bc4b6243cc1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue