1048-clear-validation-message
Merge commit '1048-clear-validation-message' into master