Merge "Add scenario test for trunk E2E flow"