Merge "Cleanup code that should never be null" into tm-qpr-dev