Merge "Adding rules to preferences"