Merge branch 'jk/function-pointer-mismatches-fix' (early part)