Changes introduced by AXIS2-5315 in r1349635 [1]