Merge "Update clock position" into tm-dev