PIM-3325 : skip unrelevant scenario ?