Calendar value pr3

This replaces #1352.