Merge branch 'feature-verification'