Merge "Add null-safety checks" into tm-qpr-dev