Merge branch 'jn/maint-test-merge-verify-parents'