merge from master, no more import custom rules from xml