test ef9ffc29-9c57-4502-85df-eae8a923559a (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue