Merge branch 'prod'
Merge branch 'prod'
Add method delete_rule