test 839500ee-a8d0-4ab5-ad02-9ddd042dc103 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue