test 21b034e0-3a37-4c65-8414-42b78a9f4c5f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue