test f0ba312b-4086-43ef-959c-acde8d689e95 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue