merged with trunk