Added FIXMEs for start/duration calculations in API
Merge branch 'master' into builds
7.133