Fix validation agreement check
Merge branch '3.7'