Merge "Fixing cps_poc branch name"