Server deliverables for F23