Add repro test for NH-3408
Fix for NH-3408 based on collection mapping information
Refactoring of contributed code
Add more tests for NH-3408