Merge "Make sure calendars are compared correctly." into lmp-dev