$ 0 0 BUG: 501446(cherry picked from commit fc31698c)Co-authored-by: Jakob Petsovits jpetso@petsovits.com