Merge branch 'dev' into testing
Removed useless variable
Merge branch 'dev' into testing
Merge branch 'dev' into testing
Merge branch 'dev' into testing
Unused variable, yet