Merge "Fix crash about Weather class in clocks" into tm-qpr-dev