NH-2823

NH-2823 with unit test