Updated for compilation on 17.0-rc1

Was adopted for compilation on both R16XX and 17.0-rc1