Merge branch 'cherry-pick-526faae9-21.3' into '21.3'

Sweeping !20329 from 21.1 to 21.3.
Fix hang due to unfortunate convergence of input settings

See merge request atlas/athena!20358

(cherry picked from commit 22dfd268)

c2e6ed2c Merge branch '21.1-zf' into '21.1'