Improve validation fail messages
2.5.14
Merge remote-tracking branch 'upstream/master'