Outgoing extension dialing, display name not working

We have a mixture of Cisco 7942 and 7962s, and just recently our phones have stopped displaying the Name of the extension being dialed. For example if I dial 66022 my phone displays 66022 (66022), instead of Nav-Test (66022). So with the help of a colleague, we figured out that enabling Find Me/Follow Me on the extension (66022) fixed the display name issue. With FM/FM turned on, when I dial 66022, my phone displays Nav-Test (66022) correctly.

This started happening after FreePBX, Asterisk and all modules were updated. No other configuration changes were made. I've selected FreePBX version 14.0.13.21, but the actual version of our FreePBX is 14.0.13.23 (which does not show up in "Affects Version/s").

Did a packet capture and noticed some differences with FM/FM both disabled and enabled.

FM/FM Disabled
SIP/2.0 180 Ringing
Via: SIP/2.0/UDP 172.21.18.67:5060;branch=z9hG4bK3fbc08f2;received=172.21.18.67
From: “66008” sip:66008@10.50.160.81;tag=00260bd7db3400244680b498-148ee722
To: sip:66022@10.50.160.81;tag=as1eac74ec
Call-ID: 00260bd7-db34000d-c6fa6b10-014178ca@172.21.18.67
CSeq: 102 INVITE
Server: FPBX-14.0.13.23(13.29.2)
Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE
Supported: replaces, timer
Contact: sip:66022@10.50.160.81:5160
Remote-Party-ID: “Nav-Test” sip:66022@10.50.160.81;party=called;privacy=off;screen=no
Content-Length: 0

SIP/2.0 180 Ringing
Via: SIP/2.0/UDP 172.21.18.67:5060;branch=z9hG4bK3fbc08f2;received=172.21.18.67
From: “66008” sip:66008@10.50.160.81;tag=00260bd7db3400244680b498-148ee722
To: sip:66022@10.50.160.81;tag=as1eac74ec
Call-ID: 00260bd7-db34000d-c6fa6b10-014178ca@172.21.18.67
CSeq: 102 INVITE
Server: FPBX-14.0.13.23(13.29.2)
Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE
Supported: replaces, timer
Contact: sip:66022@10.50.160.81:5160
Remote-Party-ID: “66022” sip:66022@10.50.160.81;party=called;privacy=off;screen=yes
Content-Length: 0

So in this capture the first “Status 180 Ringing” shows Remote-Party-ID: “Nav-Test” which is correct. But then for some reason the second “Status 180 Ringing” changes to Remote-Party-ID: “66022”. Also noticed “screen”=no in the first 180 Ringing packet, then changes to “screen”=yes in the second 180. This traffic is being sent from FreePBX (10.50.160.81) to my desk phone (172.21.18.67). The server (10.50.160.81) for some reason is altering the RPID.

FM/FM Enabled
SIP/2.0 180 Ringing
Via: SIP/2.0/UDP 172.21.18.67:5060;branch=z9hG4bK0b95eb9f;received=172.21.18.67
From: “66008” sip:66008@10.50.160.81;tag=00260bd7db34049c70533a7e-66827c33
To: sip:66022@10.50.160.81;tag=as258bc2f5
Call-ID: 00260bd7-db34001e-1d7da114-5f5d4145@172.21.18.67
CSeq: 102 INVITE
Server: FPBX-14.0.13.23(13.29.2)
Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE
Supported: replaces, timer
Contact: sip:66022@10.50.160.81:5160
Remote-Party-ID: “Nav-Test” sip:66022@10.50.160.81;party=called;privacy=off;screen=no
Content-Length: 0

SIP/2.0 180 Ringing
Via: SIP/2.0/UDP 172.21.18.67:5060;branch=z9hG4bK0b95eb9f;received=172.21.18.67
From: “66008” sip:66008@10.50.160.81;tag=00260bd7db34049c70533a7e-66827c33
To: sip:66022@10.50.160.81;tag=as258bc2f5
Call-ID: 00260bd7-db34001e-1d7da114-5f5d4145@172.21.18.67
CSeq: 102 INVITE
Server: FPBX-14.0.13.23(13.29.2)
Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE
Supported: replaces, timer
Contact: sip:66022@10.50.160.81:5160
Content-Length: 0

In this capture the first “Status 180 Ringing” packet has the Remote-Party-ID: “Nav-Test”, but the second “Status 180 Ringing” doesn’t even include the Remote-Party-ID header at all. This traffic is also coming from FreePBX (10.50.160.81) to my phone (172.21.18.67). I've attached both packet captures to this issue.

Any help on this would be greatly appreciated. 

Thanks!