Merge "Fix NPE" into tm-dev