Fixing gustavo issues
Merge branch 'master' into delayed_send