Merge "C2DCC: Fix wrong function pointer"