5G SA mode (not detecting available cell)

I just built libqmi and ModemManager from master and I'm seeing an issue on a Quectel RM500Q modem (configured for 5G SA only). MM does not detect that the modem is in fact camping on a 5G cell and will not allow a connection attempt to be made. It will work correctly if the modem is configured for 5G NSA and is using LTE as an anchor. Attaching MM debug log and below are some snippets from qmicli. The modem connects just fine using wvdial and PPP, but throughput is not what I'm expecting :-) Is there a quick way to workaround this? Thanks

root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-cell-location-info 
error: couldn't get cell location info: QMI protocol error (13): 'NoNetworkFound'
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-home-network 
[/dev/cdc-wdm0] Successfully got home network:
	Home network:
		MCC: '240'
		MNC: '96'
		Description: '240 96'
	Network name source: mcc-mnc
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-rf-band-info 
[/dev/cdc-wdm0] Successfully got RF band info
Band Information:
	Radio Interface:   '5gnr'
	Active Band Class: '(null)'
	Active Channel:    '40224'
Band Information (Extended):
	Radio Interface:   '5gnr'
	Active Band Class: '(null)'
	Active Channel:    '630048'
Bandwidth:
	Radio Interface:   '5gnr'
	Bandwidth:         '(null)'
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-serving-system 
[/dev/cdc-wdm0] Successfully got serving system:
	Registration state: 'registered'
	CS: 'detached'
	PS: 'attached'
	Selected network: 'unknown'
	Radio interfaces: '1'
		[0]: '5gnr'
	Roaming status: 'off'
	Data service capabilities: '0'
	Current PLMN:
		MCC: '240'
		MNC: '96'
		Description: ''
	Roaming indicators: '1'
		[0]: 'off' (5gnr)
	Detailed status:
		Status: 'available'
		Capability: 'ps'
		HDR Status: 'none'
		HDR Hybrid: 'no'
		Forbidden: 'no'
	Full operator code info:
		MCC: '240'
		MNC: '96'
		MNC with PCS digit: 'no'
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-signal-info 
[/dev/cdc-wdm0] Successfully got signal info
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-signal-strength 
[/dev/cdc-wdm0] Successfully got signal strength
Current:
	Network 'none': '0 dBm'
IO: '-106 dBm'
SINR (8): '9,0 dB'
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-system-info 
[/dev/cdc-wdm0] Successfully got system info:
	WCDMA service:
		Status: 'none'
		True Status: 'none'
		Preferred data path: 'no'
	LTE service:
		Status: 'none'
		True Status: 'none'
		Preferred data path: 'no'
		Registration restriction: 'unrestricted'
	SIM reject info: 'available'
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-system-selection-preference 
[/dev/cdc-wdm0] Successfully got system selection preference
	Emergency mode: 'no'
	Mode preference: 'cdma-1x, cdma-1xevdo, gsm, umts, lte, td-scdma'
	Disabled modes: '(null)'
	Band preference: 'bc-0-a-system, bc-0-b-system, bc-1-all-blocks, bc-2, bc-3-a-system, bc-4-all-blocks, bc-5-all-blocks, gsm-dcs-1800, gsm-900-extended, gsm-900-primary, bc-6, bc-7, bc-8, bc-9, bc-10, bc-11, gsm-450, gsm-480, gsm-750, gsm-850, gsm-900-railways, gsm-pcs-1900, wcdma-2100, wcdma-pcs-1900, wcdma-dcs-1800, wcdma-1700-us, wcdma-850-us, wcdma-800, bc-12, bc-14, bc-15, wcdma-2600, wcdma-900, wcdma-1700-japan, bc-16, bc-17, bc-18, bc-19, wcdma-850-japan, wcdma-1500'
	LTE band preference: '1, 2, 3, 4, 5, 7, 8, 12, 13, 14, 17, 18, 19, 20, 25, 26, 28, 29, 30, 32, 34, 38, 39, 40, 41, 42'
	LTE band preference (extended): '1, 2, 3, 4, 5, 7, 8, 12, 13, 14, 17, 18, 19, 20, 25, 26, 28, 29, 30, 32, 34, 38, 39, 40, 41, 42, 66, 71'
	TD-SCDMA band preference: 'a, b, c, d, e, f'
	Roaming preference: 'any'
	Network selection preference: 'automatic'
	Service domain preference: 'cs-ps'
	GSM/WCDMA acquisition order preference: 'automatic'
	Usage preference: 'data-centric'
	Voice domain preference: 'ps-preferred'
	Registration restriction: 'unrestricted'
	Acquisition order preference: 5gnr, lte, umts
root@hummingboardpulse:~/code/libqmi# qmicli -p -d /dev/cdc-wdm0 --nas-get-technology-preference 
[/dev/cdc-wdm0] Successfully got technology preference
	Active: 'auto', duration: 'power-cycle'
	Persistent: '3gpp, cdma-or-wcdma, lte'