Pushed to upstream

cc/ @arboliveira @sergiogonzalez @marcellustavares.  Fixed PingbackMethodImplTest tests. As it is very coupled to string messages, won't it be better to create constants or maybe custom exceptions? Thanks\!