merged some additional changes from seam trunk