Pw generation update
Merge branch 'next' of github.com:bartv/imp-std into next