pull request from wtsi master to devel (release 49.4)