New upstream versions: FFS 5.17 & 5.18