Merge "Fixed latency spike" into tm-qpr-dev