Merge "Simiplifying the Parner override definition so that it can be used for multiple overrides" into tm-qpr-dev