Backported verification fixes from 1.4.3-cvs