Fix the issue with custom intervals
Merge branch 'AEROGEAR-869'