Merge branch 'ag/patch-header-verify'