Backport Http method override listener and increase coverage