Merge upstream with raintank fork