Fix for TRUNK-3818