Fix - CONTRIB-3876