merge upstream/0.50