merged in comments from osg default