merge back to OSD patch