merged last upstream changes