Dev Some memory optimization when sending invitations
Merge remote-tracking branch 'origin/master'