Merge branch 'osd'