SONAR-3893 Fixed snapshot data persistence issue