enable again the test
Merge remote-tracking branch 'origin/master' into first_increment
Merge branch 'first_increment'