Merge branch 'hotfix/TE-121'
CX-134 change password key
Merge branch 'hotfix/CX-134' into develop