SONAR-5417 Fix manual measures