Merge branch 'STT-1496-1533-isr-filters-update' into 'main'

STT-1496-1533 redo for isr

See merge request !925 (merged)

(cherry picked from commit 18dc89c5)

934c028c warning provided and change reject if a conflict declaration is changed after...