test a8adb061-fb03-435d-bdcf-840c5da2bbae (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue