DOL-98 : Added string value to enum constants.
Merge remote-tracking branch 'origin/master'