(Refactoring) Make constant class
Merge remote-tracking branch 'origin/origin' into origin