Calendar rebase (4) 

This replaces #1352.
Changed.