Serve stale improvements (9.16)

Matthijs Mekking requested to merge ondrej-serve-stale-improvements-v9_16 into v9_16

Merge request reports