7.0 lsv dd

Merge last changes.