diff --git a/Makefile b/Makefile
index 54463fc..99a5aeb 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@
 ##---]  INCLUDES  [---##
 ##--------------------##
 include $(TOP)/config.mk#                # configure
-include $(TOP)/makefiles/include.mk      # top level include
+include $(TOP)/makefiles-orig/include.mk      # top level include
 
 # You can set these variables from the command line.
 SPHINXOPTS   ?=
diff --git a/VERSION b/VERSION
index 419a356..7ce9b67 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.12.6-dev1
+2.12.6-dev2
diff --git a/makefiles/bin/compare_sandbox_makefiles.sh b/makefiles-orig/bin/compare_sandbox_makefiles.sh
similarity index 100%
rename from makefiles/bin/compare_sandbox_makefiles.sh
rename to makefiles-orig/bin/compare_sandbox_makefiles.sh
diff --git a/makefiles/bootstrap.mk b/makefiles-orig/bootstrap.mk
similarity index 88%
rename from makefiles/bootstrap.mk
rename to makefiles-orig/bootstrap.mk
index 5a9433b..4a8f78b 100644
--- a/makefiles/bootstrap.mk
+++ b/makefiles-orig/bootstrap.mk
@@ -48,10 +48,10 @@
     $(foreach makedir,$(subst _ROOT,_MKDIR,$(var)),\
 $(warning makedir=$(makedir))\
       $(if $($(makedir)),$(null),\
-        $(eval $(makedir)=$$$$($(var))/makefiles)\
+        $(eval $(makedir)=$$$$($(var))/makefiles-orig)\
 $(warning $(makedir) = $($($(makedir))))\
-$(info $$(wildcard $(val)/makefiles/include.mk) = $(wildcard $(val)/makefiles/include.mk))\
-        $(foreach mf,$(wildcard $(wildcard $(val)/makefiles/include.mk)),\
+$(info $$(wildcard $(val)/makefiles-orig/include.mk) = $(wildcard $(val)/makefiles-orig/include.mk))\
+        $(foreach mf,$(wildcard $(wildcard $(val)/makefiles-orig/include.mk)),\
 $(warning $$(eval include $(mf)))\
           $(eval include $(mf)))\
 )
diff --git a/makefiles/commands/include.mk b/makefiles-orig/commands/include.mk
similarity index 100%
rename from makefiles/commands/include.mk
rename to makefiles-orig/commands/include.mk
diff --git a/makefiles/commands/kail.mk b/makefiles-orig/commands/kail.mk
similarity index 100%
rename from makefiles/commands/kail.mk
rename to makefiles-orig/commands/kail.mk
diff --git a/makefiles/consts.mk b/makefiles-orig/consts.mk
similarity index 100%
rename from makefiles/consts.mk
rename to makefiles-orig/consts.mk
diff --git a/makefiles/etc/include.mk b/makefiles-orig/etc/include.mk
similarity index 100%
rename from makefiles/etc/include.mk
rename to makefiles-orig/etc/include.mk
diff --git a/makefiles/etc/todo.mk b/makefiles-orig/etc/todo.mk
similarity index 100%
rename from makefiles/etc/todo.mk
rename to makefiles-orig/etc/todo.mk
diff --git a/makefiles/gerrit/help.mk b/makefiles-orig/gerrit/help.mk
similarity index 100%
rename from makefiles/gerrit/help.mk
rename to makefiles-orig/gerrit/help.mk
diff --git a/makefiles/gerrit/include.mk b/makefiles-orig/gerrit/include.mk
similarity index 100%
rename from makefiles/gerrit/include.mk
rename to makefiles-orig/gerrit/include.mk
diff --git a/makefiles/git/ci-management.mk b/makefiles-orig/git/ci-management.mk
similarity index 100%
rename from makefiles/git/ci-management.mk
rename to makefiles-orig/git/ci-management.mk
diff --git a/makefiles/git/help.mk b/makefiles-orig/git/help.mk
similarity index 100%
rename from makefiles/git/help.mk
rename to makefiles-orig/git/help.mk
diff --git a/makefiles/git/include.mk b/makefiles-orig/git/include.mk
similarity index 100%
rename from makefiles/git/include.mk
rename to makefiles-orig/git/include.mk
diff --git a/makefiles/git/required.mk b/makefiles-orig/git/required.mk
similarity index 100%
rename from makefiles/git/required.mk
rename to makefiles-orig/git/required.mk
diff --git a/makefiles/git/submodules.mk b/makefiles-orig/git/submodules.mk
similarity index 100%
rename from makefiles/git/submodules.mk
rename to makefiles-orig/git/submodules.mk
diff --git a/makefiles/help/include.mk b/makefiles-orig/help/include.mk
similarity index 100%
rename from makefiles/help/include.mk
rename to makefiles-orig/help/include.mk
diff --git a/makefiles/help/trailer.mk b/makefiles-orig/help/trailer.mk
similarity index 100%
rename from makefiles/help/trailer.mk
rename to makefiles-orig/help/trailer.mk
diff --git a/makefiles/help/variables.mk b/makefiles-orig/help/variables.mk
similarity index 100%
rename from makefiles/help/variables.mk
rename to makefiles-orig/help/variables.mk
diff --git a/makefiles/include.mk b/makefiles-orig/include.mk
similarity index 95%
rename from makefiles/include.mk
rename to makefiles-orig/include.mk
index 0536563..7b983c1 100644
--- a/makefiles/include.mk
+++ b/makefiles-orig/include.mk
@@ -27,13 +27,13 @@
 
 ## -----------------------------------------------------------------------
 ## Define vars based on relative import (normalize symlinks)
-## Usage: include makefiles/onf/include.mk
+## Usage: include makefiles-orig/onf/include.mk
 ## -----------------------------------------------------------------------
 onf-mk-abs    ?= $(abspath $(lastword $(MAKEFILE_LIST)))
 onf-mk-top    := $(subst /include.mk,$(null),$(onf-mk-abs))
 ONF_MAKEDIR   := $(onf-mk-top)
 
-TOP ?= $(patsubst %/makefiles/include.mk,%,$(onf-mk-abs))
+TOP ?= $(patsubst %/makefiles-orig/include.mk,%,$(onf-mk-abs))
 
 include $(ONF_MAKEDIR)/consts.mk
 include $(ONF_MAKEDIR)/help/include.mk       # render target help
diff --git a/makefiles/jjb/help.mk b/makefiles-orig/jjb/help.mk
similarity index 100%
rename from makefiles/jjb/help.mk
rename to makefiles-orig/jjb/help.mk
diff --git a/makefiles/jjb/include.mk b/makefiles-orig/jjb/include.mk
similarity index 100%
rename from makefiles/jjb/include.mk
rename to makefiles-orig/jjb/include.mk
diff --git a/makefiles/jjb/required.mk b/makefiles-orig/jjb/required.mk
similarity index 100%
rename from makefiles/jjb/required.mk
rename to makefiles-orig/jjb/required.mk
diff --git a/makefiles/jjb/targets.mk b/makefiles-orig/jjb/targets.mk
similarity index 100%
rename from makefiles/jjb/targets.mk
rename to makefiles-orig/jjb/targets.mk
diff --git a/makefiles/lint/Makefile b/makefiles-orig/lint/Makefile
similarity index 100%
rename from makefiles/lint/Makefile
rename to makefiles-orig/lint/Makefile
diff --git a/makefiles/lint/doc8/excl.mk b/makefiles-orig/lint/doc8/excl.mk
similarity index 100%
rename from makefiles/lint/doc8/excl.mk
rename to makefiles-orig/lint/doc8/excl.mk
diff --git a/makefiles/lint/doc8/include.mk b/makefiles-orig/lint/doc8/include.mk
similarity index 100%
rename from makefiles/lint/doc8/include.mk
rename to makefiles-orig/lint/doc8/include.mk
diff --git a/makefiles/lint/groovy/README.md b/makefiles-orig/lint/groovy/README.md
similarity index 100%
rename from makefiles/lint/groovy/README.md
rename to makefiles-orig/lint/groovy/README.md
diff --git a/makefiles/lint/groovy/include.mk b/makefiles-orig/lint/groovy/include.mk
similarity index 100%
rename from makefiles/lint/groovy/include.mk
rename to makefiles-orig/lint/groovy/include.mk
diff --git a/makefiles/lint/groovy/urls b/makefiles-orig/lint/groovy/urls
similarity index 100%
rename from makefiles/lint/groovy/urls
rename to makefiles-orig/lint/groovy/urls
diff --git a/makefiles/lint/help.mk b/makefiles-orig/lint/help.mk
similarity index 100%
rename from makefiles/lint/help.mk
rename to makefiles-orig/lint/help.mk
diff --git a/makefiles/lint/include.mk b/makefiles-orig/lint/include.mk
similarity index 100%
rename from makefiles/lint/include.mk
rename to makefiles-orig/lint/include.mk
diff --git a/makefiles/lint/jjb.mk b/makefiles-orig/lint/jjb.mk
similarity index 100%
rename from makefiles/lint/jjb.mk
rename to makefiles-orig/lint/jjb.mk
diff --git a/makefiles/lint/json.mk b/makefiles-orig/lint/json.mk
similarity index 100%
rename from makefiles/lint/json.mk
rename to makefiles-orig/lint/json.mk
diff --git a/makefiles/lint/license/include.mk b/makefiles-orig/lint/license/include.mk
similarity index 100%
rename from makefiles/lint/license/include.mk
rename to makefiles-orig/lint/license/include.mk
diff --git a/makefiles/lint/license/reuse.mk b/makefiles-orig/lint/license/reuse.mk
similarity index 100%
rename from makefiles/lint/license/reuse.mk
rename to makefiles-orig/lint/license/reuse.mk
diff --git a/makefiles/lint/makefile.mk b/makefiles-orig/lint/makefile.mk
similarity index 100%
rename from makefiles/lint/makefile.mk
rename to makefiles-orig/lint/makefile.mk
diff --git a/makefiles/lint/python/find_utils.mk b/makefiles-orig/lint/python/find_utils.mk
similarity index 100%
rename from makefiles/lint/python/find_utils.mk
rename to makefiles-orig/lint/python/find_utils.mk
diff --git a/makefiles/lint/python/flake8.mk b/makefiles-orig/lint/python/flake8.mk
similarity index 100%
rename from makefiles/lint/python/flake8.mk
rename to makefiles-orig/lint/python/flake8.mk
diff --git a/makefiles/lint/python/include.mk b/makefiles-orig/lint/python/include.mk
similarity index 100%
rename from makefiles/lint/python/include.mk
rename to makefiles-orig/lint/python/include.mk
diff --git a/makefiles/lint/python/pylint.mk b/makefiles-orig/lint/python/pylint.mk
similarity index 100%
rename from makefiles/lint/python/pylint.mk
rename to makefiles-orig/lint/python/pylint.mk
diff --git a/makefiles/lint/robot.mk b/makefiles-orig/lint/robot.mk
similarity index 100%
rename from makefiles/lint/robot.mk
rename to makefiles-orig/lint/robot.mk
diff --git a/makefiles/lint/shell.mk b/makefiles-orig/lint/shell.mk
similarity index 100%
rename from makefiles/lint/shell.mk
rename to makefiles-orig/lint/shell.mk
diff --git a/makefiles/lint/tox/include.mk b/makefiles-orig/lint/tox/include.mk
similarity index 100%
rename from makefiles/lint/tox/include.mk
rename to makefiles-orig/lint/tox/include.mk
diff --git a/makefiles/lint/tox/tox.mk b/makefiles-orig/lint/tox/tox.mk
similarity index 100%
rename from makefiles/lint/tox/tox.mk
rename to makefiles-orig/lint/tox/tox.mk
diff --git a/makefiles/lint/urls b/makefiles-orig/lint/urls
similarity index 100%
rename from makefiles/lint/urls
rename to makefiles-orig/lint/urls
diff --git a/makefiles/lint/yaml.mk b/makefiles-orig/lint/yaml.mk
similarity index 100%
rename from makefiles/lint/yaml.mk
rename to makefiles-orig/lint/yaml.mk
diff --git a/makefiles/patches/README.md b/makefiles-orig/patches/README.md
similarity index 100%
rename from makefiles/patches/README.md
rename to makefiles-orig/patches/README.md
diff --git a/makefiles/patches/help.mk b/makefiles-orig/patches/help.mk
similarity index 100%
rename from makefiles/patches/help.mk
rename to makefiles-orig/patches/help.mk
diff --git a/makefiles/patches/include.mk b/makefiles-orig/patches/include.mk
similarity index 100%
rename from makefiles/patches/include.mk
rename to makefiles-orig/patches/include.mk
diff --git a/makefiles/targets/check.mk b/makefiles-orig/targets/check.mk
similarity index 100%
rename from makefiles/targets/check.mk
rename to makefiles-orig/targets/check.mk
diff --git a/makefiles/targets/clean.mk b/makefiles-orig/targets/clean.mk
similarity index 100%
rename from makefiles/targets/clean.mk
rename to makefiles-orig/targets/clean.mk
diff --git a/makefiles/targets/include.mk b/makefiles-orig/targets/include.mk
similarity index 100%
rename from makefiles/targets/include.mk
rename to makefiles-orig/targets/include.mk
diff --git a/makefiles/targets/sterile.mk b/makefiles-orig/targets/sterile.mk
similarity index 100%
rename from makefiles/targets/sterile.mk
rename to makefiles-orig/targets/sterile.mk
diff --git a/makefiles/targets/test-errors.mk b/makefiles-orig/targets/test-errors.mk
similarity index 100%
rename from makefiles/targets/test-errors.mk
rename to makefiles-orig/targets/test-errors.mk
diff --git a/makefiles/targets/test/ci-management.mk b/makefiles-orig/targets/test/ci-management.mk
similarity index 100%
rename from makefiles/targets/test/ci-management.mk
rename to makefiles-orig/targets/test/ci-management.mk
diff --git a/makefiles/targets/test/include.mk b/makefiles-orig/targets/test/include.mk
similarity index 100%
rename from makefiles/targets/test/include.mk
rename to makefiles-orig/targets/test/include.mk
diff --git a/makefiles/todo.mk b/makefiles-orig/todo.mk
similarity index 100%
rename from makefiles/todo.mk
rename to makefiles-orig/todo.mk
diff --git a/makefiles/utils/include.mk b/makefiles-orig/utils/include.mk
similarity index 100%
rename from makefiles/utils/include.mk
rename to makefiles-orig/utils/include.mk
diff --git a/makefiles/utils/test/makefile b/makefiles-orig/utils/test/makefile
similarity index 100%
rename from makefiles/utils/test/makefile
rename to makefiles-orig/utils/test/makefile
diff --git a/makefiles/virtualenv.mk b/makefiles-orig/virtualenv.mk
similarity index 100%
rename from makefiles/virtualenv.mk
rename to makefiles-orig/virtualenv.mk
diff --git a/makefiles/voltha/docs-catchall-targets.mk b/makefiles-orig/voltha/docs-catchall-targets.mk
similarity index 100%
rename from makefiles/voltha/docs-catchall-targets.mk
rename to makefiles-orig/voltha/docs-catchall-targets.mk
diff --git a/testing/certification.rst b/testing/certification.rst
index 4c6dd87..a32dbd5 100644
--- a/testing/certification.rst
+++ b/testing/certification.rst
@@ -69,7 +69,7 @@
 `system tests information <https://docs.voltha.org/master/testing/voltha_test_automation.html#hardware-or-physical-pod-jobs>`_
 The required patches are:
 
-- ci-management. Creates the job that will run in jenkins. `Job Example <https://github.com/opencord/ci-management/blob/master/jjb/voltha-test/voltha-certification.yaml>`_
+- ci-management. Creates the job that will run in jenkins. Job Example ``https://github.com/opencord/ci-management/blob/master/jjb/voltha-test/voltha-certification.yaml``
 - pod configs. Inserts information about the OLT and target ONUs data. `Data example <https://github.com/opencord/pod-configs/blob/master/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml>`_
   and `kubernetes example <https://github.com/opencord/pod-configs/blob/master/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf>`_
 - voltha-system-tests. Adds the sadis configuration for the OLT and the ONU. `Sadis Example <https://github.com/opencord/voltha-system-tests/blob/master/tests/data/menlo-certification-pod-radisys-1600g-sadis-DT.json>`_