JGRP-1796

For details: see https://issues.jboss.org/browse/JGRP-1796