Merge "Fix NPE" into tm-qpr-dev