Merge pull request #1558 from pwdng/v3.0.x