CNULL and CVOID update

CNULL and CVOID update