Merge branch 'km/test-mailinfo-b-failure'