backport calendar bugs