Merge "Fix in e2e activation flow for option1"