Added defaults to intervals.
Merge branch 'test' into dev