Merged branch for review with calendar error