Fix condition.

Closes #2885413

added 10 commits

• d5b692a7...59fe8f47 - 8 commits from branch project:11.x
• 5263fb91 - restore
• bac2bb54 - add more testing

Compare with previous version

added 1 commit

• 442d4f2b - add more testing

Compare with previous version

added 206 commits

• 442d4f2b...e39157a2 - 204 commits from branch project:11.x
• 5c08895f - restore
• 981bb6cd - add more testing

Compare with previous version

added 1 commit

• 47fba6b6 - Add return type hints

Compare with previous version