Replace maxPreTransitDistance with maxPreTransitTime
Merge branch 'master' into experimental