Merge pull request #1991 from spaetow/v3.0.x