Fixes duration field delegate issues
Merge branch 'master' into builds
7.358