Fix for #2446 for NSB version 4.0.x
Adding failing test for #2446
Merge branch 'hotfix-4.0.9'