extend
merged with edition in net cafe
Merge remote-tracking branch 'origin/cafedev'