Merger: modularized
Merge remote-tracking branch 'origin/new' into new