Merge branch 'master' into key-storage-work