Progress with feature 1
Draft implementation of feature2
Merge branch 'feature2' into dev