Support latest savanna-commons