Merge all cherry-picked patches into 24.0.42-patches
Following the request https://its.cern.ch/jira/browse/APR-165 applied MRs
to 24.0.42 to create a patch release
Following the request https://its.cern.ch/jira/browse/APR-165 applied MRs
to 24.0.42 to create a patch release