refactor and remove disable function and add resend function for org
Merge remote-tracking branch 'origin/master' into nnmaster