https://issues.jboss.org/browse/JGRP-1820 backported to 3.4