Merge "Prefer Executor injection" into tm-qpr-dev