commit with new testfeature enabled
Merge branch 'testfeature' into develop