test 162a1408-0871-4225-975e-f1d2cdad49de (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue