Merge branch 'optimize_c_code' into next