(OSD BRANCH) Sync with main and few more if defs