Merge branch 'dev' into features/issue_176