Merge pull request #1948 from clebertsuconic/2.2.eap5

release 2.2.30