Fix - CONTRIB-3846