Fix for CONTRIB-4691