Latest changes from wtsi-npg