Merge branch 'dev/rename-keys' into for-chris-4.6