CONTRIB-3782: Initial commit for 2.6 support.