Adding some fake locked traps
Merge remote-tracking branch 'origin/master'