Merge "after users modify rules, update all ACs and Subrule in the rules"