Merge pull request #7386 from daverodgman/timing_alignment-2.28

Backport 2.28 - Timing alignment