Merge branch 'refactor/keys' into 'develop'