Merge branch 'paddatrapper-attack'
attack implementation