Merge pull request #1551 from clebertsuconic/2.3.x

release 2.3.17