Temporarily removed jacoco because of build failure on sonar
Merge remote-tracking branch 'origin/master'