Update Uninstall
Merge branch '2.0'