Merge "[CPS] CPS Core Image Update"