SONAR-3893 Integrated last feedback on Highlightable API