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