feat(time coupled): Change lead and lag time handling

feat(time coupled): Change lead and lag time handling #4027