Merge "Validate ids"