Merge "Apply parameterized annotations first." into tm-dev