Remove DG -> FVM optimization.
Merge branch 'devel'