Merge pull request #1962 from clebertsuconic/2.3.x

Release