test 721b9629-7a58-4634-9c0a-1129209f7bd3 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue