diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps
index 0eecc8c5..0cdd6b42 100644
--- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.editor.mps
@@ -223,6 +223,16 @@
         </node>
         <node concept="2iRfu4" id="2u7UHDCqtca" role="2iSdaV" />
       </node>
+      <node concept="3EZMnI" id="4b3hB82Mw9T" role="3EZMnx">
+        <node concept="VPM3Z" id="4b3hB82Mw9V" role="3F10Kt" />
+        <node concept="3F0ifn" id="4b3hB82Mwa2" role="3EZMnx">
+          <property role="3F0ifm" value="add hyperlinks for referenced nodes:" />
+        </node>
+        <node concept="3F0A7n" id="4b3hB82Mwa4" role="3EZMnx">
+          <ref role="1NtTu8" to="1ob6:4b3hB82Mw9R" resolve="addLinks" />
+        </node>
+        <node concept="2iRfu4" id="4b3hB82Mw9Y" role="2iSdaV" />
+      </node>
       <node concept="18a60v" id="2u7UHDCqt_V" role="3EZMnx">
         <node concept="VPM3Z" id="2u7UHDCqt_X" role="3F10Kt" />
         <node concept="3noiJN" id="2u7UHDCqt_Y" role="3F10Kt">
diff --git a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps
index fcd358c9..b2540024 100644
--- a/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps
+++ b/code/languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/models/com.mpsbasics.pdfexporter.structure.mps
@@ -99,6 +99,11 @@
         </node>
       </node>
     </node>
+    <node concept="1TJgyi" id="4b3hB82Mw9R" role="1TKVEl">
+      <property role="IQ2nx" value="4810766282448831095" />
+      <property role="TrG5h" value="addLinks" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
   <node concept="1TIwiD" id="24pF5$oX9dp">
     <property role="EcuMT" value="2385126976340136793" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
index f8792745..85eef701 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.notifications.mps
@@ -79,7 +79,6 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
@@ -177,7 +176,6 @@
         </node>
       </node>
       <node concept="3clFbS" id="xCk$O6mi_k" role="3clF47">
-        <node concept="3clFbH" id="xCk$O6mi_G" role="3cqZAp" />
         <node concept="3cpWs8" id="xCk$O6miVt" role="3cqZAp">
           <node concept="3cpWsn" id="xCk$O6miVs" role="3cpWs9">
             <property role="3TUv4t" value="true" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps
index aa250f74..a0d124b5 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox.sandbox/models/com.mpsbasics.pdfbox.sandbox._010_smoke.mps
@@ -20,6 +20,7 @@
         <reference id="2385126976340138510" name="rootNode" index="TVjpn" />
       </concept>
       <concept id="2385126976339379921" name="com.mpsbasics.pdfexporter.structure.PdfExportConfiguration" flags="ng" index="TWaE8">
+        <property id="4810766282448831095" name="addLinks" index="102kg5" />
         <child id="2385126976340183148" name="pages" index="TVegP" />
         <child id="2848503513110145633" name="location" index="1fTw2V" />
       </concept>
@@ -46,6 +47,7 @@
   </registry>
   <node concept="TWaE8" id="6v3euY30Uzm">
     <property role="TrG5h" value="export_config_1" />
+    <property role="102kg5" value="true" />
     <node concept="9PVaO" id="6v3euY34qTI" role="1fTw2V">
       <property role="3N1Lgt" value="exports" />
     </node>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
index e6608897..831ba746 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.pdfbox/models/com.mpsbasics.pdfbox.utils.mps
@@ -37,6 +37,7 @@
     <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="bik8" ref="bc7d0863-298c-41cf-984f-a0421e757da5/java:org.apache.pdfbox.pdmodel.graphics.color(com.mpsbasics.pdfbox/)" />
+    <import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -339,6 +340,32 @@
                   <ref role="3cqZAo" node="4lZTrcO$UO4" resolve="e" />
                 </node>
               </node>
