Merge in latest sdo-venkman changes