Resolve #3491369 "Fix suite"

Closes #3491369

added 4 commits

• e7baca91...c330a4d9 - 3 commits from branch project:2.0.x
• 2aea82a2 - more fixes on normalization of slots

Compare with previous version

closed