Mass update:  CM sync, fixes for jizzer 4.4