Merge pull request #1475 from clebertsuconic/2.3.x

2.3.x revert and new release commit