Resolving #1245
Merged feature/1245-EmailAddress from git://github.com/mkl-eea-sk/ODCS.git