Merge "Bump SDK Extension version to 2" into tm-dev