merge upstream/master v2.2.2