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