Merging some file and package changes