remerge of new stuff from duff branch