inport wtsi-npg changes