follow up from https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC3785709
merged
mentioned in commit 00671a13