Merge pull request #1514 from gbeaudoin78/v3.0.x