Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev