Fix bug
Merge branch 'feature-results' into develop
Merge branch 'develop'