test 52ce3331-df84-4617-8abd-d6071b1510f5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue