Merge branch 'hotfix/v0.61'
Fix bug with date as maintag
Merge branch 'hotfix/v0.62' into develop