Merging codeo changes from caCORESDK_45_BRANCH into master