Updates #18542 (TDB 335.63 DBerrors) (cherry picked from commit 00329fe9a505c437af0b7591d8321bf3b77ad7fb)