SONARJAVA-271 Update according to Ann's feedback