t651 added a minimal validation
Merge branch 't651' into resolved