Merge branch 'nd/diff-apply-ita'