Merge branch 'encrypted_secrets' into local