test 2fd0179e-66ec-417e-b585-9b814ae75bbf (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue