diff --git a/__info/Build.md b/__info/Build.md
new file mode 100644
index 0000000000..75b5cd62ce
--- /dev/null
+++ b/__info/Build.md
@@ -0,0 +1,6 @@
+[официальная инструкция по настройке окружения](https://wiki.eclipse.org/Trace_Compass/Development_Environment_Setup)
+> Double-click the .target file that corresponds to your Eclipse version (tracecompass-e4.5.target, at the time of this writing).
+
+Последняя выложенная версия сейчас 4.15
+
+С tracecompass-baseline-5.3.0 точно собирается.
diff --git a/__info/flame_chart_example.png b/__info/flame_chart_example.png
new file mode 100644
index 0000000000..fa69490e9f
Binary files /dev/null and b/__info/flame_chart_example.png differ
diff --git a/__info/flame_chart_example_2.png b/__info/flame_chart_example_2.png
new file mode 100644
index 0000000000..6a56cb7bf0
Binary files /dev/null and b/__info/flame_chart_example_2.png differ
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/callstack/LttngUstCallStackProvider.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/callstack/LttngUstCallStackProvider.java
index 5488e593cc..6a3dbde7a5 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/callstack/LttngUstCallStackProvider.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/callstack/LttngUstCallStackProvider.java
@@ -136,8 +136,8 @@ protected boolean considerEvent(ITmfEvent event) {
         if (!funcEntryEvents.contains(eventName)) {
             return null;
         }
-        Long address = (Long) event.getContent().getField(fLayout.fieldAddr()).getValue();
-        return TmfStateValue.newValueLong(address);
+        String method_name = (String) event.getContent().getField("method_name").getValue(); //$NON-NLS-1$
+        return TmfStateValue.newValueString(method_name);
     }
 
     @Override
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/trace/layout/LttngUst20EventLayout.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/trace/layout/LttngUst20EventLayout.java
index 9658f70ac4..4810e13f80 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/trace/layout/LttngUst20EventLayout.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/trace/layout/LttngUst20EventLayout.java
@@ -83,22 +83,22 @@ public String eventLibcPosixMemalign() {
 
     @Override
     public String eventCygProfileFuncEntry() {
-        return "lttng_ust_cyg_profile:func_entry";
+        return "hotspot:method__entry";
     }
 
     @Override
     public String eventCygProfileFastFuncEntry() {
-        return "lttng_ust_cyg_profile_fast:func_entry";
+        return "hotspot:method__entry";
     }
 
     @Override
     public String eventCygProfileFuncExit() {
-        return "lttng_ust_cyg_profile:func_exit";
+        return "hotspot:method__return";
     }
 
     @Override
     public String eventCygProfileFastFuncExit() {
-        return "lttng_ust_cyg_profile_fast:func_exit";
+        return "hotspot:method__return";
     }
 
     // ------------------------------------------------------------------------
diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/statevalue/TmfStateValue.java b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/statevalue/TmfStateValue.java
index d70a26eeef..deb77f9b0e 100644
--- a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/statevalue/TmfStateValue.java
+++ b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/statevalue/TmfStateValue.java
@@ -16,7 +16,7 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.internal.provisional.statesystem.core.statevalue.CustomStateValue;
-import org.eclipse.tracecompass.internal.statesystem.core.Activator;
+//import org.eclipse.tracecompass.internal.statesystem.core.Activator;
 import org.eclipse.tracecompass.statesystem.core.exceptions.StateValueTypeException;
 
 /**
@@ -148,13 +148,17 @@ public static TmfStateValue newValueString(@Nullable String strValue) {
          * Make sure the String does not contain "weird" things, like ISO
          * control characters.
          */
+        String value = "";
         for (char c : strValue.toCharArray()) {
-            if (Character.isISOControl(c)) {
-                Activator.getDefault().logError("Trying to use invalid string: " + strValue); //$NON-NLS-1$
-                throw new IllegalArgumentException();
+//            if (Character.isISOControl(c)) {
+//                Activator.getDefault().logError("Trying to use invalid string: " + strValue); //$NON-NLS-1$
+//                throw new IllegalArgumentException();
+//            }
+            if (!Character.isISOControl(c)) {
+                value += c;
             }
         }
-        StringStateValue newValue = new StringStateValue(strValue);
+        StringStateValue newValue = new StringStateValue(value);
         STRING_CACHE[offset] = newValue;
         return newValue;
     }