adopted latest version of docommon