Add Constants class.
Merge branch 'master' into develop