CA2E upgrade - issue with *DSNR mode