NH-3048
Added unit test
Merge branches 'gh-321' and 'gh-322'