diff --git a/installer/utils/mac_utils.sh b/installer/utils/mac_utils.sh
index 429c4a1e28..722fe866f8 100644
--- a/installer/utils/mac_utils.sh
+++ b/installer/utils/mac_utils.sh
@@ -16,7 +16,10 @@ function fix_dependencies {
 	local short_id
 	local install_name
 	install_name=$(otool -D "$target" | tail -n +2 | grep -v '^@' || : )
-	if [[ -n "$install_name" ]] ; then
+	if [[ "$install_name" == "/usr/local"/* ]] ; then
+		short_id="@rpath/$(basename "$install_name")"
+		change="-id \"$short_id\""
+	elif [[ -n "$install_name" ]] ; then
 		short_id=$(grealpath -e --relative-to "$prefix" "$install_name" || echo "@rpath/"$(basename "$install_name"))
 		change="-id \"$short_id\""
 	fi
diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
index 42bb8090a5..3e3e34368c 100644
--- a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
+++ b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
@@ -74,10 +74,16 @@ bool ConstraintsChecker::parseConstraints(const QDomElement &constraintsXml)
 	mEvents.clear();
 	mActiveEvents.clear();
 	mVariables.clear();
-
-	mCurrentXml = constraintsXml;
 	mParsedSuccessfully = mParser->parse(constraintsXml);
 
+	if (mParsedSuccessfully) {
+		auto importNode = mCurrentConstraintDocument.importNode(constraintsXml, true);
+		if (!importNode.isNull()) {
+			mCurrentXml = importNode.toElement();
+			mCurrentConstraintDocument.appendChild(mCurrentXml);
+		}
+	}
+
 	for (const QString &error : mParser->errors()) {
 		reportParserError(error);
 	}
diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h
index 556b040d7f..2d24b796f1 100644
--- a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h
+++ b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.h
@@ -136,6 +136,7 @@ class ConstraintsChecker : public QObject
 
 	QList<details::Event *> mActiveEvents; //No ownership
 
+	QDomDocument mCurrentConstraintDocument;
 	QDomElement mCurrentXml;
 	bool mEnabled { true };
 };
diff --git a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
index ee498e1765..f862dc39cf 100644
--- a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
+++ b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
@@ -288,7 +288,7 @@
 <context>
     <name>twoDModel::constraints::ConstraintsChecker</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+112"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+118"/>
         <source>Error while parsing constraints: %1</source>
         <translation>Une erreur lors de l&apos;analyse des contraints est survenue : %1</translation>
     </message>
diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
index 974154ca25..c147c8f813 100644
--- a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
+++ b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -560,7 +560,7 @@
 <context>
     <name>twoDModel::constraints::ConstraintsChecker</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+112"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp" line="+118"/>
         <source>Error while parsing constraints: %1</source>
         <translation>Ошибка чтения ограничений: %1</translation>
     </message>