Merge "Revert "Fixed outgoing permitted logic""