Merge pull request #1499 from clebertsuconic/2.3.x

release tag