diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 272fafd5c45e..0bae88edda85 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -370,7 +370,7 @@ def layoutFull(String target, Set usedJars) {
       jar("extensions.jar") { module("extensions")}
 
       jar("pycharm.jar") {
-        implementationModules.each { module it}
+        implementationModules.each { module it }
         zipfileset(src: "${home}/lib/client-api.jar")
         zipfileset(src: "${home}/lib/ideaLicenseDecoder.jar")
       }
@@ -386,6 +386,7 @@ def layoutFull(String target, Set usedJars) {
 
       jar("resources_en.jar") {
         module("platform-resources-en")
+        zipfileset(src: "$home/python/resources/tips", prefix: "tips")
       }
 
       jar("icons.jar") { module("icons") }
diff --git a/python/resources/ProductivityFeaturesRegistry.xml b/python/resources/ProductivityFeaturesRegistry.xml
index dc87bf416ab0..d717ae27feae 100644
--- a/python/resources/ProductivityFeaturesRegistry.xml
+++ b/python/resources/ProductivityFeaturesRegistry.xml
@@ -151,6 +151,7 @@
       successive-show="7">
       <dependency id="codeassists.quickjavadoc"/>
     </feature>
+    <!-- TODO uncomment when Python specific tips are provided (PY-1292)
     <feature
       id="codeassists.surroundwith.statement"
       tip-file="RSurroundWith.html"
@@ -179,6 +180,7 @@
       successive-show="5"
       min-usage-count="3"
       />
+      -->
   </group>
 
   <group id="refactoring">