fix interval
Merge branch 'master' into customizations