Merge branch 'jn/ancient-meld-support' into maint