test 09a074d5-0c48-4139-ac6e-318b2955bc10 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue