Rename source-ipv4-address to network-ipv4-address and source-ipv6-address to network-ipv6-address and apply this option in both directions to allow overwriting network address in upstream as well.
+ add traffic stream docu + add session accounting stats + ...