Merging latest changes from base.