Merge branch 'salmon-native-keys' into 'develop'