(OSD BRANCH) Sync OSD with main branch