Merge latest changes from wtsi-npg