CS/FQA-669 + CS/FQA-670 CS/Calendar/Group calendar + Personal Calendar