Merge pull request #1907 from virgofx/v3.0.x