test 3a3f8288-7268-46e3-939a-343c440b95de (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue