Merge pull request #1337 from clebertsuconic/2.2.x

2.2.x
Back porting BZ-1019378