test a42aea67-5d12-4984-b53a-ef155f77b152 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue