Merge branch 'vn/diff-ihc-config'