Merge "Remove KtR workaround" into tm-qpr-dev