Fix "Constants" merge error
Merge branch 'fix-merge-error'