2.0.25 Add no-moderm option
Merge branch '2.0.25'