Robertclancy/merge upstream