test 48c15b37-e90d-42da-bfef-fc08f77b20f2 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue