FQA-1297: Update calendar common functions