New upstream: FFS 5.16