Fix ConstantTags
Merge.
merge