FALCON-418 FALCON-395 introduces a regression with hadoop-1. Contributed by Jean-Baptiste Onofré