Index: branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp	(revision 201)
@@ -1595,5 +1595,5 @@
 #endif
 
-#if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
+#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
 , m_bUseDMM34                   (false)
 #endif
Index: branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.h
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.h	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.h	(revision 201)
@@ -394,5 +394,5 @@
 #endif
 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
   Bool  m_bUseDMM34;
 #endif
@@ -678,5 +678,5 @@
 #endif
 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
   Bool getUseDMM34()         { return m_bUseDMM34; }
   Void setUseDMM34( Bool b ) { m_bUseDMM34 = b;    }
Index: branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TypeDef.h	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TypeDef.h	(revision 201)
@@ -42,8 +42,8 @@
 //! \{
 #define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
-#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled  
-#define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
-#define QC_REM_IDV_B0046                  1   //JCT3V-B0046: removal of IDV NAL unit type
-#define FIX_DEL_NULLPTR                   1
+#define QC_IV_AS_LT_B0046                 0   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled  
+#define QC_TMVP_IDX_MOD_B0046             0   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
+#define QC_REM_IDV_B0046                  0   //JCT3V-B0046: removal of IDV NAL unit type
+#define FIX_DEL_NULLPTR                   0
 
 #define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
@@ -63,6 +63,6 @@
 
 // FCO 
-#define FLEX_CODING_ORDER               1
-#if FLEX_CODING_ORDER
+#define FLEX_CODING_ORDER_M23723          1
+#if FLEX_CODING_ORDER_M23723
   #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
 #endif
Index: branches/HTM-5.0-Nokia/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibDecoder/TDecTop.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibDecoder/TDecTop.cpp	(revision 201)
@@ -1003,5 +1003,5 @@
     TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewId, pcSlice->getPOC(), false ) : NULL;
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
     if (pcTexturePic != NULL)
     {
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncCfg.h
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncCfg.h	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncCfg.h	(revision 201)
@@ -327,5 +327,5 @@
 #endif
 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
   Bool m_bUseDMM34;
 #endif
@@ -848,5 +848,5 @@
 #endif
 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
   Void setUseDMM34( Bool b) { m_bUseDMM34 = b;    }
   Bool getUseDMM34()        { return m_bUseDMM34; }
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 201)
@@ -364,5 +364,5 @@
 
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       TComPic * pcTexturePic; 
       if(m_pcEncTop->getIsDepth() == 1)
@@ -492,10 +492,15 @@
 
 #if SAIT_VSO_EST_A0033
+#ifdef FLEX_CODING_ORDER_M23723    
 {
-   Bool flag_rec;
-   flag_rec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
-    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flag_rec ) );
-    m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+  Bool flagRec;
+  flagRec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
+  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flagRec ) );
+  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
 }
+#else
+  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
+  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+#endif
 #endif
 #if LGE_WVSO_A0119
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSbac.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 201)
@@ -1077,5 +1077,5 @@
 #if HHI_DMM_PRED_TEX
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
     if ( !pcCU->getSlice()->getSPS()->getUseDMM34() )
     {
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 201)
@@ -2245,5 +2245,5 @@
 #if HHI_DMM_PRED_TEX
       
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       if ( pcCU->getSlice()->getSPS()->getUseDMM34() )
       {
@@ -2272,5 +2272,5 @@
         uiRdModeList[ numModesForFullRD++ ] = DMM_CONTOUR_PREDTEX_D_IDX;
       }
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
       }
 #endif
@@ -2319,7 +2319,7 @@
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
       if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getUseDMM34() ) 
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
         && uiOrgMode < EDGE_INTRA_IDX
 #endif
@@ -2329,5 +2329,5 @@
 
       if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight ) 
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
         && uiOrgMode < EDGE_INTRA_IDX
 #endif
@@ -6484,5 +6484,5 @@
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-#if ((HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX)&&FLEX_CODING_ORDER)
+#if ((HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX)&&FLEX_CODING_ORDER_M23723)
 Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight, Bool bDMMAvailable34 )
 #else
@@ -6517,5 +6517,5 @@
     }
 
-#if FLEX_CODING_ORDER
+#if FLEX_CODING_ORDER_M23723
     if ( !bDMMAvailable34 )
     {
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.h
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.h	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.h	(revision 201)
@@ -336,5 +336,5 @@
   Bool predIntraLumaDMMAvailable  ( UInt           uiMode, 
                                     UInt           uiWidth, 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
                                     UInt         uiHeight, 
                                     Bool         bDMMAvailable34 );
Index: branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncTop.cpp
===================================================================
--- branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncTop.cpp	(revision 200)
+++ branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncTop.cpp	(revision 201)
@@ -770,5 +770,5 @@
 #endif
 
-#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
   m_cSPS.setUseDMM34( m_bUseDMM34 );
 #endif
