diff --git a/conf/template/bblayers.conf.sample b/conf/template/bblayers.conf.sample
index 5dd5ab0..9696574 100644
--- a/conf/template/bblayers.conf.sample
+++ b/conf/template/bblayers.conf.sample
@@ -6,6 +6,7 @@ LCONF_VERSION = "6"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 RDKROOT := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+MW_LAYER_BUILD_TYPE ?= "MW_FEED"
 include manifest_vars.conf
 
 BBLAYERS ?= " \
@@ -29,7 +30,6 @@ BBLAYERS =+ "${@'${MANIFEST_PATH_CSPC_IMAGES}' if os.path.isfile('${MANIFEST_PAT
 BBLAYERS =+ "${@'${MANIFEST_PATH_VENDOR_RELEASE}' if os.path.isfile('${MANIFEST_PATH_VENDOR_RELEASE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_CSPC_SECURITY_RELEASE}' if os.path.isfile('${MANIFEST_PATH_CSPC_SECURITY_RELEASE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_APPLICATION_RELEASE}' if os.path.isfile('${MANIFEST_PATH_APPLICATION_RELEASE}/conf/layer.conf') else ''}"
-BBLAYERS =+ "${@'${MANIFEST_PATH_MW_RELEASE}' if os.path.isfile('${MANIFEST_PATH_MW_RELEASE}/conf/layer.conf') else ''}"
 BBLAYERS =+ "${@'${MANIFEST_PATH_PRODUCT_LAYER}' if os.path.isfile('${MANIFEST_PATH_PRODUCT_LAYER}/conf/layer.conf') else ''}"
 
 # Config layers
@@ -39,3 +39,31 @@ BBLAYERS =+ "${@'${MANIFEST_PATH_PROFILE_CONFIG}' if os.path.isfile('${MANIFEST_
 
 # xumotv product layer
 BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_PRODUCT_XUMOTV_LAYER') if d.getVar('MANIFEST_PATH_PRODUCT_XUMOTV_LAYER') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_PRODUCT_XUMOTV_LAYER') + '/conf/layer.conf') else ''}"
+
+#Middleware release feed
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_MW_RELEASE') if d.getVar('MW_LAYER_BUILD_TYPE') != 'MW_DEV' and d.getVar('MANIFEST_PATH_MW_RELEASE') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_MW_RELEASE') + '/conf/layer.conf')  else ''}"
+
+#Middleware development layer - halif headers
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_RDK_HALIF_HEADERS') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_HALIF_HEADERS') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_HALIF_HEADERS') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_OSS_EXT') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_OSS_EXT') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_OSS_EXT') + '/conf/layer.conf')  else ''}"
+
+# Middleware layers: generic
+BBLAYERS =+ " ${@d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_CSPC') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_CSPC') is not None and os.path.isfile(d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_CSPC') + '/conf/layer.conf') else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_RESTRICTED') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_RESTRICTED') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_RESTRICTED') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_GENERIC') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_GENERIC') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV_GENERIC') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_MIDDLEWARE_DEV') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_META_RDK') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_META_RDK') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_META_RDK') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_RDK_RESTRICTED') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_RESTRICTED') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_RESTRICTED') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_RDK_VIDEO') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_VIDEO') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_VIDEO') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_META_PYTHON2') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_META_PYTHON2') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_META_PYTHON2') + '/conf/layer.conf')  else ''}"
+BBLAYERS =+ "${@d.getVar('MANIFEST_PATH_RDK_SKY') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_SKY') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_SKY') + '/conf/layer.conf')  else ''}"
+
+# Middleware layers: restricted/proprietary
+BBLAYERS =+ " \
+       ${@d.getVar('MANIFEST_PATH_RDK_COMCAST') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_COMCAST') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_COMCAST') + '/conf/layer.conf')  else ''} \
+       ${@d.getVar('MANIFEST_PATH_COMCAST_VIDEO') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_COMCAST_VIDEO') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_COMCAST_VIDEO') + '/conf/layer.conf')  else ''} \
+       ${@d.getVar('MANIFEST_PATH_COMCAST_VOICE_SDK') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_COMCAST_VOICE_SDK') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_COMCAST_VOICE_SDK') + '/conf/layer.conf')  else ''} \
+       ${@d.getVar('MANIFEST_PATH_META_QT5') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_META_QT5') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_META_QT5') + '/conf/layer.conf')  else ''} \
+       ${@d.getVar('MANIFEST_PATH_MEDIARITE') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_MEDIARITE') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_MEDIARITE') + '/conf/layer.conf')  else ''} \
+       ${@d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') if d.getVar('MW_LAYER_BUILD_TYPE') == 'MW_DEV' and d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') is not None and  os.path.isfile(d.getVar('MANIFEST_PATH_RDK_CPC_HALIF_HEADERS') + '/conf/layer.conf')  else ''} \
+       "
diff --git a/conf/template/local.conf.sample b/conf/template/local.conf.sample
index 55da895..3dc327f 100644
--- a/conf/template/local.conf.sample
+++ b/conf/template/local.conf.sample
@@ -244,6 +244,7 @@ BUILDHISTORY_COMMIT = "1"
 
 DISTRO_CODENAME = "##DISTRO_CODENAME##"
 DISTRO_FEATURES += "##DISTRO_CODENAME##"
+MW_LAYER_BUILD_TYPE = "##MW_LAYER_BUILD_TYPE##"
 
 #require conf/distro/include/##RDK_FLAVOR##.inc
 
@@ -254,7 +255,7 @@ BB_SRCREV_POLICY ??= "cache"
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
-CONF_VERSION = "2"
+CONF_VERSION = "${@oe.utils.conditional('MW_LAYER_BUILD_TYPE', 'MW_DEV', '1', '2', d)}"
 
 #
 # Debugging Tools