test 8d506e0a-df19-47de-9dfc-221050950f31 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue