I think F.S.E. should come, not in 5.8 or 5.9, but in WordPress 6.0.