NH-2401
Implementation and simple unit test