diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md
index cf7142974d..518f59179c 100644
--- a/dox/dev_guides/upgrade/upgrade.md
+++ b/dox/dev_guides/upgrade/upgrade.md
@@ -219,6 +219,8 @@ Handle(Geom_TrimmedCurve) aCurve = new Geom_TrimmedCurve (...);
 func (aCurve); // ambiguity error in VC++ 10
 ~~~~~
 
+Note that this problem does not appear if macro *OCCT_HANDLE_NOCAST* is used, see @ref upgrade_occt700_cdl_nocast "below".
+
 To resolve this ambiguity, change your code so that argument type should correspond exactly to the function signature. 
 In some cases this can be done by using the relevant type for the corresponding variable, like in the example above:
 
@@ -262,6 +264,16 @@ or use variable of the appropriate type:
 Handle(Geom_TrimmedCurve) aC = GC_MakeLine (p, v); // ok
 ~~~~~
 
+With GCC compiler, similar problem appears when const handle to derived type is used to construct handle to base type via assignment (and in some cases in return statement), for instance:
+
+~~~~~
+  const Handle(Geom_Line) aLine;
+  Handle(Geom_Curve) c1 = aLine; // GCC error 
+  Handle(Geom_Curve) c2 (aLine); // ok
+~~~~~
+
+This problem is specific to GCC and it does not appear if macro *OCCT_HANDLE_NOCAST* is used, see @ref upgrade_occt700_cdl_nocast "below".
+
 #### Incorrect use of STANDARD_TYPE and Handle macros
 
 You might need to clean your code from incorrect use of macros *STANDARD_TYPE*() and *Handle*().
@@ -317,7 +329,8 @@ Here is the list of known possible problems at run time after the upgrade to OCC
 #### References to temporary objects
 
 In previous versions, the compiler was able to detect the situation when a local variable of a "reference to a Handle" type is initialized by temporary object, and ensured that lifetime of that object is longer than that of the variable. 
-Since OCCT 7.0, it will not work if types of the temporary object and variable are different (due to involvement of user-defined type cast), thus such temporary object will be destroyed immediately.
+In OCCT 7.0 with default options, it will not work if types of the temporary object and variable are different (due to involvement of user-defined type cast), thus such temporary object will be destroyed immediately.
+This problem does not appear if macro *OCCT_HANDLE_NOCAST* is used during compilation, see below.
 
 Example:
 
@@ -328,6 +341,42 @@ Handle(Geom_TrimmedCurve)::DownCast(aCurve);
 aBC->Transform (T); // access violation in OCCT 7.0
 ~~~~~
 
+@subsubsection upgrade_occt700_cdl_nocast Option to avoid cast of handle to reference to base type
+
+In OCCT 6.x and earlier versions the handle classes formed a hierarchy echoing hierarchy of corresponding object classes.
+This automatically enabled possibility to use handle to derived class in all contexts where handle to base class was needed, e.g. pass it in function by reference without copying:
+
+~~~~
+Standard_Boolean GetCurve (Handle(Geom_Curve)& theCurve);
+....
+Handle(Geom_Line) aLine;
+if (GetCurve (aLine)) {
+  // use aLine, unsafe
+}
+~~~~
+
+This feature was used in multiple places in OCCT and dependent projects.
+However it is potentially unsafe: in the above example no checks are done at compile time or at run time to ensure that argument handle is assigned a type compatible with the type of handle passed as argument. 
+If object of incompatible type (e.g. Geom_Circle) is assigned to *theCurve*, the behavior will be unpredictable.
+
+For compatibility with existing code, by default OCCT 7.0 keeps this possibility, providing operators of type cast to handle to base type.
+Besides being unsafe, in specific situations this feature may cause compile-time or run-time errors as described above.
+
+In order to provide safer behavior, this feature can be disabled by defining a compile-time macro *OCCT_HANDLE_NOCAST*.
+When it is defined, constructors and assignment operators are defined (instead of type cast operators) to convert from handle to defived type to handle to base type.
+This implies creation of temporary objects and hence may be more expensive at run time in some circumstances, however this way is more standard, safer, and in general recommended.
+
+The code that relies on possibility of casting to base should be amended so that handle of argument type is always used in function call, and to use DownCast() to safely convert the result to desired type.
+For instance, the code from the example below can be changed as follows:
+
+~~~~~
+Handle(Geom_Line) aLine;
+Handle(Geom_Curve) aCurve;
+if (GetCurve (aCure) && !(aLine = Handle(Geom_Line)::DownCast (aCurve)).IsNull()) {
+  // use aLine safely
+}
+~~~~~
+
 @subsubsection upgrade_occt700_cdl_compat Preserving compatibility with OCCT 6.x
 
 If you like to preserve the compatibility of your application code with OCCT versions 6.x even after the upgrade to 7.0, consider the following suggestions:
