Trap related changes
Resolved Merge Conflicts