This is a redo of #11594 which got reverted in #11940 It improves performance by avoiding double lookup of the the key.
Attach a file by drag & drop or click to upload