Merge "Moved 5G+ PCO related code to data modules"