Merge branch 'bw/diff-metainfo-color'