Merge "Fix the edge rules for esr"