type diversity breaks alignment
Merge pull request #8457 from behzadnouri/align-rhs

BUG: type diversity breaks alignment