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