HUB-451 and HUB-340

resolve the story

nb: no jar released