Merge "Fix issue with loading rules properties"