New upstream version: FFS 5.21