Merge branch '826-jbm-masa-cna-and-cng-not-in-sync-with-non-jbm-decoding' into 'main'

[Non-BE] Resolve "JBM MASA: CNA and CNG not in sync with non-JBM decoding"

See merge request !1112