Back porting BZ-1019378
Merge pull request #1366 from clebertsuconic/2.2.eap5

Back porting BZ-1019378