Updates from wtsi-npg/devel