diff --git a/src/AIS/AIS_LocalContext_1.cxx b/src/AIS/AIS_LocalContext_1.cxx
index 28c3c40029..68ecf0d8a3 100644
--- a/src/AIS/AIS_LocalContext_1.cxx
+++ b/src/AIS/AIS_LocalContext_1.cxx
@@ -1350,12 +1350,12 @@ Standard_Boolean AIS_LocalContext::IsShape(const Standard_Integer Index) const
 
 Standard_Boolean AIS_LocalContext::IsValidForSelection(const Handle(AIS_InteractiveObject)& anIObj) const 
 {
-
+  const Handle(SelectMgr_SelectableObject)& aSelObj = anIObj; // to avoid ambiguity
   // Shape was not transfered from AIS_Shape to EntityOwner
   Handle(AIS_Shape) shape = Handle(AIS_Shape)::DownCast(anIObj);
   if( !shape.IsNull() ) 
-    return myFilters->IsOk(new StdSelect_BRepOwner(shape->Shape(),shape));
-  return myFilters->IsOk(new SelectMgr_EntityOwner((const Handle(SelectMgr_SelectableObject)&)anIObj));
+    return myFilters->IsOk(new StdSelect_BRepOwner(shape->Shape(), aSelObj));
+  return myFilters->IsOk(new SelectMgr_EntityOwner(aSelObj));
 }
 
 
diff --git a/src/BinDrivers/BinDrivers.cxx b/src/BinDrivers/BinDrivers.cxx
index f4e38ec25f..e611214898 100644
--- a/src/BinDrivers/BinDrivers.cxx
+++ b/src/BinDrivers/BinDrivers.cxx
@@ -46,7 +46,7 @@ const Handle(Standard_Transient)& BinDrivers::Factory(const Standard_GUID& theGU
 #ifdef OCCT_DEBUG
     cout << "BinDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(BinDrivers_DocumentStorageDriver) model_sd =
+    static Handle(Standard_Transient) model_sd =
       new BinDrivers_DocumentStorageDriver;
     return model_sd;
   }
@@ -56,7 +56,7 @@ const Handle(Standard_Transient)& BinDrivers::Factory(const Standard_GUID& theGU
 #ifdef OCCT_DEBUG
     cout << "BinDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle(BinDrivers_DocumentRetrievalDriver) model_rd =
+    static Handle(Standard_Transient) model_rd =
       new BinDrivers_DocumentRetrievalDriver;
     return model_rd;
   }
diff --git a/src/BinLDrivers/BinLDrivers.cxx b/src/BinLDrivers/BinLDrivers.cxx
index 6b597ac465..5ed6d3916d 100644
--- a/src/BinLDrivers/BinLDrivers.cxx
+++ b/src/BinLDrivers/BinLDrivers.cxx
@@ -45,7 +45,7 @@ const Handle(Standard_Transient)& BinLDrivers::Factory(const Standard_GUID& theG
 #ifdef OCCT_DEBUG
     cout << "BinLDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(BinLDrivers_DocumentStorageDriver) model_sd =
+    static Handle(Standard_Transient) model_sd =
       new BinLDrivers_DocumentStorageDriver;
     return model_sd;
   }
@@ -55,7 +55,7 @@ const Handle(Standard_Transient)& BinLDrivers::Factory(const Standard_GUID& theG
 #ifdef OCCT_DEBUG
     cout << "BinLDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle(BinLDrivers_DocumentRetrievalDriver) model_rd =
+    static Handle(Standard_Transient) model_rd =
       new BinLDrivers_DocumentRetrievalDriver;
     return model_rd;
   }
diff --git a/src/BinTObjDrivers/BinTObjDrivers.cxx b/src/BinTObjDrivers/BinTObjDrivers.cxx
index 6385c8a505..a3181cbfb7 100644
--- a/src/BinTObjDrivers/BinTObjDrivers.cxx
+++ b/src/BinTObjDrivers/BinTObjDrivers.cxx
@@ -37,7 +37,7 @@ const Handle(Standard_Transient)& BinTObjDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "BinTObjDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(BinTObjDrivers_DocumentStorageDriver) model_sd
+    static Handle(Standard_Transient) model_sd
       = new BinTObjDrivers_DocumentStorageDriver;
     return model_sd;
   }
@@ -47,7 +47,7 @@ const Handle(Standard_Transient)& BinTObjDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "BinTObjDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle (BinTObjDrivers_DocumentRetrievalDriver) model_rd
+    static Handle (Standard_Transient) model_rd
       = new BinTObjDrivers_DocumentRetrievalDriver;
     return model_rd;
   }
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers.cxx b/src/BinXCAFDrivers/BinXCAFDrivers.cxx
index 5edd58b3ec..3d1d36a64f 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers.cxx
+++ b/src/BinXCAFDrivers/BinXCAFDrivers.cxx
@@ -40,7 +40,7 @@ const Handle(Standard_Transient)& BinXCAFDrivers::Factory(const Standard_GUID& t
 #ifdef OCCT_DEBUG
     cout << "BinXCAFDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(BinXCAFDrivers_DocumentStorageDriver) model_sd =
+    static Handle(Standard_Transient) model_sd =
       new BinXCAFDrivers_DocumentStorageDriver;
     return model_sd;
   }
