Merge branch 'STT-1463-warn-on-assigned-isr-cd-update' into 'main'

STT-1463 warning provided and change reject if a conflict declaration is changed after...

See merge request !924 (merged)

(cherry picked from commit 5f68fa64)

65b08fac warning provided and change reject if a conflict declaration is changed after...