4.x
Merge pull request #21797 from anna-khakimova:ak/merge3_extend_supported_types
Merge pull request #21475 from alexgiving:atrutnev/fix_tests