Extend use of constants
Merge remote-tracking branch 'origin/dej-branch'