Merge "Fix suggestion crash if parser fails to parse dismiss rule" into oc-mr1-dev