Fixed outbox delegation bug
Merge branch 'outbox-delegation-fix'