FQA-1297: Fix bug of Calendar and commit