Merge commit 'derived-keys'