+              <node concept="3clFbF" id="1U$3judPfRt" role="3cqZAp">
+                <node concept="2YIFZM" id="2u7UHDCerTs" role="3clFbG">
+                  <ref role="37wK5l" to="5yhu:xCk$O6mi_h" resolve="showNotification" />
+                  <ref role="1Pybhc" to="5yhu:696iakqzmI" resolve="NotificationUtils" />
+                  <node concept="Xl_RD" id="3mpcDUdxFYb" role="37wK5m">
+                    <property role="Xl_RC" value="Error" />
+                  </node>
+                  <node concept="3cpWs3" id="3mpcDUdxFYc" role="37wK5m">
+                    <node concept="2OqwBi" id="3mpcDUdxFYd" role="3uHU7w">
+                      <node concept="37vLTw" id="3mpcDUdxFYe" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4lZTrcO$UO4" resolve="e" />
+                      </node>
+                      <node concept="liA8E" id="3mpcDUdxFYf" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                      </node>
+                    </node>
+                    <node concept="Xl_RD" id="3mpcDUdxFYg" role="3uHU7B">
+                      <property role="Xl_RC" value="Exception while saving pdf " />
+                    </node>
+                  </node>
+                  <node concept="Rm8GO" id="3mpcDUdxFYh" role="37wK5m">
+                    <ref role="Rm8GQ" to="fnpx:~NotificationType.ERROR" resolve="ERROR" />
+                    <ref role="1Px2BO" to="fnpx:~NotificationType" resolve="NotificationType" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
           <node concept="3clFbS" id="4lZTrcO$UHC" role="1zxBo7">
@@ -391,14 +418,27 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="6uwfldAExId" role="3cqZAp">
-              <node concept="1rXfSq" id="3CK0RGEM0j9" role="3clFbG">
-                <ref role="37wK5l" node="3CK0RGELPWn" resolve="addLinks" />
-                <node concept="37vLTw" id="3CK0RGEM0u0" role="37wK5m">
-                  <ref role="3cqZAo" node="4lZTrcOzSGX" resolve="document" />
+            <node concept="3clFbH" id="4b3hB82Mx8D" role="3cqZAp" />
+            <node concept="3clFbJ" id="4b3hB82M$Gl" role="3cqZAp">
+              <node concept="3clFbS" id="4b3hB82M$Gn" role="3clFbx">
+                <node concept="3clFbF" id="6uwfldAExId" role="3cqZAp">
+                  <node concept="1rXfSq" id="3CK0RGEM0j9" role="3clFbG">
+                    <ref role="37wK5l" node="3CK0RGELPWn" resolve="addLinks" />
+                    <node concept="37vLTw" id="3CK0RGEM0u0" role="37wK5m">
+                      <ref role="3cqZAo" node="4lZTrcOzSGX" resolve="document" />
+                    </node>
+                    <node concept="37vLTw" id="3G_hsRkdyE3" role="37wK5m">
+                      <ref role="3cqZAo" node="3G_hsRkdk0I" resolve="pages2OriginatingNodes" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="4b3hB82M_X3" role="3clFbw">
+                <node concept="37vLTw" id="4b3hB82M_CL" role="2Oq$k0">
+                  <ref role="3cqZAo" node="54ozzUwn_7d" resolve="exportConfig" />
                 </node>
-                <node concept="37vLTw" id="3G_hsRkdyE3" role="37wK5m">
-                  <ref role="3cqZAo" node="3G_hsRkdk0I" resolve="pages2OriginatingNodes" />
+                <node concept="3TrcHB" id="4b3hB82MCec" role="2OqNvi">
+                  <ref role="3TsBF5" to="1ob6:4b3hB82Mw9R" resolve="addLinks" />
                 </node>
               </node>
             </node>
@@ -1468,7 +1508,7 @@
                 <node concept="17QB3L" id="3G_hsRkk7U0" role="1tU5fm" />
                 <node concept="3cpWs3" id="3G_hsRkk84K" role="33vP2m">
                   <node concept="Xl_RD" id="3G_hsRkk84L" role="3uHU7B">
-                    <property role="Xl_RC" value="Jump To: " />
+                    <property role="Xl_RC" value="Go To: " />
                   </node>
                   <node concept="2OqwBi" id="3G_hsRkk84M" role="3uHU7w">
                     <node concept="2GrUjf" id="3G_hsRkk84N" role="2Oq$k0">
diff --git a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
index 61cb8edb..226d2a75 100644
--- a/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
+++ b/code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized_pdf_export.mps
@@ -16,6 +16,7 @@
     </language>
     <language id="ece26728-2885-4b26-9f61-67d2821fc361" name="com.mpsbasics.pdfexporter">
       <concept id="2385126976339379921" name="com.mpsbasics.pdfexporter.structure.PdfExportConfiguration" flags="ng" index="TWaE8">
+        <property id="4810766282448831095" name="addLinks" index="102kg5" />
         <child id="2385126976340183148" name="pages" index="TVegP" />
         <child id="2848503513110145633" name="location" index="1fTw2V" />
       </concept>
@@ -47,6 +48,7 @@
   </registry>
   <node concept="TWaE8" id="3TNxfDZ8toW">
     <property role="TrG5h" value="operations_export" />
+    <property role="102kg5" value="true" />
     <node concept="9PVaO" id="3TNxfDZ8tuf" role="1fTw2V">
       <property role="3N1Lgt" value="pdf_export_dir" />
     </node>