Merge pull request #1711 from clebertsuconic/2.4.x

fixing dependencies broken