Take "olddisplay" value into the account Fixes #14824 Closes gh-1566 Ref 73fe1729
Attach a file by drag & drop or click to upload
