Fix for TRUNK-3836