Merge remote-tracking branch 'cvpcs/cm4dx_gingerbread' into gingerbread