See LHCb!3126 (merged) LBCOMP-23, run2-patches version of !541 (merged)
Requires Analysis!837 (merged) Stripping!1677 (merged)