Updating support folder
Merge branch 'dev' into feature/conditions