Merge "Fixed duplicate constant"