Fix for CONTRIB-3945
Fix CONTRIB-3932