Fix to avoid long split alignments.
Merge remote-tracking branch 'origin/master'