module service and member services
Merge remote-tracking branch 'origin'