test 28fe0a2d-ae0e-415d-9a4e-23e047dff9cb (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue