Merge "Add a note about extension version 2" into tm-dev