Removed unnecessary constant
Merge branch '4.0'