Add support for non_local_traffic
Merge branch 'non_local_traffic' into additional-plugins