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