Merge "Back port 0.8.0 fixes of function prototypes." am: 39ce2e3068 * commit '39ce2e3068b3270a435c2a5915408f5136e91371': Back port 0.8.0 fixes of function prototypes.