JGRP-1793
Merge pull request #124 from rachmatowicz/JGRP-1793

JGRP-1793