Ported LES material from branch master.