Merge pull request #1684 from clebertsuconic/2.3.x

release 2.3.20 commit