Merge recent changes from wtsi-npg:devel