Updated as UMCloud code specific changes.