Merge "Unify code for scenario v0.2 v0.3"