diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
index deaebab29b3a..0bfd7e0021d5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
@@ -2,15 +2,11 @@ package com.intellij.codeInspection;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection;
-import com.intellij.idea.Bombed;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.testFramework.InspectionTestCase;
 
-import java.util.Calendar;
-
-@Bombed(year = 2017, month = Calendar.NOVEMBER, day = 17, user = "kb")
 public class DefaultFileTemplateInspectionTest extends InspectionTestCase {
   @Override
   protected Sdk getTestProjectSdk() {
diff --git a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
index 33a25af923e4..a028baf02ca1 100644
--- a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
@@ -22,6 +22,7 @@ import com.intellij.psi.impl.source.tree.java.MethodElement
 import com.intellij.testFramework.LeakHunter
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.util.Processor
+import com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection
 
 /**
  * @author peter
@@ -78,7 +79,7 @@ class AstLeaksTest extends LightCodeInsightFixtureTestCase {
     myFixture.addFileToProject('sup.java', 'class Super { void bar() {} }')
     PsiJavaFile foo = myFixture.addFileToProject('a.java', 'class Foo { void bar() { bar(); } }')
     myFixture.configureFromExistingVirtualFile(foo.virtualFile)
-    //myFixture.enableInspections(new DefaultFileTemplateUsageInspection())
+    myFixture.enableInspections(new DefaultFileTemplateUsageInspection())
     myFixture.doHighlighting()
 
     LeakHunter.checkLeak(foo.classes[0], MethodElement, { MethodElement node -> !node.psi.physical } as Processor<MethodElement>)
diff --git a/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft b/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft
index a6e72093ea34..fea0f59eb14b 100644
--- a/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft	
+++ b/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft	
@@ -1 +1 @@
-${EXCEPTION}.printStackTrace();
\ No newline at end of file
+${EXCEPTION}.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
\ No newline at end of file
diff --git a/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft b/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft
index f055c7fd1dad..3f770be61fca 100644
--- a/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft	
+++ b/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft	
@@ -1 +1 @@
-#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end
\ No newline at end of file
+#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end  //To change body of implemented methods use File | Settings | File Templates.
\ No newline at end of file
diff --git a/resources-en/src/fileTemplates/code/New Method Body.java.ft b/resources-en/src/fileTemplates/code/New Method Body.java.ft
index f055c7fd1dad..5a359cb3acf2 100644
--- a/resources-en/src/fileTemplates/code/New Method Body.java.ft	
+++ b/resources-en/src/fileTemplates/code/New Method Body.java.ft	
@@ -1 +1 @@
-#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end
\ No newline at end of file
+#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end  //To change body of created methods use File | Settings | File Templates.
\ No newline at end of file
diff --git a/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft b/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft
index b96e408307f1..43116f46f327 100644
--- a/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft	
+++ b/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft	
@@ -1 +1 @@
-$CALL_SUPER;
\ No newline at end of file
+$CALL_SUPER;    //To change body of overridden methods use File | Settings | File Templates.
\ No newline at end of file
diff --git a/resources-en/src/fileTemplates/includes/File Header.java.ft b/resources-en/src/fileTemplates/includes/File Header.java.ft
index 793a2134f94c..4b498f034061 100644
--- a/resources-en/src/fileTemplates/includes/File Header.java.ft	
+++ b/resources-en/src/fileTemplates/includes/File Header.java.ft	
@@ -1,4 +1,7 @@
 /**
  * Created with IntelliJ IDEA.
- * @author ${USER}
+ * User: ${USER}
+ * Date: ${DATE}
+ * Time: ${TIME}
+ * To change this template use File | Settings | File Templates.
  */
diff --git a/resources/src/ClassTemplateManager.xml b/resources/src/ClassTemplateManager.xml
index 6f32b1c4ff36..659fd192400c 100644
--- a/resources/src/ClassTemplateManager.xml
+++ b/resources/src/ClassTemplateManager.xml
@@ -1,6 +1,6 @@
 <component>
-  <option name="CLASS_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * @author $USER$&#10;*/&#10;package $PACKAGE_NAME$;&#10;public class $NAME$ { }&#10;" />
-  <option name="INTERFACE_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * @author $USER$&#10;*/&#10;package $PACKAGE_NAME$;&#10;public interface $NAME$ { }&#10;" />
+  <option name="CLASS_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * User: $USER$&#10; * Date: $DATE$&#10; * Time: $TIME$&#10; * To change template for new class use &#10; * Code Style | Class Templates options (Tools | IDE Options).&#10; */&#10;package $PACKAGE_NAME$;&#10;public class $NAME$ { }&#10;" />
+  <option name="INTERFACE_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * User: $USER$&#10; * Date: $DATE$&#10; * Time: $TIME$&#10; * To change template for new interface use &#10; * Code Style | Class Templates options (Tools | IDE Options).&#10; */&#10;package $PACKAGE_NAME$;&#10;public interface $NAME$ { }&#10;" />
   <option name="ADJUST_CLASS_TEMPLATE" value="true" />
   <option name="ADJUST_INTERFACE_TEMPLATE" value="true" />
 </component>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index a2a5e0b9d022..1dfda1b79956 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -471,9 +471,9 @@
     <localInspection language="JAVA" shortName="AccessStaticViaInstance" bundle="messages.InspectionsBundle" key="access.static.via.instance" groupName=""
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance" />
-    <!--<localInspection shortName="DefaultFileTemplate" bundle="messages.InspectionsBundle" key="default.file.template.display.name"-->
-                     <!--groupName="General" enabledByDefault="true" level="WARNING"-->
-                     <!--implementationClass="com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection"/>-->
+    <localInspection shortName="DefaultFileTemplate" bundle="messages.InspectionsBundle" key="default.file.template.display.name"
+                     groupName="General" enabledByDefault="true" level="WARNING"
+                     implementationClass="com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection"/>
     <globalInspection shortName="UnnecessaryModuleDependencyInspection" bundle="messages.InspectionsBundle"
                       key="unnecessary.module.dependency.display.name" groupName="Declaration redundancy" enabledByDefault="true"
                       level="WARNING"