add saving pw local if author has a local key
Merge remote-tracking branch 'origin/dev' into dev