Merge pull request #1454 from clebertsuconic/2.3.x

back porting committs from master