Preparing develop branch to merge with calendar branch