Merge "Introduce validation message"