diff unfold
Merge pull request #7281 from skv-headless/diff-unfold

unfold commits