Unofficial CM7 2.3.7