exactly fix npe if APIImpl 180
Merge remote-tracking branch 'origin/master'