pulling from upstream into wtsi-hgi:master