to avoid complexity it's better to set the new delay on the beggining of transition intervals.
merge origin/master