Merge "Fix labels loading regression" into tm-qpr-dev