CX-134 change password key
Merge branch 'hotfix/CX-134'