Merge branch 'while-bug-compatibility' into release-3.22

Merge-request: !7041