Synchronizing definitions with DUNE master (@imc/1ac4134).