Eliminate horizontal shifting on diff body heights
Merge pull request #2649 from tjeezy/patch-1

Eliminate horizontal shifting on diff body heights