[UPGRADE] To version 8.0