Merge pull request #1859 from njm506/v3.0.x