Merge "Modify rule manager common component"