Diff headers made sticky.
Merge pull request #7611 from yglukhov/sticky-diff-headers

Diff headers made sticky.