@@ -50,7 +50,7 @@ const Handle(Standard_Transient)& BinXCAFDrivers::Factory(const Standard_GUID& t
 #ifdef OCCT_DEBUG
     cout << "BinXCAFDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle(BinXCAFDrivers_DocumentRetrievalDriver) model_rd =
+    static Handle(Standard_Transient) model_rd =
       new BinXCAFDrivers_DocumentRetrievalDriver;
     return model_rd;
   }
diff --git a/src/FWOSDriver/FWOSDriver.cxx b/src/FWOSDriver/FWOSDriver.cxx
index 21807732ef..c3076bcc66 100644
--- a/src/FWOSDriver/FWOSDriver.cxx
+++ b/src/FWOSDriver/FWOSDriver.cxx
@@ -24,7 +24,7 @@
 PLUGIN(FWOSDriver)
 
 const Handle(Standard_Transient)& FWOSDriver::Factory(const Standard_GUID& /*aGUID*/) {
-  static Handle(FWOSDriver_DriverFactory) f;
+  static Handle(Standard_Transient) f;
   if(f.IsNull()) f = new FWOSDriver_DriverFactory;
   return f;
 }
diff --git a/src/GC/GC_MakeArcOfCircle.hxx b/src/GC/GC_MakeArcOfCircle.hxx
index 7d4d45aa07..5aba70b743 100644
--- a/src/GC/GC_MakeArcOfCircle.hxx
+++ b/src/GC/GC_MakeArcOfCircle.hxx
@@ -88,7 +88,6 @@ public:
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_TrimmedCurve) TheArc;
diff --git a/src/GC/GC_MakeArcOfEllipse.hxx b/src/GC/GC_MakeArcOfEllipse.hxx
index 6f1f302c82..e9e93e76aa 100644
--- a/src/GC/GC_MakeArcOfEllipse.hxx
+++ b/src/GC/GC_MakeArcOfEllipse.hxx
@@ -66,7 +66,6 @@ public:
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_TrimmedCurve) TheArc;
diff --git a/src/GC/GC_MakeArcOfHyperbola.hxx b/src/GC/GC_MakeArcOfHyperbola.hxx
index 12263ad819..0eca295811 100644
--- a/src/GC/GC_MakeArcOfHyperbola.hxx
+++ b/src/GC/GC_MakeArcOfHyperbola.hxx
@@ -64,7 +64,6 @@ public:
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_TrimmedCurve) TheArc;
diff --git a/src/GC/GC_MakeArcOfParabola.hxx b/src/GC/GC_MakeArcOfParabola.hxx
index 34973ca88d..b4d0bb50d6 100644
--- a/src/GC/GC_MakeArcOfParabola.hxx
+++ b/src/GC/GC_MakeArcOfParabola.hxx
@@ -61,7 +61,6 @@ public:
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_TrimmedCurve) TheArc;
diff --git a/src/GC/GC_MakeCircle.hxx b/src/GC/GC_MakeCircle.hxx
index 77915ccd96..71419995af 100644
--- a/src/GC/GC_MakeCircle.hxx
+++ b/src/GC/GC_MakeCircle.hxx
@@ -101,7 +101,6 @@ public:
   Standard_EXPORT const Handle(Geom_Circle)& Value() const;
 
   operator const Handle(Geom_Circle)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_Circle) TheCircle;
diff --git a/src/GC/GC_MakeConicalSurface.hxx b/src/GC/GC_MakeConicalSurface.hxx
index 82477d85ff..db5c35d493 100644
--- a/src/GC/GC_MakeConicalSurface.hxx
+++ b/src/GC/GC_MakeConicalSurface.hxx
@@ -125,7 +125,6 @@ public:
   Standard_EXPORT const Handle(Geom_ConicalSurface)& Value() const;
 
   operator const Handle(Geom_ConicalSurface)& () const { return Value(); }
-  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
   Handle(Geom_ConicalSurface) TheCone;
diff --git a/src/GC/GC_MakeCylindricalSurface.hxx b/src/GC/GC_MakeCylindricalSurface.hxx
index ba0f3d8fb5..a29e75e60d 100644
--- a/src/GC/GC_MakeCylindricalSurface.hxx
+++ b/src/GC/GC_MakeCylindricalSurface.hxx
@@ -113,7 +113,6 @@ public:
   Standard_EXPORT const Handle(Geom_CylindricalSurface)& Value() const;
 
   operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }
-  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
   Handle(Geom_CylindricalSurface) TheCylinder;
diff --git a/src/GC/GC_MakeEllipse.hxx b/src/GC/GC_MakeEllipse.hxx
index 4e201dc329..48c56985ec 100644
--- a/src/GC/GC_MakeEllipse.hxx
+++ b/src/GC/GC_MakeEllipse.hxx
@@ -79,7 +79,6 @@ public:
   Standard_EXPORT const Handle(Geom_Ellipse)& Value() const;
 
   operator const Handle(Geom_Ellipse)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_Ellipse) TheEllipse;
