pull changes from wtsi devel