Added required functionality to the calendar introduced by MDL-41792