Patch Pilot Hand-off 25.04

I spent my time on the sponsoring report code base instead and reviewed the open two merge requests: