Merge "Follow-up I9c7aa3b2 (b28c7a8): fix one more validation error"