Jjgarcia/merge upstream