Merge "Use NMS calculation of fixed importance" into tm-dev