merged branch osd.