The same bug fix with !56011 (merged) for master and 22.0. Tagging @mswiatlo @camacho @jcantero @jveatch