Merge "Fixing input coordinates discrepancy" into tm-qpr-dev