Merge branch 'hotfix/BUG_TRAPS'