Merge branch 'bw/diff-metainfo-color' into next