Merge "Worked on defect CCSDK-1793"