The upgrade of the BESSY II light source in Berlin towards a variable pulse-length storage-ring will lead to complex bunch-filling pattern. This may involve co-existing electron bunches with significant variations their properties. Among many other conditions, it calls for bunch-resolved diagnostics sub-ps time resolution and micrometer spatial resolution. Currently, we are finishing constructi...