Merge PrelRules refactoring (#7014)