Merge "Increase freshness timeout" into tm-dev