Fixed conflict with constant names
Merge origin/master