Prep for removing hack
Merge branch 'feature/remove-hacky-calendar' into develop
Merge branch 'release/1.4.5'