Backported https://issues.jboss.org/browse/JGRP-1639