Merge "Use setIdentifier instead of dynamic categories" into tm-qpr-dev