Sweeping !20358 from 21.3 to 21.9. Sweeping !20329 from 21.1 to 21.3.Fix hang due to unfortunate convergence of input settings
Sweeping !20329 (merged) from 21.1 to 21.3. Fix hang due to unfortunate convergence of input settings
See merge request !20358 (merged)