Issue #3516604 Check for overrides before looping over them

Closes #3516604

added 6 commits

• b30823ac...16d45dc9 - 5 commits from branch project:1.2.x
• 18f1afa7 - Issue #3516604 Check for overrides before looping over them

Compare with previous version

added 4 commits

• 18f1afa7...1f3595eb - 3 commits from branch project:1.2.x
• c8b9576d - Issue #3516604 Check for overrides before looping over them

Compare with previous version

added 1 commit

• 0b0a936f - Add comment

Compare with previous version

merged