Merge pull request #1490 from clebertsuconic/2.2.eap5

release commits