Merge "Fixed defect CCSDK-1610"