Merge pull request #1884 from chenBright/fix_double_delete_keytable