Hello

I am running Freeswitch Version 1.6.20+git~20180507T185611Z~43a9feb7f8~64bit
The goal i want to achieve is to send only PAI + Privacy headers to my traffic terminator.

The problem i have to deal with is that in some circumstances PPI header is send instead.
My configuration is:

...
<action application="set" data="origination_privacy=screen"/>
<action application="bridge" data="{max_forwards=70,originate_timeout=180,sip_contact_user=Test,ignore_display_updates=true,sip_cid_type=pid}sofia/gateway/terminator/+$1"/>
...

The issue is when incoming INVITE has RPID with screen=no. when FS send PPI out instead of PAI.
- Remote-Party-ID: "49111223344" <sip:49111223344@a1.b1.c1.d1>;privacy=off;screen=no

- Privacy: none
- P-Preferred-Identity: <sip:49111223344@a1.b2.c2.d2>

What can i do to achieve my goal?
Do i need to tune my configuration? 

It is said https://freeswitch.org/confluence/display/FREESWITCH/sip_cid_type that "you must set privacy flag, otherwise P-Preferred-Identity will be inserted instead of P-Asserted-Identity.", but as you see origination_privacy flag is set to screen.

Thanks in advance
Mac