Merge pull request #1982 from alejandro-perez/v3.0.x