Working on content intervals
Merge branch 'develop'