8.0 merge upstream changes