Merge "Move the compose code to tm-qpr-dev (1/2)" into tm-qpr-dev