Merge "Postpone getting Metrics Category until it is needed" into tm-dev