Merge "Adding an id to the resolve grid item" into tm-qpr-dev