Follows Rec!2785 (merged) and LHCb!3468 (merged) and lhcb-datapkg/ParamFiles!45 (merged) and lhcb-datapkg/PRConfig!226 (merged)