(OSD BRANCH) Sync with main and few more if defs
(OSD BENCH) Sync with main
(OSD BRANCH) now it is (nw)