Adding some old changes, need to check what is fine and what is not, check the diff
after pull
Merge branch 'trigger_zone_tool' into dev