Merge "do strict validation before domain conversion"