Merge upstream V0.99.8-WIP1