(OSD BRANCH) Sync with latest changes (nw)