Merge branch 'feature/myfeature' into develop
commit 4