diff --git a/src/GC/GC_MakeHyperbola.hxx b/src/GC/GC_MakeHyperbola.hxx
index 6bdf8bfe16..7c0f8e2d7b 100644
--- a/src/GC/GC_MakeHyperbola.hxx
+++ b/src/GC/GC_MakeHyperbola.hxx
@@ -89,7 +89,6 @@ public:
   Standard_EXPORT const Handle(Geom_Hyperbola)& Value() const;
 
   operator const Handle(Geom_Hyperbola)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_Hyperbola) TheHyperbola;
diff --git a/src/GC/GC_MakeLine.hxx b/src/GC/GC_MakeLine.hxx
index 6cdf3a15e9..44bd5b0190 100644
--- a/src/GC/GC_MakeLine.hxx
+++ b/src/GC/GC_MakeLine.hxx
@@ -78,7 +78,6 @@ public:
   Standard_EXPORT const Handle(Geom_Line)& Value() const;
 
   operator const Handle(Geom_Line)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_Line) TheLine;
diff --git a/src/GC/GC_MakePlane.hxx b/src/GC/GC_MakePlane.hxx
index dfe23399c3..87644cb71c 100644
--- a/src/GC/GC_MakePlane.hxx
+++ b/src/GC/GC_MakePlane.hxx
@@ -102,7 +102,6 @@ public:
   Standard_EXPORT const Handle(Geom_Plane)& Value() const;
 
   operator const Handle(Geom_Plane)& () const { return Value(); }
-  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
   Handle(Geom_Plane) ThePlane;
diff --git a/src/GC/GC_MakeSegment.hxx b/src/GC/GC_MakeSegment.hxx
index 1f927238f3..82f23ea408 100644
--- a/src/GC/GC_MakeSegment.hxx
+++ b/src/GC/GC_MakeSegment.hxx
@@ -68,7 +68,6 @@ public:
   Standard_EXPORT const Handle(Geom_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom_TrimmedCurve) TheSegment;
diff --git a/src/GC/GC_MakeTrimmedCone.hxx b/src/GC/GC_MakeTrimmedCone.hxx
index 65483086c4..db068b7457 100644
--- a/src/GC/GC_MakeTrimmedCone.hxx
+++ b/src/GC/GC_MakeTrimmedCone.hxx
@@ -77,7 +77,6 @@ public:
   Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const;
 
   operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
-  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
   Handle(Geom_RectangularTrimmedSurface) TheCone;
diff --git a/src/GC/GC_MakeTrimmedCylinder.hxx b/src/GC/GC_MakeTrimmedCylinder.hxx
index 437aa80c8b..50811ea9ae 100644
--- a/src/GC/GC_MakeTrimmedCylinder.hxx
+++ b/src/GC/GC_MakeTrimmedCylinder.hxx
@@ -95,7 +95,6 @@ public:
   Standard_EXPORT const Handle(Geom_RectangularTrimmedSurface)& Value() const;
 
   operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }
-  operator const Handle(Geom_Surface)& () const { return Value(); }
 
 private:
   Handle(Geom_RectangularTrimmedSurface) TheCyl;
diff --git a/src/GCE2d/GCE2d_MakeArcOfCircle.hxx b/src/GCE2d/GCE2d_MakeArcOfCircle.hxx
index 34ca3efc19..77471e52f0 100644
--- a/src/GCE2d/GCE2d_MakeArcOfCircle.hxx
+++ b/src/GCE2d/GCE2d_MakeArcOfCircle.hxx
@@ -74,7 +74,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_TrimmedCurve) TheArc;
diff --git a/src/GCE2d/GCE2d_MakeArcOfEllipse.hxx b/src/GCE2d/GCE2d_MakeArcOfEllipse.hxx
index a2c8fd27ab..bf63890e06 100644
--- a/src/GCE2d/GCE2d_MakeArcOfEllipse.hxx
+++ b/src/GCE2d/GCE2d_MakeArcOfEllipse.hxx
@@ -66,7 +66,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_TrimmedCurve) TheArc;
diff --git a/src/GCE2d/GCE2d_MakeArcOfHyperbola.hxx b/src/GCE2d/GCE2d_MakeArcOfHyperbola.hxx
index 2393933597..155bac5ead 100644
--- a/src/GCE2d/GCE2d_MakeArcOfHyperbola.hxx
+++ b/src/GCE2d/GCE2d_MakeArcOfHyperbola.hxx
@@ -65,7 +65,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_TrimmedCurve) TheArc;
diff --git a/src/GCE2d/GCE2d_MakeArcOfParabola.hxx b/src/GCE2d/GCE2d_MakeArcOfParabola.hxx
index 854f103706..0f0613de31 100644
--- a/src/GCE2d/GCE2d_MakeArcOfParabola.hxx
+++ b/src/GCE2d/GCE2d_MakeArcOfParabola.hxx
@@ -65,7 +65,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_TrimmedCurve) TheArc;
diff --git a/src/GCE2d/GCE2d_MakeCircle.hxx b/src/GCE2d/GCE2d_MakeCircle.hxx
index d51dcaa94f..ce073285a5 100644
--- a/src/GCE2d/GCE2d_MakeCircle.hxx
+++ b/src/GCE2d/GCE2d_MakeCircle.hxx
@@ -103,7 +103,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_Circle)& Value() const;
 
   operator const Handle(Geom2d_Circle)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_Circle) TheCircle;
