Merge changes from original vault-api