Merge all other changes by csupsup