4803. [bug] Backport fix for RT #46055 from RT #46267. [RT #46430] (cherry picked from commit 406caf7b9c)
406caf7b9c