Final commit for OGDI DataLab v6