Merge with release-2.x.y.

2019-05-19, Elliott Sales de Andrade