Pull changes from wtsi devel