Second attempt and better approach to year intervals
Merge branch 'develop' [ci skip]