AVISIMPL-338 Calendar view for batch: Rework after review CR-NEWSPAPER-152.