Merge pull request #5442 from lvoegl/validation-error-popup-message