Merge "Calendar DB upgrade"