Merge in changes from wtsi-npg/devel