CRYPT-PW support
Merge branch 'crypt-pw'

* crypt-pw:
  CRYPT-PW support