Merge branch 'feature/newtask' into development