Merge branch 'jc/maint-split-diff-metainfo' into maint