Merge branch 'dryad-dev' into tmp