Mull changes from wtsi-devel