Merge "Implementing TIP1." into tm-dev