Merge "remove NV_WAR defines"