Merge "Rename constantValue* into fixedValue*" into main