Merge "Add option to return a null Dagger graph" into tm-qpr-dev