diff --git a/src/GCE2d/GCE2d_MakeEllipse.hxx b/src/GCE2d/GCE2d_MakeEllipse.hxx
index 849100f8f6..350bb0b3dd 100644
--- a/src/GCE2d/GCE2d_MakeEllipse.hxx
+++ b/src/GCE2d/GCE2d_MakeEllipse.hxx
@@ -88,7 +88,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_Ellipse)& Value() const;
 
   operator const Handle(Geom2d_Ellipse)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_Ellipse) TheEllipse;
diff --git a/src/GCE2d/GCE2d_MakeHyperbola.hxx b/src/GCE2d/GCE2d_MakeHyperbola.hxx
index e9936c8a38..74485c7812 100644
--- a/src/GCE2d/GCE2d_MakeHyperbola.hxx
+++ b/src/GCE2d/GCE2d_MakeHyperbola.hxx
@@ -108,7 +108,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_Hyperbola)& Value() const;
 
   operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_Hyperbola) TheHyperbola;
diff --git a/src/GCE2d/GCE2d_MakeLine.hxx b/src/GCE2d/GCE2d_MakeLine.hxx
index a13d9d6e1e..68c88902c1 100644
--- a/src/GCE2d/GCE2d_MakeLine.hxx
+++ b/src/GCE2d/GCE2d_MakeLine.hxx
@@ -77,7 +77,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_Line)& Value() const;
 
   operator const Handle(Geom2d_Line)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_Line) TheLine;
diff --git a/src/GCE2d/GCE2d_MakeParabola.hxx b/src/GCE2d/GCE2d_MakeParabola.hxx
index 0111c22f6a..0687d7d8c4 100644
--- a/src/GCE2d/GCE2d_MakeParabola.hxx
+++ b/src/GCE2d/GCE2d_MakeParabola.hxx
@@ -106,7 +106,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_Parabola)& Value() const;
 
   operator const Handle(Geom2d_Parabola)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_Parabola) TheParabola;
diff --git a/src/GCE2d/GCE2d_MakeSegment.hxx b/src/GCE2d/GCE2d_MakeSegment.hxx
index 679bc14564..e2498196d8 100644
--- a/src/GCE2d/GCE2d_MakeSegment.hxx
+++ b/src/GCE2d/GCE2d_MakeSegment.hxx
@@ -82,7 +82,6 @@ public:
   Standard_EXPORT const Handle(Geom2d_TrimmedCurve)& Value() const;
 
   operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }
-  operator const Handle(Geom2d_Curve)& () const { return Value(); }
 
 private:
   Handle(Geom2d_TrimmedCurve) TheSegment;
diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 3762d4b2fc..ab026e979a 100644
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -210,7 +210,7 @@ OpenGl_Context::~OpenGl_Context()
   }
 
   // release shared resources if any
