Merge "Remove automatic rule icons" into oc-dr1-dev