Merge "Ensure configuration is not null." into tm-qpr-dev