-  if (((const Handle(Standard_Transient)& )mySharedResources)->GetRefCount() <= 1)
+  if (mySharedResources->GetRefCount() <= 1)
   {
     myShaderManager.Nullify();
     for (NCollection_DataMap<TCollection_AsciiString, Handle(OpenGl_Resource)>::Iterator anIter (*mySharedResources);
@@ -2384,7 +2384,7 @@ void OpenGl_Context::ReleaseResource (const TCollection_AsciiString& theKey,
   {
     return;
   }
-  const Handle(OpenGl_Resource)& aRes = mySharedResources->Find (theKey);
+  auto& aRes = mySharedResources->Find (theKey);
   if (aRes->GetRefCount() > 1)
   {
     return;
@@ -2432,7 +2432,7 @@ void OpenGl_Context::ReleaseDelayed()
       continue;
     }
 
-    Handle(OpenGl_Resource)& aRes = mySharedResources->ChangeFind (aKey);
+    auto& aRes = mySharedResources->ChangeFind (aKey);
     if (aRes->GetRefCount() > 1)
     {
       // should be only 1 instance in mySharedResources
diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx
index 22ee0e2fe9..75f46a5cdb 100644
--- a/src/PrsMgr/PrsMgr_Presentation.cxx
+++ b/src/PrsMgr/PrsMgr_Presentation.cxx
@@ -40,7 +40,7 @@ namespace
     State_Visible
   };
 
-  static BeforeHighlightState StructureState(const Handle(PrsMgr_Prs)& theStructure)
+  static BeforeHighlightState StructureState(const Handle(Prs3d_Presentation)& theStructure)
   {
     return !theStructure->IsDisplayed() ?
       State_Empty : !theStructure->IsVisible() ?
diff --git a/src/PrsMgr/PrsMgr_Presentation.hxx b/src/PrsMgr/PrsMgr_Presentation.hxx
index e93f122a3a..fd2879d058 100644
--- a/src/PrsMgr/PrsMgr_Presentation.hxx
+++ b/src/PrsMgr/PrsMgr_Presentation.hxx
@@ -133,7 +133,7 @@ private:
   Standard_EXPORT static Handle(Prs3d_Projector) Projector (const Handle(Graphic3d_DataStructureManager)& theProjector);
 
   Handle(PrsMgr_PresentationManager) myPresentationManager;
-  Handle(PrsMgr_Prs) myStructure;
+  Handle(Prs3d_Presentation) myStructure;
   PrsMgr_PresentableObjectPointer myPresentableObject;
   Standard_Boolean myMustBeUpdated;
   Standard_Integer myBeforeHighlightState;
diff --git a/src/Standard/Standard_Handle.hxx b/src/Standard/Standard_Handle.hxx
index c037e608e2..23b075bc14 100644
--- a/src/Standard/Standard_Handle.hxx
+++ b/src/Standard/Standard_Handle.hxx
@@ -24,13 +24,27 @@ class Standard_Transient;
 
 namespace opencascade {
 
+  //! Trait yielding true if class T1 is base of T2 but not the same
+  template <class T1, class T2, class Dummy = void>
+  struct is_base_but_not_same : std::is_base_of <T1, T2> {};
+
+  //! Explicit specialization of is_base_of trait to workaround the
+  //! requirement of type to be complete when T1 and T2 are the same.
+  template <class T1, class T2>
+  struct is_base_but_not_same <T1, T2, typename std::enable_if <std::is_same <T1, T2>::value>::type> : std::false_type {};
+
   //! Intrusive smart pointer for use with Standard_Transient class and its descendants.
   //!
   //! This class is similar to boost::intrusive_ptr<>, with additional
   //! feature historically supported by Handles in OCCT:
   //! it has type conversion to const reference to handle to the base types,
   //! which allows it to be passed by reference
-  //! in functions accepring reference to handle to base class.
+  //! in functions accepting reference to handle to base class.
+  //!
+  //! These casts (potentially unsafe) can be disabled by defining macro
+  //! OCCT_HANDLE_NOCAST; if it is defined, generalized copy constructor
+  //! and assignment operators are defined allowing to initialize handle
+  //! of base type from handle to derived type.
   template <class T>
   class handle
   {
@@ -48,14 +62,7 @@ namespace opencascade {
     {
       BeginScope();
     }
-/* TODO: uncomment and remove const from method above
-    //! Constructor from const pointer to new object;
-    //! will raise exception if object's reference counter is zero 
-    explicit handle (const T *thePtr) : entity(thePtr->This()) 
-    {
-      BeginScope();
-    }
-*/
+
     //! Copy constructor
     handle (const handle& theHandle) : entity(theHandle.entity)
     {
@@ -96,14 +103,7 @@ namespace opencascade {
       Assign (const_cast<T*>(thePtr));
       return *this;
     }
-/* uncomment along with constructor 
-    //! Assignment to pointer to const object
-    handle& operator= (const T* thePtr)
-    {
-      Assign (thePtr->This());
-      return *this;
-    }
-*/
+
     //! STL-like cast to pointer to referred object
     const T* get () const { return static_cast<const T*>(this->entity); }
 
@@ -202,13 +202,36 @@ namespace opencascade {
 
 #endif
 
-    //! Upcast to const reference to base type.
+    // Support of conversions to handle of base type:
+    // - copy and move constructors and assignment operators if OCCT_HANDLE_NOCAST is defined
+    // - operators of upcast to const reference to base type otherwise
 #if (defined(__clang__)) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1206) || \
     (defined(_MSC_VER) && _MSC_VER >= 1800) || \
     (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
 
+#ifdef OCCT_HANDLE_NOCAST
+
+    //! Generalized copy constructor.
+    //! Constructs handle holding entity of base type (T) from the one which holds entity of derived type (T2).
+    template <class T2, typename = typename std::enable_if <is_base_but_not_same <T, T2>::value>::type>
+    handle (const handle<T2>& theHandle) :
+      entity(theHandle.entity)
+    {
+      BeginScope();
+    }
+
+    //! Generalized assignment operator
+    template <class T2, typename = typename std::enable_if <is_base_but_not_same <T, T2>::value>::type>
+    handle operator = (const handle<T2>& theHandle)
+    {
+      Assign (theHandle.entity);
+      return *this;
+    }
+
+#else
+
     //! Upcast to const reference to base type.
-    template <class T2, typename = typename std::enable_if<std::is_base_of<T2, T>::value>::type>
+    template <class T2, typename = typename std::enable_if<is_base_but_not_same<T2, T>::value>::type>
     operator const handle<T2>& () const
     {
       return reinterpret_cast<const handle<T2>&>(*this);
@@ -216,14 +239,39 @@ namespace opencascade {
 
     //! Upcast to non-const reference to base type.
     //! NB: this cast can be dangerous, but required for legacy code; see #26377
-    template <class T2, typename = typename std::enable_if<std::is_base_of<T2, T>::value>::type>
+    template <class T2, typename = typename std::enable_if<is_base_but_not_same<T2, T>::value>::type>
     operator handle<T2>& ()
     {
       return reinterpret_cast<handle<T2>&>(*this);
     }
 
+#endif /* OCCT_HANDLE_NOCAST */
+
 #else /* fallback version for compilers not supporting default arguments of function templates (VC10, VC11, GCC below 4.3) */
 
+#ifdef OCCT_HANDLE_NOCAST
+
+    //! Generalized copy constructor.
+    //! Constructs handle holding entity of base type (T) from the one which holds entity of derived type (T2).
+    template <class T2>
+    handle (const handle<T2>& theHandle, typename std::enable_if <is_base_but_not_same <T, T2>::value>::type* = nullptr) :
+      entity(theHandle.entity)
+    {
+      BeginScope();
+    }
+
+    //! Generalized assignment operator.
+    template <class T2>
+    handle operator = (const handle<T2>& theHandle)
+    {
+      std::enable_if <is_base_but_not_same <T, T2>::value, void*>::type aTypeCheckHelperVar;
+      (void)aTypeCheckHelperVar;
+      Assign (theHandle.entity);
+      return *this;
+    }
+
+#else
+
     //! Upcast to const reference to base type.
     //! NB: this implementation will cause ambiguity errors on calls to overloaded
     //! functions accepting handles to different types, since compatibility is 
@@ -233,7 +281,7 @@ namespace opencascade {
     {
       // error "type is not a member of enable_if" will be generated if T2 is not sub-type of T
       // (handle is being cast to const& to handle of non-base type)
-      return reinterpret_cast<typename std::enable_if<std::is_base_of<T2, T>::value, const handle<T2>&>::type>(*this);
+      return reinterpret_cast<typename std::enable_if<is_base_but_not_same<T2, T>::value, const handle<T2>&>::type>(*this);
     }
 
     //! Upcast to non-const reference to base type.
@@ -244,10 +292,12 @@ namespace opencascade {
     {
       // error "type is not a member of enable_if" will be generated if T2 is not sub-type of T
       // (handle is being cast to const& to handle of non-base type)
-      return reinterpret_cast<typename std::enable_if<std::is_base_of<T2, T>::value, handle<T2>&>::type>(*this);
+      return reinterpret_cast<typename std::enable_if<is_base_but_not_same<T2, T>::value, handle<T2>&>::type>(*this);
     }
 
-#endif
+#endif /* OCCT_HANDLE_NOCAST */
+
+#endif /* compiler switch */
 
   private:
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.cxx
index b6cec72f41..29ce2239c9 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.cxx
@@ -68,7 +68,7 @@ void TopOpeBRepBuild_LoopSet::NextLoop()
 //purpose  : 
 //=======================================================================
 
-const Handle(TopOpeBRepBuild_Loop)& TopOpeBRepBuild_LoopSet::Loop() const
+Handle(TopOpeBRepBuild_Loop) TopOpeBRepBuild_LoopSet::Loop() const
 {
   const Handle(TopOpeBRepBuild_Loop)& L = myLoopIterator.Value();
   return L;
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.hxx
index c2c933327f..527a4061c4 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.hxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_LoopSet.hxx
@@ -48,7 +48,7 @@ public:
   
   Standard_EXPORT virtual void NextLoop();
   
-  Standard_EXPORT virtual const Handle(TopOpeBRepBuild_Loop)& Loop() const;
+  Standard_EXPORT virtual Handle(TopOpeBRepBuild_Loop) Loop() const;
 
 
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
index 028026b5bd..91e855996f 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.cxx
@@ -337,10 +337,9 @@ void  TopOpeBRepBuild_PaveSet::NextLoop()
 //purpose  : 
 //=======================================================================
 
-const Handle(TopOpeBRepBuild_Loop)& TopOpeBRepBuild_PaveSet::Loop()const 
+Handle(TopOpeBRepBuild_Loop) TopOpeBRepBuild_PaveSet::Loop()const 
 {
-  const Handle(TopOpeBRepBuild_Loop)& L = myVerticesIt.Value();
-  return L;
+  return Handle(TopOpeBRepBuild_Loop)(myVerticesIt.Value());
 }
 
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.hxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.hxx
index 18149b7678..8915cd1df7 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.hxx
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_PaveSet.hxx
@@ -57,7 +57,7 @@ public:
   
   Standard_EXPORT virtual void NextLoop() Standard_OVERRIDE;
   
-  Standard_EXPORT virtual const Handle(TopOpeBRepBuild_Loop)& Loop() const Standard_OVERRIDE;
+  Standard_EXPORT virtual Handle(TopOpeBRepBuild_Loop) Loop() const Standard_OVERRIDE;
   
   Standard_EXPORT const TopoDS_Edge& Edge() const;
   
diff --git a/src/XSControl/XSControl_Controller.cxx b/src/XSControl/XSControl_Controller.cxx
index 3df9402d3f..cc9e0b516f 100644
--- a/src/XSControl/XSControl_Controller.cxx
+++ b/src/XSControl/XSControl_Controller.cxx
@@ -659,7 +659,7 @@ static IFSelect_ReturnStatus TransferFinder
   dispfiles->SetFinalSelection(slr);
   WS->AddNamedItem ("xst-disp-files",dispfiles);
   Handle(IFSelect_DispPerSignature) dispsign = new IFSelect_DispPerSignature;
-  dispsign->SetSignCounter(new IFSelect_SignCounter(stc));
+  dispsign->SetSignCounter(new IFSelect_SignCounter(Handle(IFSelect_Signature)(stc)));
   dispsign->SetFinalSelection(slr);
   WS->AddNamedItem ("xst-disp-sign",dispsign);
 
diff --git a/src/XmlDrivers/XmlDrivers.cxx b/src/XmlDrivers/XmlDrivers.cxx
index 34d858dcc6..45436059d9 100644
--- a/src/XmlDrivers/XmlDrivers.cxx
+++ b/src/XmlDrivers/XmlDrivers.cxx
@@ -45,7 +45,7 @@ const Handle(Standard_Transient)& XmlDrivers::Factory(const Standard_GUID& theGU
 #ifdef OCCT_DEBUG
     cout << "XmlDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(XmlDrivers_DocumentStorageDriver) model_sd =
+    static Handle(Standard_Transient) model_sd =
       new XmlDrivers_DocumentStorageDriver
         ("Copyright: Open Cascade, 2001-2002"); // default copyright
     return model_sd;
@@ -56,7 +56,7 @@ const Handle(Standard_Transient)& XmlDrivers::Factory(const Standard_GUID& theGU
 #ifdef OCCT_DEBUG
     cout << "XmlDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle (XmlDrivers_DocumentRetrievalDriver) model_rd =
+    static Handle (Standard_Transient) model_rd =
       new XmlDrivers_DocumentRetrievalDriver ();
     return model_rd;
   }
diff --git a/src/XmlLDrivers/XmlLDrivers.cxx b/src/XmlLDrivers/XmlLDrivers.cxx
index 4f365b83c2..dac1ecb1ac 100644
--- a/src/XmlLDrivers/XmlLDrivers.cxx
+++ b/src/XmlLDrivers/XmlLDrivers.cxx
@@ -45,7 +45,7 @@ const Handle(Standard_Transient)& XmlLDrivers::Factory(const Standard_GUID& theG
 #ifdef OCCT_DEBUG
     cout << "XmlLDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(XmlLDrivers_DocumentStorageDriver) model_sd =
+    static Handle(Standard_Transient) model_sd =
       new XmlLDrivers_DocumentStorageDriver
         ("Copyright: Open Cascade, 2001-2002"); // default copyright
     return model_sd;
@@ -56,7 +56,7 @@ const Handle(Standard_Transient)& XmlLDrivers::Factory(const Standard_GUID& theG
 #ifdef OCCT_DEBUG
     cout << "XmlLDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle (XmlLDrivers_DocumentRetrievalDriver) model_rd =
+    static Handle (Standard_Transient) model_rd =
       new XmlLDrivers_DocumentRetrievalDriver ();
     return model_rd;
   }
diff --git a/src/XmlTObjDrivers/XmlTObjDrivers.cxx b/src/XmlTObjDrivers/XmlTObjDrivers.cxx
index 443f1f4bfc..e3a42b3ffb 100644
--- a/src/XmlTObjDrivers/XmlTObjDrivers.cxx
+++ b/src/XmlTObjDrivers/XmlTObjDrivers.cxx
@@ -38,7 +38,7 @@ const Handle(Standard_Transient)& XmlTObjDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "XmlTObjDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(XmlTObjDrivers_DocumentStorageDriver) model_sd
+    static Handle(Standard_Transient) model_sd
       = new XmlTObjDrivers_DocumentStorageDriver
         ("Copyright: Open CASCADE 2004"); // default copyright
     return model_sd;
@@ -49,7 +49,7 @@ const Handle(Standard_Transient)& XmlTObjDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "XmlTObjDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle (XmlTObjDrivers_DocumentRetrievalDriver) model_rd
+    static Handle (Standard_Transient) model_rd
       = new XmlTObjDrivers_DocumentRetrievalDriver;
     return model_rd;
   }
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx b/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx
index 719bdca43a..7cc199c806 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers.cxx
@@ -33,7 +33,7 @@ const Handle(Standard_Transient)& XmlXCAFDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "XmlXCAFDrivers : Storage Plugin" << endl;
 #endif
-    static Handle(XmlXCAFDrivers_DocumentStorageDriver) model_sd 
+    static Handle(Standard_Transient) model_sd 
       = new XmlXCAFDrivers_DocumentStorageDriver
         ("Copyright: Open Cascade, 2001-2002"); // default copyright
     return model_sd;
@@ -43,7 +43,7 @@ const Handle(Standard_Transient)& XmlXCAFDrivers::Factory(const Standard_GUID& a
 #ifdef OCCT_DEBUG
     cout << "XmlXCAFDrivers : Retrieval Plugin" << endl;
 #endif
-    static Handle (XmlXCAFDrivers_DocumentRetrievalDriver) model_rd 
+    static Handle (Standard_Transient) model_rd 
       = new XmlXCAFDrivers_DocumentRetrievalDriver;
     return model_rd;
   }