test 20078c13-a4f8-4349-b93c-74f4cdd490c3 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue