Merge branch 'verify-trigger'