[12351] Calendar, improve [12350]. I was not happy with pushed version.