See https://edms.cern.ch/document/3356091/1 for final version