Calendar hotfixes

Merge the relevant calendar hotfixes to development (and I guess also update the changelog?)