Merge "Scenarios: cleanup class scope variable usage"