Merge "fixing rare NPE" into tm-qpr-dev