*9002* Port fix for hard-coded CV IDs to master