Diesel

Rework of #7151