20220402 REMOVE S3A7949 Enhanced NR Edit