Merge "Fix input injection with zero coords" into tm-dev