Fix merge bug
Merge branch 'feature/issue_1' into develop