Fix incompatible type conversion errors
release-2.x.y
3 months ago, Elliott Sales de Andrade