test daf38937-6954-4dec-95df-4c5d9d9a1f22 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue