code-coverage disabled because of a bug when running in war mode
Merge branch 'develop'