This is a small addition to #9640 It improves performance by avoiding double lookup of the the key.
Attach a file by drag & drop or click to upload