SONAR-5007 Add inheritance and available since criteria