PM
Merge branch 'minimal2' into minimal

Password management