upgrade to ve-v1.1
merge upstream