CONTRIB-3782: Initial commit for 2.7 beta support.