defender and code drying (defender)
Merge branch 'defender'