Merge "Fix LocalFileMoveBatch query that was incompatibile with Postgres"