diff --git a/platform/configuration-store-impl/src/ProjectIdManager.kt b/platform/configuration-store-impl/src/ProjectIdManager.kt
index 9616a1a04b1a..e6c7ad1f0b30 100644
--- a/platform/configuration-store-impl/src/ProjectIdManager.kt
+++ b/platform/configuration-store-impl/src/ProjectIdManager.kt
@@ -1,11 +1,11 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.configurationStore
 
 import com.intellij.openapi.components.*
 import com.intellij.openapi.project.Project
 import com.intellij.util.xmlb.annotations.Attribute
 
-@State(name = "ProjectId", storages = [(Storage(StoragePathMacros.WORKSPACE_FILE))])
+@State(name = "ProjectId", storages = [(Storage(StoragePathMacros.WORKSPACE_FILE))], reportStatistic = false)
 internal class ProjectIdManager : SimplePersistentStateComponent<ProjectIdState>(ProjectIdState()) {
   companion object {
     fun getInstance(project: Project) = project.service<ProjectIdManager>()
diff --git a/platform/credential-store/src/PasswordSafeSettings.kt b/platform/credential-store/src/PasswordSafeSettings.kt
index 06a3a7289d84..84e7a957616f 100644
--- a/platform/credential-store/src/PasswordSafeSettings.kt
+++ b/platform/credential-store/src/PasswordSafeSettings.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.credentialStore
 
 import com.intellij.ide.passwordSafe.impl.getDefaultKeePassDbFile
@@ -10,7 +10,7 @@ import com.intellij.util.text.nullize
 import com.intellij.util.xmlb.annotations.OptionTag
 
 @Service
-@State(name = "PasswordSafe", storages = [Storage(value = "security.xml", roamingType = RoamingType.DISABLED)])
+@State(name = "PasswordSafe", storages = [Storage(value = "security.xml", roamingType = RoamingType.DISABLED)], reportStatistic = false)
 class PasswordSafeSettings : PersistentStateComponentWithModificationTracker<PasswordSafeSettings.PasswordSafeOptions> {
   companion object {
     @JvmField
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
index c7b872dfc730..5886bae3ded6 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
@@ -59,7 +59,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.function.IntPredicate;
 
-@State(name = "FileBasedIndex", storages = @Storage(StoragePathMacros.CACHE_FILE))
+@State(name = "FileBasedIndex", storages = @Storage(StoragePathMacros.CACHE_FILE), reportStatistic = false)
 public final class StubIndexImpl extends StubIndexEx implements PersistentStateComponent<StubIndexState> {
   private static final AtomicReference<Boolean> ourForcedClean = new AtomicReference<>(null);
   static final Logger LOG = Logger.getInstance(StubIndexImpl.class);
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
index db12b2bcbb0c..f26d9d8ebdbb 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
@@ -51,7 +51,7 @@ import java.util.regex.Pattern;
 
 import static com.intellij.openapi.util.Pair.pair;
 
-@State(name = "HttpConfigurable", storages = @Storage("proxy.settings.xml"))
+@State(name = "HttpConfigurable", storages = @Storage("proxy.settings.xml"), reportStatistic = false)
 public class HttpConfigurable implements PersistentStateComponent<HttpConfigurable>, Disposable {
   private static final Logger LOG = Logger.getInstance(HttpConfigurable.class);
   private static final File PROXY_CREDENTIALS_FILE = new File(PathManager.getOptionsPath(), "proxy.settings.pwd");
diff --git a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
index b43036b4d975..d88046230109 100644
--- a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
+++ b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.util.net.ssl;
 
 import com.intellij.openapi.application.Application;
@@ -63,7 +63,7 @@ import java.util.concurrent.atomic.AtomicReference;
  *
  * @author Mikhail Golubev
  */
-@State(name = "CertificateManager", storages = @Storage("certificates.xml"))
+@State(name = "CertificateManager", storages = @Storage("certificates.xml"), reportStatistic = false)
 public final class CertificateManager implements PersistentStateComponent<CertificateManager.Config> {
   @NonNls public static final String COMPONENT_NAME = "Certificate Manager";
   @NonNls public static final String DEFAULT_PATH = FileUtil.join(PathManager.getConfigPath(), "ssl", "cacerts");
diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java b/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java
index 66f63781428d..015ce2c383d3 100644
--- a/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java
+++ b/platform/platform-impl/src/com/intellij/featureStatistics/FeatureUsageTrackerImpl.java
@@ -26,7 +26,10 @@ import java.util.Set;
 
 import static com.intellij.internal.statistic.utils.PluginInfoDetectorKt.getPluginInfo;
 
-@State(name = "FeatureUsageStatistics", storages = @Storage(value = UsageStatisticsPersistenceComponent.USAGE_STATISTICS_XML, roamingType = RoamingType.DISABLED))
+@State(
+  name = "FeatureUsageStatistics",
+  storages = @Storage(value = UsageStatisticsPersistenceComponent.USAGE_STATISTICS_XML, roamingType = RoamingType.DISABLED),
+  reportStatistic = false)
 public final class FeatureUsageTrackerImpl extends FeatureUsageTracker implements PersistentStateComponent<Element> {
   private static final int HOUR = 1000 * 60 * 60;
   private static final long DAY = HOUR * 24;
diff --git a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.kt b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.kt
index 2eb06220a12c..c3e3e90957df 100644
--- a/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.kt
+++ b/platform/platform-impl/src/com/intellij/ide/RecentProjectsManagerBase.kt
@@ -59,7 +59,7 @@ import kotlin.collections.component2
 /**
  * Used directly by IntelliJ IDEA.
  */
-@State(name = "RecentProjectsManager", storages = [Storage(value = "recentProjects.xml", roamingType = RoamingType.DISABLED)])
+@State(name = "RecentProjectsManager", storages = [Storage(value = "recentProjects.xml", roamingType = RoamingType.DISABLED)], reportStatistic = false)
 open class RecentProjectsManagerBase : RecentProjectsManager(), PersistentStateComponent<RecentProjectManagerState>, ModificationTracker {
   companion object {
     const val MAX_PROJECTS_IN_MAIN_MENU = 6
@@ -609,7 +609,9 @@ private fun convertToSystemIndependentPaths(list: MutableList<String>) {
 }
 
 @Service
-@State(name = "RecentDirectoryProjectsManager", storages = [Storage(value = "recentProjectDirectories.xml", roamingType = RoamingType.DISABLED, deprecated = true)])
+@State(name = "RecentDirectoryProjectsManager",
+       storages = [Storage(value = "recentProjectDirectories.xml", roamingType = RoamingType.DISABLED, deprecated = true)],
+       reportStatistic = false)
 private class OldRecentDirectoryProjectsManager : PersistentStateComponent<RecentProjectManagerState> {
   var loadedState: RecentProjectManagerState? = null
 
diff --git a/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java b/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java
index 7adf10c78aa0..f8c271b8c9ab 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/AppPropertiesComponentImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.ide.util;
 
 import com.intellij.openapi.components.RoamingType;
@@ -9,6 +9,6 @@ import com.intellij.openapi.components.StoragePathMacros;
 @State(name = "PropertiesComponent", storages = {
   @Storage(value = StoragePathMacros.NON_ROAMABLE_FILE, roamingType = RoamingType.DISABLED),
   @Storage(value = "options.xml", roamingType = RoamingType.DISABLED, deprecated = true)
-})
+}, reportStatistic = false)
 public class AppPropertiesComponentImpl extends PropertiesComponentImpl {
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java
index b9738ae0693d..8afa604ce78b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/IdeDocumentHistoryImpl.java
@@ -65,7 +65,7 @@ import java.util.function.Predicate;
 @State(name = "IdeDocumentHistory", storages = {
   @Storage(StoragePathMacros.PRODUCT_WORKSPACE_FILE),
   @Storage(value = StoragePathMacros.WORKSPACE_FILE, deprecated = true)
-})
+}, reportStatistic = false)
 public class IdeDocumentHistoryImpl extends IdeDocumentHistory implements Disposable, PersistentStateComponent<IdeDocumentHistoryImpl.RecentlyChangedFilesState> {
   private static final Logger LOG = Logger.getInstance(IdeDocumentHistoryImpl.class);
 
diff --git a/platform/statistics/src/com/intellij/internal/statistic/local/ActionsLocalSummary.kt b/platform/statistics/src/com/intellij/internal/statistic/local/ActionsLocalSummary.kt
index ba72acd83ed4..dafaab086b29 100644
--- a/platform/statistics/src/com/intellij/internal/statistic/local/ActionsLocalSummary.kt
+++ b/platform/statistics/src/com/intellij/internal/statistic/local/ActionsLocalSummary.kt
@@ -15,7 +15,7 @@ import com.intellij.util.xmlb.annotations.XMap
 @State(name = "ActionsLocalSummary", storages = [
   Storage("actionSummary.xml", roamingType = RoamingType.DISABLED),
   Storage("actions_summary.xml", deprecated = true)
-])
+], reportStatistic = false)
 class ActionsLocalSummary : SimplePersistentStateComponent<ActionsLocalSummaryState>(ActionsLocalSummaryState()) {
   fun getActionsStats(): Map<String, ActionSummary> = state.data.toMap()
 }
diff --git a/platform/statistics/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java b/platform/statistics/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java
index 7fb34cdaa788..3c56efe9ce77 100644
--- a/platform/statistics/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java
+++ b/platform/statistics/src/com/intellij/internal/statistic/persistence/UsageStatisticsPersistenceComponent.java
@@ -11,7 +11,8 @@ import org.jetbrains.annotations.Nullable;
 
 @State(
   name = "UsagesStatistic",
-  storages = @Storage(value = UsageStatisticsPersistenceComponent.USAGE_STATISTICS_XML, roamingType = RoamingType.DISABLED)
+  storages = @Storage(value = UsageStatisticsPersistenceComponent.USAGE_STATISTICS_XML, roamingType = RoamingType.DISABLED),
+  reportStatistic = false
 )
 @Service
 public final class UsageStatisticsPersistenceComponent implements PersistentStateComponent<Element> {
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogBigRepositoriesList.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogBigRepositoriesList.java
index a1955f644ff6..ddd7cbe6b2e6 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogBigRepositoriesList.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/index/VcsLogBigRepositoriesList.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.vcs.log.data.index;
 
 import com.intellij.openapi.Disposable;
@@ -14,7 +14,8 @@ import java.util.EventListener;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-@State(name = "Vcs.Log.Big.Repositories", storages = {@Storage(value = "vcs.log.big.repos.xml", roamingType = RoamingType.DISABLED)})
+@State(name = "Vcs.Log.Big.Repositories", storages = {@Storage(value = "vcs.log.big.repos.xml", roamingType = RoamingType.DISABLED)},
+  reportStatistic = false)
 public class VcsLogBigRepositoriesList implements PersistentStateComponent<VcsLogBigRepositoriesList.State> {
   @NotNull private final Object myLock = new Object();
   @NotNull private final EventDispatcher<Listener> myDispatcher = EventDispatcher.create(Listener.class);
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
index 21a3b258514a..5890e0e15e95 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
@@ -27,7 +27,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@State(name = "CvsApplicationLevelConfiguration", storages = @Storage(value = "other.xml", roamingType = RoamingType.DISABLED))
+@State(name = "CvsApplicationLevelConfiguration", storages = @Storage(value = "other.xml", roamingType = RoamingType.DISABLED),
+  reportStatistic = false)
 public class CvsApplicationLevelConfiguration implements PersistentStateComponent<Element> {
   private static final Logger LOG = Logger.getInstance(CvsApplicationLevelConfiguration.class);
 
diff --git a/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java b/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java
index 5a1b59ab2ef0..8c0f93ec0c5d 100644
--- a/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java
+++ b/plugins/git4idea/src/git4idea/config/SSHConnectionSettings.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package git4idea.config;
 
 import com.intellij.openapi.components.*;
@@ -15,7 +15,8 @@ import java.util.TreeMap;
  */
 @State(
   name = "SSHConnectionSettings",
-  storages = @Storage(value = "security.xml", roamingType = RoamingType.DISABLED)
+  storages = @Storage(value = "security.xml", roamingType = RoamingType.DISABLED),
+  reportStatistic = false
 )
 public class SSHConnectionSettings implements PersistentStateComponent<SSHConnectionSettings.State> {
   /**
diff --git a/plugins/git4idea/src/git4idea/rebase/interactive/GitRewordedCommitMessageProvider.kt b/plugins/git4idea/src/git4idea/rebase/interactive/GitRewordedCommitMessageProvider.kt
index a6efcd66af0d..1e153425eae6 100644
--- a/plugins/git4idea/src/git4idea/rebase/interactive/GitRewordedCommitMessageProvider.kt
+++ b/plugins/git4idea/src/git4idea/rebase/interactive/GitRewordedCommitMessageProvider.kt
@@ -9,7 +9,8 @@ import git4idea.rebase.GitRebaseUtils
 
 @State(
   name = "GitRewordedCommitMessages",
-  storages = [Storage(file = StoragePathMacros.WORKSPACE_FILE, roamingType = RoamingType.DISABLED)]
+  storages = [Storage(file = StoragePathMacros.WORKSPACE_FILE, roamingType = RoamingType.DISABLED)],
+  reportStatistic = false
 )
 internal class GitRewordedCommitMessageProvider :
   SimplePersistentStateComponent<GitRewordedCommitMessagesInfo>(GitRewordedCommitMessagesInfo()) {
diff --git a/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesTree.kt b/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesTree.kt
index 1be002fe0112..5ec1e11071ca 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesTree.kt
+++ b/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesTree.kt
@@ -301,7 +301,7 @@ private val BRANCH_TREE_TRANSFER_HANDLER = object : TransferHandler() {
   override fun getSourceActions(c: JComponent) = COPY_OR_MOVE
 }
 
-@State(name = "BranchesTreeState", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
+@State(name = "BranchesTreeState", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)], reportStatistic = false)
 internal class BranchesTreeStateHolder : PersistentStateComponent<TreeState> {
   private lateinit var branchesTree: FilteringBranchesTree
   private lateinit var treeState: TreeState
diff --git a/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubAccountManager.kt b/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubAccountManager.kt
index e929151d1150..75a19e5a598b 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubAccountManager.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubAccountManager.kt
@@ -25,7 +25,7 @@ internal val GithubAccount.isGHAccount: Boolean get() = server.isGithubDotCom
 @State(name = "GithubAccounts", storages = [
   Storage(value = "github.xml"),
   Storage(value = "github_settings.xml", deprecated = true)
-])
+], reportStatistic = false)
 internal class GithubAccountManager : PersistentStateComponent<Array<GithubAccount>> {
   var accounts: Set<GithubAccount> by observable(setOf()) { _, oldValue, newValue ->
     oldValue.filter { it !in newValue }.forEach(this::accountRemoved)
diff --git a/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubProjectDefaultAccountHolder.kt b/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubProjectDefaultAccountHolder.kt
index 1bc0e19f393c..95699c045689 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubProjectDefaultAccountHolder.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/authentication/accounts/GithubProjectDefaultAccountHolder.kt
@@ -12,7 +12,7 @@ import org.jetbrains.plugins.github.util.GithubNotifications
  *
  * TODO: auto-detection
  */
-@State(name = "GithubDefaultAccount", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
+@State(name = "GithubDefaultAccount", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)], reportStatistic = false)
 internal class GithubProjectDefaultAccountHolder(private val project: Project) : PersistentStateComponent<AccountState> {
   var account: GithubAccount? = null
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/config/GithubPullRequestsProjectUISettings.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/config/GithubPullRequestsProjectUISettings.kt
index 87066aed1032..0d5918b7e43b 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/config/GithubPullRequestsProjectUISettings.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/config/GithubPullRequestsProjectUISettings.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.github.pullrequest.config
 import com.intellij.openapi.components.*
 import com.intellij.openapi.project.Project
 
-@State(name = "GithubPullRequestsUISettings", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
+@State(name = "GithubPullRequestsUISettings", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)], reportStatistic = false)
 class GithubPullRequestsProjectUISettings : PersistentStateComponentWithModificationTracker<GithubPullRequestsProjectUISettings.SettingsState> {
   private var state: SettingsState = SettingsState()
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubProjectSettings.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubProjectSettings.java
index 020a2b3c593c..3cdfb8e3e1cf 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubProjectSettings.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubProjectSettings.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.github.util;
 
 import com.intellij.openapi.components.*;
@@ -10,7 +10,7 @@ import org.jetbrains.plugins.github.api.GHRepositoryPath;
 /**
  * @author Aleksey Pivovarov
  */
-@State(name = "GithubProjectSettings", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
+@State(name = "GithubProjectSettings", storages = @Storage(StoragePathMacros.WORKSPACE_FILE), reportStatistic = false)
 public class GithubProjectSettings implements PersistentStateComponent<GithubProjectSettings.State> {
   private State myState = new State();
 
diff --git a/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java b/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java
index 2d9e7f9c32db..e1c047b08fe5 100644
--- a/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java
+++ b/plugins/properties/src/com/intellij/lang/properties/LastSelectedPropertiesFileStore.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.lang.properties;
 
 import com.intellij.injected.editor.VirtualFileWindow;
@@ -19,7 +19,8 @@ import java.util.Map;
 
 @State(
   name = "LastSelectedPropertiesFileStore",
-  storages = @Storage(value = "lastSelectedPropertiesFile.xml", roamingType = RoamingType.DISABLED)
+  storages = @Storage(value = "lastSelectedPropertiesFile.xml", roamingType = RoamingType.DISABLED),
+  reportStatistic = false
 )
 public class LastSelectedPropertiesFileStore implements PersistentStateComponent<Element> {
   private final Map<String, String> lastSelectedUrls = new LinkedHashMap<>();
diff --git a/plugins/settings-repository/src/ProjectId.kt b/plugins/settings-repository/src/ProjectId.kt
index 168397157d62..748a0abc4ab6 100644
--- a/plugins/settings-repository/src/ProjectId.kt
+++ b/plugins/settings-repository/src/ProjectId.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.settingsRepository
 
 import com.intellij.openapi.components.PersistentStateComponent
@@ -7,7 +7,7 @@ import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.StoragePathMacros
 import com.intellij.util.xmlb.XmlSerializerUtil
 
-@State(name = "IcsProjectId", storages = [(Storage(StoragePathMacros.WORKSPACE_FILE))])
+@State(name = "IcsProjectId", storages = [(Storage(StoragePathMacros.WORKSPACE_FILE))],  reportStatistic = false)
 class ProjectId : PersistentStateComponent<ProjectId> {
   var uid: String? = null
   var path: String? = null
diff --git a/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ApplicationUserFactorStorage.kt b/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ApplicationUserFactorStorage.kt
index 816dc655b18a..2e1da77e85ee 100644
--- a/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ApplicationUserFactorStorage.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ApplicationUserFactorStorage.kt
@@ -1,9 +1,9 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.stats.personalization.impl
 
 import com.intellij.openapi.components.RoamingType
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 
-@State(name = "ApplicationUserFactors", storages = [(Storage(value = "completion.factors.user.xml", roamingType = RoamingType.DISABLED))])
+@State(name = "ApplicationUserFactors", storages = [(Storage(value = "completion.factors.user.xml", roamingType = RoamingType.DISABLED))], reportStatistic = false)
 class ApplicationUserFactorStorage : UserFactorStorageBase()
\ No newline at end of file
diff --git a/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ProjectUserFactorStorage.kt b/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ProjectUserFactorStorage.kt
index ad9070c25d79..20ebea1055e9 100644
--- a/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ProjectUserFactorStorage.kt
+++ b/plugins/stats-collector/src/com/intellij/stats/personalization/impl/ProjectUserFactorStorage.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.intellij.stats.personalization.impl
 
@@ -12,5 +12,6 @@ import com.intellij.openapi.components.StoragePathMacros
 @State(name = "ProjectUserFactors", storages = [
   Storage(StoragePathMacros.CACHE_FILE),
   Storage(StoragePathMacros.WORKSPACE_FILE, deprecated = true)
-])
+],
+reportStatistic = false)
 class ProjectUserFactorStorage : UserFactorStorageBase()
\ No newline at end of file
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
index 37a3eda9371c..f36d9914129d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
@@ -29,7 +29,7 @@ import static org.jetbrains.idea.svn.IdeaSVNConfigFile.SERVERS_FILE_NAME;
 import static org.jetbrains.idea.svn.SvnUtil.SYSTEM_CONFIGURATION_PATH;
 import static org.jetbrains.idea.svn.SvnUtil.USER_CONFIGURATION_PATH;
 
-@State(name = "SvnConfiguration", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
+@State(name = "SvnConfiguration", storages = @Storage(StoragePathMacros.WORKSPACE_FILE), reportStatistic = false)
 public class SvnConfiguration implements PersistentStateComponent<SvnConfigurationState>, Disposable {
   public final static int ourMaxAnnotateRevisionsDefault = 500;
 
diff --git a/python/src/com/jetbrains/python/packaging/PyPackageService.java b/python/src/com/jetbrains/python/packaging/PyPackageService.java
index 00c81ebb876f..38f2b5a6d347 100644
--- a/python/src/com/jetbrains/python/packaging/PyPackageService.java
+++ b/python/src/com/jetbrains/python/packaging/PyPackageService.java
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-@State(name = "PyPackageService", storages = @Storage(value = "packages.xml", roamingType = RoamingType.DISABLED))
+@State(name = "PyPackageService", storages = @Storage(value = "packages.xml", roamingType = RoamingType.DISABLED), reportStatistic = false)
 public class PyPackageService implements
                               PersistentStateComponent<PyPackageService> {
   public volatile Map<String, Boolean> sdkToUsersite = new ConcurrentHashMap<>();
diff --git a/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java b/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java
index 9d009635abe8..fc86c3b5af8f 100644
--- a/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java
+++ b/spellchecker/src/com/intellij/spellchecker/state/CachedDictionaryState.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.spellchecker.state;
 
 import com.intellij.openapi.components.*;
@@ -9,7 +9,8 @@ import org.jetbrains.annotations.NotNull;
 
 @State(
   name = "CachedDictionaryState",
-  storages = @Storage(value = "cachedDictionary.xml", roamingType = RoamingType.DISABLED)
+  storages = @Storage(value = "cachedDictionary.xml", roamingType = RoamingType.DISABLED),
+  reportStatistic = false
 )
 public class CachedDictionaryState extends DictionaryState implements PersistentStateComponent<DictionaryState> {
   public static final String DEFAULT_NAME = "cached";