Merge "Fixed defect CCSDK-1326"