merging latest changes in trunk