Adding Exception filter (IHM)
Merge with upstream