Merge "DO NOT MERGE: Disable current matrix." into tm-dev