Issue #3407697: Fix eslint in 2.x branch (follow-up)

Closes #3407697

added 2 commits

• 54d10045 - 1 commit from branch project:2.x
• 5a57324c - Merge branch '2.x' into '3407697-fix-eslint-in'

Compare with previous version

changed title from Resolve #3407697 "Fix eslint in" to Issue #3407697: Fix eslint in 2.x branch (follow-up)

started a merge train

merged