Merge branch 'nag_snr_prompt' into 'master'

Fix NAG.SNR prompt in config mode

See merge request !6894

(cherry picked from commit b898fe11)

5bc7380d Fix NAG.SNR prompt in config mode
cf69a090 Fix prompt
6 jobs for !6907 with cherry-pick-b898fe11 in 14 minutes and 34 seconds (queued for 4 seconds)
latest merge request