SONAR-5189 Temporary fix of persistIt bugs