Code

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