merging addCorineConstants
cherry pick merge