Merge "Clocks were switching too frequently" into tm-dev