Merge "Add microversion support in scenario tests"