Merge "Ignoring failing test" into tm-qpr-dev