Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5' * commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5': check for native initialization before calling public function