Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5