Fixed touch
Merge branch 'develop' into feature/function_templates