JEN-26 Add CLIENTIDENTIFICATION
Merge branch 'master' into JEN-26
JEN-26: add CLIENT_IDENTIFICATION
Merge branch 'JEN-26' into develop