Merging CACORESDK_45_BRANCH changes