ref: refs/heads/fix-fatel-error-for-0.9.8
