Merge remote-tracking branch 'origin/pr/123'
reintroducing Passphrase Encryption Services
This reverts commit f9a02e479c2b06b01046280df073d68941050845.