Bring up to date with recent wtsi-npg changes