SONAR-3755 refactor comments
Fix insertion of action plans