Merge "Removing some obsolete features" into tm-qpr-dev