diff --git a/3d_party/darwin/confd-basic-7.3.darwin.x86_64.zip b/3d_party/darwin/confd-basic-7.3.darwin.x86_64.zip
deleted file mode 100644
index be402df43..000000000
Binary files a/3d_party/darwin/confd-basic-7.3.darwin.x86_64.zip and /dev/null differ
diff --git a/3d_party/go/goinstall.sh b/3d_party/go/goinstall.sh
deleted file mode 100755
index 00442aa3d..000000000
--- a/3d_party/go/goinstall.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2016
-set -e
-
-VERSION="1.15.1"
-
-[ -z "$GOROOT" ] && GOROOT="$HOME/.go"
-[ -z "$GOPATH" ] && GOPATH="$HOME/go"
-
-OS="$(uname -s)"
-ARCH="$(uname -m)"
-
-case $OS in
-    "Linux")
-        case $ARCH in
-        "x86_64")
-            ARCH=amd64
-            ;;
-        "aarch64")
-            ARCH=arm64
-            ;;
-        "armv6")
-            ARCH=armv6l
-            ;;
-        "armv8")
-            ARCH=arm64
-            ;;
-        .*386.*)
-            ARCH=386
-            ;;
-        esac
-        PLATFORM="linux-$ARCH"
-    ;;
-    "Darwin")
-        PLATFORM="darwin-amd64"
-    ;;
-esac
-
-print_help() {
-    echo "Usage: bash goinstall.sh OPTIONS"
-    echo -e "\nOPTIONS:"
-    echo -e "  --remove\tRemove currently installed version"
-    echo -e "  --version\tSpecify a version number to install"
-}
-
-if [ -z "$PLATFORM" ]; then
-    echo "Your operating system is not supported by the script."
-    exit 1
-fi
-
-if [ -n "$($SHELL -c 'echo $ZSH_VERSION')" ]; then
-    shell_profile="$HOME/.zshrc"
-elif [ -n "$($SHELL -c 'echo $BASH_VERSION')" ]; then
-    shell_profile="$HOME/.bashrc"
-elif [ -n "$($SHELL -c 'echo $FISH_VERSION')" ]; then
-    shell="fish"
-    if [ -d "$XDG_CONFIG_HOME" ]; then
-        shell_profile="$XDG_CONFIG_HOME/fish/config.fish"
-    else
-        shell_profile="$HOME/.config/fish/config.fish"
-    fi
-fi
-
-if [ "$1" == "--remove" ]; then
-    rm -rf "$GOROOT"
-    if [ "$OS" == "Darwin" ]; then
-        if [ "$shell" == "fish" ]; then
-            sed -i "" '/# GoLang/d' "$shell_profile"
-            sed -i "" '/set GOROOT/d' "$shell_profile"
-            sed -i "" '/set GOPATH/d' "$shell_profile"
-            sed -i "" '/set PATH $GOPATH\/bin $GOROOT\/bin $PATH/d' "$shell_profile"
-        else
-            sed -i "" '/# GoLang/d' "$shell_profile"
-            sed -i "" '/export GOROOT/d' "$shell_profile"
-            sed -i "" '/$GOROOT\/bin/d' "$shell_profile"
-            sed -i "" '/export GOPATH/d' "$shell_profile"
-            sed -i "" '/$GOPATH\/bin/d' "$shell_profile"
-        fi
-    else
-        if [ "$shell" == "fish" ]; then
-            sed -i '/# GoLang/d' "$shell_profile"
-            sed -i '/set GOROOT/d' "$shell_profile"
-            sed -i '/set GOPATH/d' "$shell_profile"
-            sed -i '/set PATH $GOPATH\/bin $GOROOT\/bin $PATH/d' "$shell_profile"
-        else
-            sed -i '/# GoLang/d' "$shell_profile"
-            sed -i '/export GOROOT/d' "$shell_profile"
-            sed -i '/$GOROOT\/bin/d' "$shell_profile"
-            sed -i '/export GOPATH/d' "$shell_profile"
-            sed -i '/$GOPATH\/bin/d' "$shell_profile"
-        fi
-    fi
-    echo "Go removed."
-    exit 0
-elif [ "$1" == "--help" ]; then
-    print_help
-    exit 0
-elif [ "$1" == "--version" ]; then
-    if [ -z "$2" ]; then # Check if --version has a second positional parameter
-        echo "Please provide a version number for: $1"
-    else
-        VERSION=$2
-    fi
-elif [ ! -z "$1" ]; then
-    echo "Unrecognized option: $1"
-    exit 1
-fi
-
-if [ -d "$GOROOT" ]; then
-    echo "The Go install directory ($GOROOT) already exists. Exiting."
-    exit 1
-fi
-
-PACKAGE_NAME="go$VERSION.$PLATFORM.tar.gz"
-TEMP_DIRECTORY=$(mktemp -d)
-
-echo "Downloading $PACKAGE_NAME ..."
-if hash wget 2>/dev/null; then
-    wget https://storage.googleapis.com/golang/$PACKAGE_NAME -O "$TEMP_DIRECTORY/go.tar.gz"
-else
-    curl -o "$TEMP_DIRECTORY/go.tar.gz" https://storage.googleapis.com/golang/$PACKAGE_NAME
-fi
-
-if [ $? -ne 0 ]; then
-    echo "Download failed! Exiting."
-    exit 1
-fi
-
-echo "Extracting File..."
-mkdir -p "$GOROOT"
-
-tar -C "$GOROOT" --strip-components=1 -xzf "$TEMP_DIRECTORY/go.tar.gz"
-
-echo "Configuring shell profile in: $shell_profile"
-touch "$shell_profile"
-if [ "$shell" == "fish" ]; then
-    {
-        echo '# GoLang'
-        echo "set GOROOT '${GOROOT}'"
-        echo "set GOPATH '$GOPATH'"
-        echo 'set PATH $GOPATH/bin $GOROOT/bin $PATH'
-    } >> "$shell_profile"
-else
-    {
-        echo '# GoLang'
-        echo "export GOROOT=${GOROOT}"
-        echo 'export PATH=$GOROOT/bin:$PATH'
-        echo "export GOPATH=$GOPATH"
-        echo 'export PATH=$GOPATH/bin:$PATH'
-    } >> "$shell_profile"
-fi
-
-mkdir -p "${GOPATH}/"{src,pkg,bin}
-echo -e "\nGo $VERSION was installed into $GOROOT.\nMake sure to relogin into your shell or run:"
-echo -e "\n\tsource $shell_profile\n\nto update your environment variables."
-echo "Tip: Opening a new terminal window usually just works. :)"
-rm -f "$TEMP_DIRECTORY/go.tar.gz"
diff --git a/3d_party/grpc/Makefile b/3d_party/grpc/Makefile
deleted file mode 100644
index 1877b397b..000000000
--- a/3d_party/grpc/Makefile
+++ /dev/null
@@ -1,20598 +0,0 @@
-# GRPC global makefile
-# This currently builds C and C++ code.
-# This file has been automatically generated from a template file.
-# Please look at the templates directory instead.
-# This file can be regenerated from the template by running
-# tools/buildgen/generate_projects.sh
-
-# Copyright 2015 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
-comma := ,
-
-
-# Basic platform detection
-HOST_SYSTEM = $(shell uname | cut -f 1 -d_)
-SYSTEM ?= $(HOST_SYSTEM)
-ifeq ($(SYSTEM),MSYS)
-SYSTEM = MINGW32
-endif
-ifeq ($(SYSTEM),MINGW64)
-SYSTEM = MINGW32
-endif
-
-
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-ifndef BUILDDIR
-BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))
-else
-BUILDDIR_ABSOLUTE = $(abspath $(BUILDDIR))
-endif
-
-HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false)
-HAS_CC = $(shell which cc > /dev/null 2> /dev/null && echo true || echo false)
-HAS_CLANG = $(shell which clang > /dev/null 2> /dev/null && echo true || echo false)
-
-ifeq ($(HAS_CC),true)
-DEFAULT_CC = cc
-DEFAULT_CXX = c++
-else
-ifeq ($(HAS_GCC),true)
-DEFAULT_CC = gcc
-DEFAULT_CXX = g++
-else
-ifeq ($(HAS_CLANG),true)
-DEFAULT_CC = clang
-DEFAULT_CXX = clang++
-else
-DEFAULT_CC = no_c_compiler
-DEFAULT_CXX = no_c++_compiler
-endif
-endif
-endif
-
-
-BINDIR = $(BUILDDIR_ABSOLUTE)/bins
-OBJDIR = $(BUILDDIR_ABSOLUTE)/objs
-LIBDIR = $(BUILDDIR_ABSOLUTE)/libs
-GENDIR = $(BUILDDIR_ABSOLUTE)/gens
-
-# Configurations
-
-VALID_CONFIG_opt = 1
-CC_opt = $(DEFAULT_CC)
-CXX_opt = $(DEFAULT_CXX)
-LD_opt = $(DEFAULT_CC)
-LDXX_opt = $(DEFAULT_CXX)
-CPPFLAGS_opt = -O2
-DEFINES_opt = NDEBUG
-
-VALID_CONFIG_asan-trace-cmp = 1
-REQUIRE_CUSTOM_LIBRARIES_asan-trace-cmp = 1
-CC_asan-trace-cmp = clang
-CXX_asan-trace-cmp = clang++
-LD_asan-trace-cmp = clang++
-LDXX_asan-trace-cmp = clang++
-CPPFLAGS_asan-trace-cmp = -O0 -fsanitize-coverage=edge -fsanitize-coverage=trace-cmp -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_asan-trace-cmp = -fsanitize=address
-
-VALID_CONFIG_dbg = 1
-CC_dbg = $(DEFAULT_CC)
-CXX_dbg = $(DEFAULT_CXX)
-LD_dbg = $(DEFAULT_CC)
-LDXX_dbg = $(DEFAULT_CXX)
-CPPFLAGS_dbg = -O0
-DEFINES_dbg = _DEBUG DEBUG
-
-VALID_CONFIG_asan = 1
-REQUIRE_CUSTOM_LIBRARIES_asan = 1
-CC_asan = clang
-CXX_asan = clang++
-LD_asan = clang++
-LDXX_asan = clang++
-CPPFLAGS_asan = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_asan = -fsanitize=address
-
-VALID_CONFIG_msan = 1
-REQUIRE_CUSTOM_LIBRARIES_msan = 1
-CC_msan = clang
-CXX_msan = clang++
-LD_msan = clang++
-LDXX_msan = clang++
-CPPFLAGS_msan = -O0 -fsanitize-coverage=edge -fsanitize=memory -fsanitize-memory-track-origins -fsanitize-memory-use-after-dtor -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
-DEFINES_msan = NDEBUG
-
-VALID_CONFIG_basicprof = 1
-CC_basicprof = $(DEFAULT_CC)
-CXX_basicprof = $(DEFAULT_CXX)
-LD_basicprof = $(DEFAULT_CC)
-LDXX_basicprof = $(DEFAULT_CXX)
-CPPFLAGS_basicprof = -O2 -DGRPC_BASIC_PROFILER -DGRPC_TIMERS_RDTSC
-DEFINES_basicprof = NDEBUG
-
-VALID_CONFIG_helgrind = 1
-CC_helgrind = $(DEFAULT_CC)
-CXX_helgrind = $(DEFAULT_CXX)
-LD_helgrind = $(DEFAULT_CC)
-LDXX_helgrind = $(DEFAULT_CXX)
-CPPFLAGS_helgrind = -O0
-LDFLAGS_helgrind = -rdynamic
-DEFINES_helgrind = _DEBUG DEBUG
-
-VALID_CONFIG_asan-noleaks = 1
-REQUIRE_CUSTOM_LIBRARIES_asan-noleaks = 1
-CC_asan-noleaks = clang
-CXX_asan-noleaks = clang++
-LD_asan-noleaks = clang++
-LDXX_asan-noleaks = clang++
-CPPFLAGS_asan-noleaks = -O0 -fsanitize-coverage=edge -fsanitize=address -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_asan-noleaks = -fsanitize=address
-
-VALID_CONFIG_noexcept = 1
-CC_noexcept = $(DEFAULT_CC)
-CXX_noexcept = $(DEFAULT_CXX)
-LD_noexcept = $(DEFAULT_CC)
-LDXX_noexcept = $(DEFAULT_CXX)
-CXXFLAGS_noexcept = -fno-exceptions
-CPPFLAGS_noexcept = -O2
-DEFINES_noexcept = NDEBUG
-
-VALID_CONFIG_ubsan = 1
-REQUIRE_CUSTOM_LIBRARIES_ubsan = 1
-CC_ubsan = clang
-CXX_ubsan = clang++
-LD_ubsan = clang++
-LDXX_ubsan = clang++
-CPPFLAGS_ubsan = -O0 -fsanitize-coverage=edge -fsanitize=undefined -fno-omit-frame-pointer -Wno-unused-command-line-argument -Wvarargs
-LDFLAGS_ubsan = -fsanitize=undefined,unsigned-integer-overflow
-DEFINES_ubsan = NDEBUG GRPC_UBSAN
-
-VALID_CONFIG_tsan = 1
-REQUIRE_CUSTOM_LIBRARIES_tsan = 1
-CC_tsan = clang
-CXX_tsan = clang++
-LD_tsan = clang++
-LDXX_tsan = clang++
-CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
-LDFLAGS_tsan = -fsanitize=thread
-DEFINES_tsan = GRPC_TSAN
-
-VALID_CONFIG_stapprof = 1
-CC_stapprof = $(DEFAULT_CC)
-CXX_stapprof = $(DEFAULT_CXX)
-LD_stapprof = $(DEFAULT_CC)
-LDXX_stapprof = $(DEFAULT_CXX)
-CPPFLAGS_stapprof = -O2 -DGRPC_STAP_PROFILER
-DEFINES_stapprof = NDEBUG
-
-VALID_CONFIG_gcov = 1
-CC_gcov = gcc
-CXX_gcov = g++
-LD_gcov = gcc
-LDXX_gcov = g++
-CPPFLAGS_gcov = -O0 -fprofile-arcs -ftest-coverage -Wno-return-type
-LDFLAGS_gcov = -fprofile-arcs -ftest-coverage -rdynamic -lstdc++
-DEFINES_gcov = _DEBUG DEBUG GPR_GCOV
-
-VALID_CONFIG_memcheck = 1
-CC_memcheck = $(DEFAULT_CC)
-CXX_memcheck = $(DEFAULT_CXX)
-LD_memcheck = $(DEFAULT_CC)
-LDXX_memcheck = $(DEFAULT_CXX)
-CPPFLAGS_memcheck = -O0
-LDFLAGS_memcheck = -rdynamic
-DEFINES_memcheck = _DEBUG DEBUG
-
-VALID_CONFIG_lto = 1
-CC_lto = $(DEFAULT_CC)
-CXX_lto = $(DEFAULT_CXX)
-LD_lto = $(DEFAULT_CC)
-LDXX_lto = $(DEFAULT_CXX)
-CPPFLAGS_lto = -O2
-DEFINES_lto = NDEBUG
-
-VALID_CONFIG_c++-compat = 1
-CC_c++-compat = $(DEFAULT_CC)
-CXX_c++-compat = $(DEFAULT_CXX)
-LD_c++-compat = $(DEFAULT_CC)
-LDXX_c++-compat = $(DEFAULT_CXX)
-CFLAGS_c++-compat = -Wc++-compat
-CPPFLAGS_c++-compat = -O0
-DEFINES_c++-compat = _DEBUG DEBUG
-
-VALID_CONFIG_mutrace = 1
-CC_mutrace = $(DEFAULT_CC)
-CXX_mutrace = $(DEFAULT_CXX)
-LD_mutrace = $(DEFAULT_CC)
-LDXX_mutrace = $(DEFAULT_CXX)
-CPPFLAGS_mutrace = -O3 -fno-omit-frame-pointer
-LDFLAGS_mutrace = -rdynamic
-DEFINES_mutrace = NDEBUG
-
-VALID_CONFIG_counters = 1
-CC_counters = $(DEFAULT_CC)
-CXX_counters = $(DEFAULT_CXX)
-LD_counters = $(DEFAULT_CC)
-LDXX_counters = $(DEFAULT_CXX)
-CPPFLAGS_counters = -O2 -DGPR_LOW_LEVEL_COUNTERS
-DEFINES_counters = NDEBUG
-
-
-
-# General settings.
-# You may want to change these depending on your system.
-
-prefix ?= /usr/local
-
-PROTOC ?= protoc
-DTRACE ?= dtrace
-CONFIG ?= opt
-# Doing X ?= Y is the same as:
-# ifeq ($(origin X), undefined)
-#  X = Y
-# endif
-# but some variables, such as CC, CXX, LD or AR, have defaults.
-# So instead of using ?= on them, we need to check their origin.
-# See:
-#  https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html
-#  https://www.gnu.org/software/make/manual/html_node/Flavors.html#index-_003f_003d
-#  https://www.gnu.org/software/make/manual/html_node/Origin-Function.html
-ifeq ($(origin CC), default)
-CC = $(CC_$(CONFIG))
-endif
-ifeq ($(origin CXX), default)
-CXX = $(CXX_$(CONFIG))
-endif
-ifeq ($(origin LD), default)
-LD = $(LD_$(CONFIG))
-endif
-LDXX ?= $(LDXX_$(CONFIG))
-ifeq ($(SYSTEM),Linux)
-ifeq ($(origin AR), default)
-AR = ar rcs
-endif
-STRIP ?= strip --strip-unneeded
-else
-ifeq ($(SYSTEM),Darwin)
-ifeq ($(origin AR), default)
-AR = libtool -no_warning_for_no_symbols -o
-endif
-STRIP ?= strip -x
-else
-ifeq ($(SYSTEM),MINGW32)
-ifeq ($(origin AR), default)
-AR = ar rcs
-endif
-STRIP ?= strip --strip-unneeded
-else
-ifeq ($(origin AR), default)
-AR = ar rcs
-endif
-STRIP ?= strip
-endif
-endif
-endif
-INSTALL ?= install
-RM ?= rm -f
-PKG_CONFIG ?= pkg-config
-
-ifndef VALID_CONFIG_$(CONFIG)
-$(error Invalid CONFIG value '$(CONFIG)')
-endif
-
-ifeq ($(SYSTEM),Linux)
-TMPOUT = /dev/null
-else
-TMPOUT = `mktemp /tmp/test-out-XXXXXX`
-endif
-
-CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Werror -Wshadow -o $(TMPOUT) -c test/build/shadow.c
-HAS_WORKING_SHADOW = $(shell $(CHECK_SHADOW_WORKS_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_WORKING_SHADOW),true)
-W_SHADOW=-Wshadow
-NO_W_SHADOW=-Wno-shadow
-endif
-CHECK_EXTRA_SEMI_WORKS_CMD = $(CC) -std=c99 -Werror -Wextra-semi -o $(TMPOUT) -c test/build/extra-semi.c
-HAS_WORKING_EXTRA_SEMI = $(shell $(CHECK_EXTRA_SEMI_WORKS_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_WORKING_EXTRA_SEMI),true)
-W_EXTRA_SEMI=-Wextra-semi
-NO_W_EXTRA_SEMI=-Wno-extra-semi
-endif
-CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/no-shift-negative-value.c
-HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_WORKS_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_WORKING_NO_SHIFT_NEGATIVE_VALUE),true)
-W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value
-NO_W_NO_SHIFT_NEGATIVE_VALUE=-Wshift-negative-value
-endif
-
-# The HOST compiler settings are used to compile the protoc plugins.
-# In most cases, you won't have to change anything, but if you are
-# cross-compiling, you can override these variables from GNU make's
-# command line: make CC=cross-gcc HOST_CC=gcc
-
-HOST_CC ?= $(CC)
-HOST_CXX ?= $(CXX)
-HOST_LD ?= $(LD)
-HOST_LDXX ?= $(LDXX)
-
-CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
-CXXFLAGS += -std=c++11
-ifeq ($(SYSTEM),Darwin)
-CXXFLAGS += -stdlib=libc++
-endif
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-ignored-qualifiers -Wno-stringop-truncation -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations
-COREFLAGS += -fno-rtti -fno-exceptions
-LDFLAGS += -g
-
-CPPFLAGS += $(CPPFLAGS_$(CONFIG))
-CFLAGS += $(CFLAGS_$(CONFIG))
-CXXFLAGS += $(CXXFLAGS_$(CONFIG))
-DEFINES += $(DEFINES_$(CONFIG)) INSTALL_PREFIX=\"$(prefix)\"
-LDFLAGS += $(LDFLAGS_$(CONFIG))
-
-ifneq ($(SYSTEM),MINGW32)
-PIC_CPPFLAGS = -fPIC
-CPPFLAGS += -fPIC
-LDFLAGS += -fPIC
-endif
-
-INCLUDES = . include $(GENDIR)
-LDFLAGS += -Llibs/$(CONFIG)
-
-ifeq ($(SYSTEM),Darwin)
-ifneq ($(wildcard /usr/local/ssl/include),)
-INCLUDES += /usr/local/ssl/include
-endif
-ifneq ($(wildcard /opt/local/include),)
-INCLUDES += /opt/local/include
-endif
-ifneq ($(wildcard /usr/local/include),)
-INCLUDES += /usr/local/include
-endif
-LIBS = m z
-ifneq ($(wildcard /usr/local/ssl/lib),)
-LDFLAGS += -L/usr/local/ssl/lib
-endif
-ifneq ($(wildcard /opt/local/lib),)
-LDFLAGS += -L/opt/local/lib
-endif
-ifneq ($(wildcard /usr/local/lib),)
-LDFLAGS += -L/usr/local/lib
-endif
-endif
-
-ifeq ($(SYSTEM),Linux)
-LIBS = dl rt m pthread
-LDFLAGS += -pthread
-endif
-
-ifeq ($(SYSTEM),MINGW32)
-LIBS = m pthread ws2_32
-LDFLAGS += -pthread
-endif
-
-#
-# The steps for cross-compiling are as follows:
-# First, clone and make install of grpc using the native compilers for the host.
-# Also, install protoc (e.g., from a package like apt-get)
-# Then clone a fresh grpc for the actual cross-compiled build
-# Set the environment variable GRPC_CROSS_COMPILE to true
-# Set CC, CXX, LD, LDXX, AR, and STRIP to the cross-compiling binaries
-# Also set PROTOBUF_CONFIG_OPTS to indicate cross-compilation to protobuf (e.g.,
-#  PROTOBUF_CONFIG_OPTS="--host=arm-linux --with-protoc=/usr/local/bin/protoc" )
-# Set HAS_PKG_CONFIG=false
-# To build tests, go to third_party/gflags and follow its ccmake instructions
-# Make sure that you enable building shared libraries and set your prefix to
-# something useful like /usr/local/cross
-# You will also need to set GRPC_CROSS_LDOPTS and GRPC_CROSS_AROPTS to hold
-# additional required arguments for LD and AR (examples below)
-# Then you can do a make from the cross-compiling fresh clone!
-#
-ifeq ($(GRPC_CROSS_COMPILE),true)
-LDFLAGS += $(GRPC_CROSS_LDOPTS) # e.g. -L/usr/local/lib -L/usr/local/cross/lib
-AROPTS = $(GRPC_CROSS_AROPTS) # e.g., rc --target=elf32-little
-USE_BUILT_PROTOC = false
-endif
-
-GTEST_LIB = -Ithird_party/googletest/googletest/include -Ithird_party/googletest/googletest third_party/googletest/googletest/src/gtest-all.cc -Ithird_party/googletest/googlemock/include -Ithird_party/googletest/googlemock third_party/googletest/googlemock/src/gmock-all.cc
-GTEST_LIB += -lgflags
-ifeq ($(V),1)
-E = @:
-Q =
-else
-E = @echo
-Q = @
-endif
-
-CORE_VERSION = 5.0.0
-CPP_VERSION = 1.9.1
-CSHARP_VERSION = 1.9.1
-
-CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
-CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
-
-LDFLAGS += $(ARCH_FLAGS)
-LDLIBS += $(addprefix -l, $(LIBS))
-LDLIBSXX += $(addprefix -l, $(LIBSXX))
-
-
-CFLAGS += $(EXTRA_CFLAGS)
-CXXFLAGS += $(EXTRA_CXXFLAGS)
-CPPFLAGS += $(EXTRA_CPPFLAGS)
-LDFLAGS += $(EXTRA_LDFLAGS)
-DEFINES += $(EXTRA_DEFINES)
-LDLIBS += $(EXTRA_LDLIBS)
-
-HOST_CPPFLAGS = $(CPPFLAGS)
-HOST_CFLAGS = $(CFLAGS)
-HOST_CXXFLAGS = $(CXXFLAGS)
-HOST_LDFLAGS = $(LDFLAGS)
-HOST_LDLIBS = $(LDLIBS)
-
-# These are automatically computed variables.
-# There shouldn't be any need to change anything from now on.
-
--include cache.mk
-
-CACHE_MK =
-
-HAS_PKG_CONFIG ?= $(shell command -v $(PKG_CONFIG) >/dev/null 2>&1 && echo true || echo false)
-
-ifeq ($(HAS_PKG_CONFIG), true)
-CACHE_MK += HAS_PKG_CONFIG = true,
-endif
-
-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-
-ifeq ($(SYSTEM),MINGW32)
-EXECUTABLE_SUFFIX = .exe
-SHARED_EXT_CORE = dll
-SHARED_EXT_CPP = dll
-SHARED_EXT_CSHARP = dll
-SHARED_PREFIX =
-SHARED_VERSION_CORE = -5
-SHARED_VERSION_CPP = -1
-SHARED_VERSION_CSHARP = -1
-else ifeq ($(SYSTEM),Darwin)
-EXECUTABLE_SUFFIX =
-SHARED_EXT_CORE = dylib
-SHARED_EXT_CPP = dylib
-SHARED_EXT_CSHARP = dylib
-SHARED_PREFIX = lib
-SHARED_VERSION_CORE =
-SHARED_VERSION_CPP =
-SHARED_VERSION_CSHARP =
-else
-EXECUTABLE_SUFFIX =
-SHARED_EXT_CORE = so.$(CORE_VERSION)
-SHARED_EXT_CPP = so.$(CPP_VERSION)
-SHARED_EXT_CSHARP = so.$(CSHARP_VERSION)
-SHARED_PREFIX = lib
-SHARED_VERSION_CORE =
-SHARED_VERSION_CPP =
-SHARED_VERSION_CSHARP =
-endif
-
-ifeq ($(wildcard .git),)
-IS_GIT_FOLDER = false
-else
-IS_GIT_FOLDER = true
-endif
-
-ifeq ($(HAS_PKG_CONFIG),true)
-OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
-OPENSSL_NPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.1 openssl
-ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
-PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.0.0 protobuf
-CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
-else # HAS_PKG_CONFIG
-
-ifeq ($(SYSTEM),MINGW32)
-OPENSSL_LIBS = ssl32 eay32
-else
-OPENSSL_LIBS = ssl crypto
-endif
-
-OPENSSL_ALPN_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/openssl-alpn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
-OPENSSL_NPN_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/openssl-npn.c $(addprefix -l, $(OPENSSL_LIBS)) $(LDFLAGS)
-BORINGSSL_COMPILE_CHECK_CMD = $(CC) $(CPPFLAGS) -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI) -o $(TMPOUT) test/build/boringssl.c $(LDFLAGS)
-ZLIB_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
-PROTOBUF_CHECK_CMD = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
-CARES_CHECK_CMD = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(TMPOUT) test/build/c-ares.c -lcares $(LDFLAGS)
-
-endif # HAS_PKG_CONFIG
-
-PERFTOOLS_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
-
-PROTOC_CHECK_CMD = which protoc > /dev/null
-PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
-DTRACE_CHECK_CMD = which dtrace > /dev/null
-SYSTEMTAP_HEADERS_CHECK_CMD = $(CC) $(CPPFLAGS) $(CFLAGS) -o $(TMPOUT) test/build/systemtap.c $(LDFLAGS)
-
-ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
-HAS_SYSTEM_PERFTOOLS ?= $(shell $(PERFTOOLS_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_PERFTOOLS),true)
-DEFINES += GRPC_HAVE_PERFTOOLS
-LIBS += profiler
-CACHE_MK += HAS_SYSTEM_PERFTOOLS = true,
-endif
-endif
-
-HAS_SYSTEM_PROTOBUF_VERIFY = $(shell $(PROTOBUF_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifndef REQUIRE_CUSTOM_LIBRARIES_$(CONFIG)
-HAS_SYSTEM_OPENSSL_ALPN ?= $(shell $(OPENSSL_ALPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
-HAS_SYSTEM_OPENSSL_NPN = true
-CACHE_MK += HAS_SYSTEM_OPENSSL_ALPN = true,
-else
-HAS_SYSTEM_OPENSSL_NPN ?= $(shell $(OPENSSL_NPN_CHECK_CMD) 2> /dev/null && echo true || echo false)
-endif
-ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
-CACHE_MK += HAS_SYSTEM_OPENSSL_NPN = true,
-endif
-HAS_SYSTEM_ZLIB ?= $(shell $(ZLIB_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_ZLIB),true)
-CACHE_MK += HAS_SYSTEM_ZLIB = true,
-endif
-HAS_SYSTEM_PROTOBUF ?= $(HAS_SYSTEM_PROTOBUF_VERIFY)
-ifeq ($(HAS_SYSTEM_PROTOBUF),true)
-CACHE_MK += HAS_SYSTEM_PROTOBUF = true,
-endif
-HAS_SYSTEM_CARES ?=  $(shell $(CARES_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_SYSTEM_CARES),true)
-CACHE_MK += HAS_SYSTEM_CARES = true,
-endif
-else
-# override system libraries if the config requires a custom compiled library
-HAS_SYSTEM_OPENSSL_ALPN = false
-HAS_SYSTEM_OPENSSL_NPN = false
-HAS_SYSTEM_ZLIB = false
-HAS_SYSTEM_PROTOBUF = false
-HAS_SYSTEM_CARES = false
-endif
-
-HAS_PROTOC ?= $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_PROTOC),true)
-CACHE_MK += HAS_PROTOC = true,
-HAS_VALID_PROTOC ?= $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
-ifeq ($(HAS_VALID_PROTOC),true)
-CACHE_MK += HAS_VALID_PROTOC = true,
-endif
-else
-HAS_VALID_PROTOC = false
-endif
-
-# Check for Systemtap (https://sourceware.org/systemtap/), first by making sure <sys/sdt.h> is present
-# in the system and secondly by checking for the "dtrace" binary (on Linux, this is part of the Systemtap
-# distribution. It's part of the base system on BSD/Solaris machines).
-ifndef HAS_SYSTEMTAP
-HAS_SYSTEMTAP_HEADERS = $(shell $(SYSTEMTAP_HEADERS_CHECK_CMD) 2> /dev/null && echo true || echo false)
-HAS_DTRACE = $(shell $(DTRACE_CHECK_CMD) 2> /dev/null && echo true || echo false)
-HAS_SYSTEMTAP = false
-ifeq ($(HAS_SYSTEMTAP_HEADERS),true)
-ifeq ($(HAS_DTRACE),true)
-HAS_SYSTEMTAP = true
-endif
-endif
-endif
-
-ifeq ($(HAS_SYSTEMTAP),true)
-CACHE_MK += HAS_SYSTEMTAP = true,
-endif
-
-# Note that for testing purposes, one can do:
-#   make HAS_EMBEDDED_OPENSSL_ALPN=false
-# to emulate the fact we do not have OpenSSL in the third_party folder.
-ifneq ($(wildcard third_party/openssl-1.0.2f/libssl.a),)
-HAS_EMBEDDED_OPENSSL_ALPN = third_party/openssl-1.0.2f
-else ifeq ($(wildcard third_party/boringssl/include/openssl/ssl.h),)
-HAS_EMBEDDED_OPENSSL_ALPN = false
-else
-CAN_COMPILE_EMBEDDED_OPENSSL ?= $(shell $(BORINGSSL_COMPILE_CHECK_CMD) 2> /dev/null && echo true || echo false)
-HAS_EMBEDDED_OPENSSL_ALPN = $(CAN_COMPILE_EMBEDDED_OPENSSL)
-endif
-
-ifeq ($(wildcard third_party/zlib/zlib.h),)
-HAS_EMBEDDED_ZLIB = false
-else
-HAS_EMBEDDED_ZLIB = true
-endif
-
-ifeq ($(wildcard third_party/protobuf/src/google/protobuf/descriptor.pb.h),)
-HAS_EMBEDDED_PROTOBUF = false
-ifneq ($(HAS_VALID_PROTOC),true)
-NO_PROTOC = true
-endif
-else
-HAS_EMBEDDED_PROTOBUF = true
-endif
-
-ifeq ($(wildcard third_party/cares/cares/ares.h),)
-HAS_EMBEDDED_CARES = false
-else
-HAS_EMBEDDED_CARES = true
-endif
-
-PC_REQUIRES_GRPC =
-PC_LIBS_GRPC =
-
-ifeq ($(HAS_SYSTEM_ZLIB),false)
-ifeq ($(HAS_EMBEDDED_ZLIB), true)
-EMBED_ZLIB ?= true
-else
-DEP_MISSING += zlib
-EMBED_ZLIB ?= broken
-endif
-else
-EMBED_ZLIB ?= false
-endif
-
-ifeq ($(EMBED_ZLIB),true)
-ZLIB_DEP = $(LIBDIR)/$(CONFIG)/libz.a
-ZLIB_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libz.a
-ZLIB_MERGE_OBJS = $(LIBZ_OBJS)
-CPPFLAGS += -Ithird_party/zlib
-else
-ifeq ($(HAS_PKG_CONFIG),true)
-CPPFLAGS += $(shell $(PKG_CONFIG) --cflags zlib)
-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L zlib)
-LIBS += $(patsubst -l%,%,$(shell $(PKG_CONFIG) --libs-only-l zlib))
-PC_REQUIRES_GRPC += zlib
-else
-PC_LIBS_GRPC += -lz
-LIBS += z
-endif
-endif
-
-CARES_PKG_CONFIG = false
-
-ifeq ($(HAS_SYSTEM_CARES),false)
-ifeq ($(HAS_EMBEDDED_CARES), true)
-EMBED_CARES ?= true
-else
-DEP_MISSING += cares
-EMBED_CARES ?= broken
-endif
-else
-EMBED_CARES ?= false
-endif
-
-ifeq ($(EMBED_CARES),true)
-CARES_DEP = $(LIBDIR)/$(CONFIG)/libares.a
-CARES_MERGE_OBJS = $(LIBARES_OBJS)
-CARES_MERGE_LIBS = $(LIBDIR)/$(CONFIG)/libares.a
-CPPFLAGS := -Ithird_party/cares -Ithird_party/cares/cares $(CPPFLAGS)
-else
-ifeq ($(HAS_PKG_CONFIG),true)
-PC_REQUIRES_GRPC += libcares
-CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libcares)
-LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libcares)
-LIBS += $(patsubst -l%,%,$(shell $(PKG_CONFIG) --libs-only-l libcares))
-else
-PC_LIBS_GRPC += -lcares
-LIBS += cares
-endif
-endif
-
-OPENSSL_PKG_CONFIG = false
-
-PC_REQUIRES_SECURE =
-PC_LIBS_SECURE =
-
-ifeq ($(HAS_SYSTEM_OPENSSL_ALPN),true)
-EMBED_OPENSSL ?= false
-NO_SECURE ?= false
-else # HAS_SYSTEM_OPENSSL_ALPN=false
-ifneq ($(HAS_EMBEDDED_OPENSSL_ALPN),false)
-EMBED_OPENSSL ?= $(HAS_EMBEDDED_OPENSSL_ALPN)
-NO_SECURE ?= false
-else # HAS_EMBEDDED_OPENSSL_ALPN=false
-ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
-EMBED_OPENSSL ?= false
-NO_SECURE ?= false
-else
-NO_SECURE ?= true
-endif # HAS_SYSTEM_OPENSSL_NPN=true
-endif # HAS_EMBEDDED_OPENSSL_ALPN
-endif # HAS_SYSTEM_OPENSSL_ALPN
-
-OPENSSL_DEP :=
-OPENSSL_MERGE_LIBS :=
-ifeq ($(NO_SECURE),false)
-ifeq ($(EMBED_OPENSSL),true)
-OPENSSL_DEP += $(LIBDIR)/$(CONFIG)/libboringssl.a
-OPENSSL_MERGE_LIBS += $(LIBDIR)/$(CONFIG)/libboringssl.a
-OPENSSL_MERGE_OBJS += $(LIBBORINGSSL_OBJS)
-# need to prefix these to ensure overriding system libraries
-CPPFLAGS := -Ithird_party/boringssl/include $(CPPFLAGS)
-else ifneq ($(EMBED_OPENSSL),false)
-OPENSSL_DEP += $(EMBED_OPENSSL)/libssl.a $(EMBED_OPENSSL)/libcrypto.a
-OPENSSL_MERGE_LIBS += $(EMBED_OPENSSL)/libssl.a $(EMBED_OPENSSL)/libcrypto.a
-OPENSSL_MERGE_OBJS += $(wildcard $(EMBED_OPENSSL)/grpc_obj/*.o)
-# need to prefix these to ensure overriding system libraries
-CPPFLAGS := -I$(EMBED_OPENSSL)/include $(CPPFLAGS)
-else # EMBED_OPENSSL=false
-ifeq ($(HAS_PKG_CONFIG),true)
-OPENSSL_PKG_CONFIG = true
-PC_REQUIRES_SECURE = openssl
-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
-LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
-ifeq ($(SYSTEM),Linux)
-ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
-LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
-endif # LDFLAGS_OPENSSL_PKG_CONFIG=''
-endif # System=Linux
-LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
-else # HAS_PKG_CONFIG=false
-LIBS_SECURE = $(OPENSSL_LIBS)
-endif # HAS_PKG_CONFIG
-ifeq ($(HAS_SYSTEM_OPENSSL_NPN),true)
-CPPFLAGS += -DTSI_OPENSSL_ALPN_SUPPORT=0
-LIBS_SECURE = $(OPENSSL_LIBS)
-endif # HAS_SYSTEM_OPENSSL_NPN
-PC_LIBS_SECURE = $(addprefix -l, $(LIBS_SECURE))
-endif # EMBED_OPENSSL
-endif # NO_SECURE
-
-ifeq ($(OPENSSL_PKG_CONFIG),true)
-LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
-else
-LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
-endif
-
-# grpc .pc file
-PC_NAME = gRPC
-PC_DESCRIPTION = high performance general RPC framework
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE)
-PC_LIB = -lgrpc
-GRPC_PC_FILE := $(CORE_PC_TEMPLATE)
-
-# grpc_unsecure .pc file
-PC_NAME = gRPC unsecure
-PC_DESCRIPTION = high performance general RPC framework without SSL
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
-PC_LIB = -lgrpc
-GRPC_UNSECURE_PC_FILE := $(CORE_PC_TEMPLATE)
-
-PROTOBUF_PKG_CONFIG = false
-
-PC_REQUIRES_GRPCXX =
-PC_LIBS_GRPCXX =
-
-CPPFLAGS := -Ithird_party/googletest/googletest/include -Ithird_party/googletest/googlemock/include $(CPPFLAGS)
-
-PROTOC_PLUGINS_ALL = $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(BINDIR)/$(CONFIG)/grpc_node_plugin $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(BINDIR)/$(CONFIG)/grpc_php_plugin $(BINDIR)/$(CONFIG)/grpc_python_plugin $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
-PROTOC_PLUGINS_DIR = $(BINDIR)/$(CONFIG)
-
-ifeq ($(HAS_SYSTEM_PROTOBUF),true)
-ifeq ($(HAS_PKG_CONFIG),true)
-PROTOBUF_PKG_CONFIG = true
-PC_REQUIRES_GRPCXX = protobuf
-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags protobuf) $(CPPFLAGS)
-LDFLAGS_PROTOBUF_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L protobuf)
-ifeq ($(SYSTEM),Linux)
-ifneq ($(LDFLAGS_PROTOBUF_PKG_CONFIG),)
-LDFLAGS_PROTOBUF_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L protobuf | sed s/L/Wl,-rpath,/)
-endif
-endif
-else
-PC_LIBS_GRPCXX = -lprotobuf
-endif
-PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL)
-else
-ifeq ($(HAS_EMBEDDED_PROTOBUF),true)
-PROTOBUF_DEP = $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a
-CPPFLAGS := -Ithird_party/protobuf/src $(CPPFLAGS)
-LDFLAGS := -L$(LIBDIR)/$(CONFIG)/protobuf $(LDFLAGS)
-ifneq ($(USE_BUILT_PROTOC),false)
-PROTOC = $(BINDIR)/$(CONFIG)/protobuf/protoc
-PROTOC_PLUGINS = $(PROTOC_PLUGINS_ALL)
-else
-PROTOC_PLUGINS =
-PROTOC_PLUGINS_DIR = $(prefix)/bin
-endif
-else
-NO_PROTOBUF = true
-endif
-endif
-
-LIBS_PROTOBUF = protobuf
-LIBS_PROTOC = protoc protobuf
-
-HOST_LDLIBS_PROTOC += $(addprefix -l, $(LIBS_PROTOC))
-
-ifeq ($(PROTOBUF_PKG_CONFIG),true)
-LDLIBS_PROTOBUF += $(shell $(PKG_CONFIG) --libs-only-l protobuf)
-else
-LDLIBS_PROTOBUF += $(addprefix -l, $(LIBS_PROTOBUF))
-endif
-
-# grpc++ .pc file
-PC_NAME = gRPC++
-PC_DESCRIPTION = C++ wrapper for gRPC
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = grpc $(PC_REQUIRES_GRPCXX)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
-PC_LIB = -lgrpc++
-GRPCXX_PC_FILE := $(CPP_PC_TEMPLATE)
-
-# grpc++_unsecure .pc file
-PC_NAME = gRPC++ unsecure
-PC_DESCRIPTION = C++ wrapper for gRPC without SSL
-PC_CFLAGS =
-PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX)
-PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
-PC_LIB = -lgrpc++
-GRPCXX_UNSECURE_PC_FILE := $(CPP_PC_TEMPLATE)
-
-ifeq ($(MAKECMDGOALS),clean)
-NO_DEPS = true
-endif
-
-.SECONDARY = %.pb.h %.pb.cc
-
-ifeq ($(DEP_MISSING),)
-all: static shared plugins
-dep_error:
-	@echo "You shouldn't see this message - all of your dependencies are correct."
-else
-all: dep_error git_update stop
-
-dep_error:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "You are missing system dependencies that are essential to build grpc,"
-	@echo "and the third_party directory doesn't have them:"
-	@echo
-	@echo "  $(DEP_MISSING)"
-	@echo
-	@echo "Installing the development packages for your system will solve"
-	@echo "this issue. Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-endif
-
-git_update:
-ifeq ($(IS_GIT_FOLDER),true)
-	@echo "Additionally, since you are in a git clone, you can download the"
-	@echo "missing dependencies in third_party by running the following command:"
-	@echo
-	@echo "  git submodule update --init"
-	@echo
-endif
-
-openssl_dep_error: openssl_dep_message git_update stop
-
-protobuf_dep_error: protobuf_dep_message git_update stop
-
-protoc_dep_error: protoc_dep_message git_update stop
-
-openssl_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires an OpenSSL implementation."
-	@echo "Your system doesn't have one, and either the third_party directory"
-	@echo "doesn't have it, or your compiler can't build BoringSSL."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-protobuf_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires protobuf 3.0.0+"
-	@echo "Your system doesn't have it, and neither does the third_party directory."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-protoc_dep_message:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "The target you are trying to run requires protobuf-compiler 3.0.0+"
-	@echo "Your system doesn't have it, and neither does the third_party directory."
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-	@echo "If you need information about why these tests failed, run:"
-	@echo
-	@echo "  make run_dep_checks"
-	@echo
-
-systemtap_dep_error:
-	@echo
-	@echo "DEPENDENCY ERROR"
-	@echo
-	@echo "Under the '$(CONFIG)' configutation, the target you are trying "
-	@echo "to build requires systemtap 2.7+ (on Linux) or dtrace (on other "
-	@echo "platforms such as Solaris and *BSD). "
-	@echo
-	@echo "Please consult INSTALL to get more information."
-	@echo
-
-stop:
-	@false
-
-alarm_test: $(BINDIR)/$(CONFIG)/alarm_test
-algorithm_test: $(BINDIR)/$(CONFIG)/algorithm_test
-alloc_test: $(BINDIR)/$(CONFIG)/alloc_test
-alpn_test: $(BINDIR)/$(CONFIG)/alpn_test
-api_fuzzer: $(BINDIR)/$(CONFIG)/api_fuzzer
-arena_test: $(BINDIR)/$(CONFIG)/arena_test
-bad_server_response_test: $(BINDIR)/$(CONFIG)/bad_server_response_test
-bin_decoder_test: $(BINDIR)/$(CONFIG)/bin_decoder_test
-bin_encoder_test: $(BINDIR)/$(CONFIG)/bin_encoder_test
-byte_stream_test: $(BINDIR)/$(CONFIG)/byte_stream_test
-channel_create_test: $(BINDIR)/$(CONFIG)/channel_create_test
-check_epollexclusive: $(BINDIR)/$(CONFIG)/check_epollexclusive
-chttp2_hpack_encoder_test: $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test
-chttp2_stream_map_test: $(BINDIR)/$(CONFIG)/chttp2_stream_map_test
-chttp2_varint_test: $(BINDIR)/$(CONFIG)/chttp2_varint_test
-client_fuzzer: $(BINDIR)/$(CONFIG)/client_fuzzer
-combiner_test: $(BINDIR)/$(CONFIG)/combiner_test
-compression_test: $(BINDIR)/$(CONFIG)/compression_test
-concurrent_connectivity_test: $(BINDIR)/$(CONFIG)/concurrent_connectivity_test
-connection_refused_test: $(BINDIR)/$(CONFIG)/connection_refused_test
-dns_resolver_connectivity_test: $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test
-dns_resolver_test: $(BINDIR)/$(CONFIG)/dns_resolver_test
-dualstack_socket_test: $(BINDIR)/$(CONFIG)/dualstack_socket_test
-endpoint_pair_test: $(BINDIR)/$(CONFIG)/endpoint_pair_test
-error_test: $(BINDIR)/$(CONFIG)/error_test
-ev_epollsig_linux_test: $(BINDIR)/$(CONFIG)/ev_epollsig_linux_test
-fake_resolver_test: $(BINDIR)/$(CONFIG)/fake_resolver_test
-fake_transport_security_test: $(BINDIR)/$(CONFIG)/fake_transport_security_test
-fd_conservation_posix_test: $(BINDIR)/$(CONFIG)/fd_conservation_posix_test
-fd_posix_test: $(BINDIR)/$(CONFIG)/fd_posix_test
-fling_client: $(BINDIR)/$(CONFIG)/fling_client
-fling_server: $(BINDIR)/$(CONFIG)/fling_server
-fling_stream_test: $(BINDIR)/$(CONFIG)/fling_stream_test
-fling_test: $(BINDIR)/$(CONFIG)/fling_test
-goaway_server_test: $(BINDIR)/$(CONFIG)/goaway_server_test
-gpr_avl_test: $(BINDIR)/$(CONFIG)/gpr_avl_test
-gpr_cmdline_test: $(BINDIR)/$(CONFIG)/gpr_cmdline_test
-gpr_cpu_test: $(BINDIR)/$(CONFIG)/gpr_cpu_test
-gpr_env_test: $(BINDIR)/$(CONFIG)/gpr_env_test
-gpr_host_port_test: $(BINDIR)/$(CONFIG)/gpr_host_port_test
-gpr_log_test: $(BINDIR)/$(CONFIG)/gpr_log_test
-gpr_manual_constructor_test: $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test
-gpr_mpscq_test: $(BINDIR)/$(CONFIG)/gpr_mpscq_test
-gpr_spinlock_test: $(BINDIR)/$(CONFIG)/gpr_spinlock_test
-gpr_string_test: $(BINDIR)/$(CONFIG)/gpr_string_test
-gpr_sync_test: $(BINDIR)/$(CONFIG)/gpr_sync_test
-gpr_thd_test: $(BINDIR)/$(CONFIG)/gpr_thd_test
-gpr_time_test: $(BINDIR)/$(CONFIG)/gpr_time_test
-gpr_tls_test: $(BINDIR)/$(CONFIG)/gpr_tls_test
-gpr_useful_test: $(BINDIR)/$(CONFIG)/gpr_useful_test
-grpc_auth_context_test: $(BINDIR)/$(CONFIG)/grpc_auth_context_test
-grpc_b64_test: $(BINDIR)/$(CONFIG)/grpc_b64_test
-grpc_byte_buffer_reader_test: $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test
-grpc_channel_args_test: $(BINDIR)/$(CONFIG)/grpc_channel_args_test
-grpc_channel_stack_builder_test: $(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test
-grpc_channel_stack_test: $(BINDIR)/$(CONFIG)/grpc_channel_stack_test
-grpc_completion_queue_test: $(BINDIR)/$(CONFIG)/grpc_completion_queue_test
-grpc_completion_queue_threading_test: $(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test
-grpc_create_jwt: $(BINDIR)/$(CONFIG)/grpc_create_jwt
-grpc_credentials_test: $(BINDIR)/$(CONFIG)/grpc_credentials_test
-grpc_fetch_oauth2: $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2
-grpc_invalid_channel_args_test: $(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test
-grpc_json_token_test: $(BINDIR)/$(CONFIG)/grpc_json_token_test
-grpc_jwt_verifier_test: $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test
-grpc_print_google_default_creds_token: $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token
-grpc_security_connector_test: $(BINDIR)/$(CONFIG)/grpc_security_connector_test
-grpc_ssl_credentials_test: $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test
-grpc_verify_jwt: $(BINDIR)/$(CONFIG)/grpc_verify_jwt
-handshake_client: $(BINDIR)/$(CONFIG)/handshake_client
-handshake_server: $(BINDIR)/$(CONFIG)/handshake_server
-handshake_server_with_readahead_handshaker: $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker
-histogram_test: $(BINDIR)/$(CONFIG)/histogram_test
-hpack_parser_fuzzer_test: $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test
-hpack_parser_test: $(BINDIR)/$(CONFIG)/hpack_parser_test
-hpack_table_test: $(BINDIR)/$(CONFIG)/hpack_table_test
-http_parser_test: $(BINDIR)/$(CONFIG)/http_parser_test
-http_request_fuzzer_test: $(BINDIR)/$(CONFIG)/http_request_fuzzer_test
-http_response_fuzzer_test: $(BINDIR)/$(CONFIG)/http_response_fuzzer_test
-httpcli_format_request_test: $(BINDIR)/$(CONFIG)/httpcli_format_request_test
-httpcli_test: $(BINDIR)/$(CONFIG)/httpcli_test
-httpscli_test: $(BINDIR)/$(CONFIG)/httpscli_test
-init_test: $(BINDIR)/$(CONFIG)/init_test
-invalid_call_argument_test: $(BINDIR)/$(CONFIG)/invalid_call_argument_test
-json_fuzzer_test: $(BINDIR)/$(CONFIG)/json_fuzzer_test
-json_rewrite: $(BINDIR)/$(CONFIG)/json_rewrite
-json_rewrite_test: $(BINDIR)/$(CONFIG)/json_rewrite_test
-json_stream_error_test: $(BINDIR)/$(CONFIG)/json_stream_error_test
-json_test: $(BINDIR)/$(CONFIG)/json_test
-lame_client_test: $(BINDIR)/$(CONFIG)/lame_client_test
-lb_policies_test: $(BINDIR)/$(CONFIG)/lb_policies_test
-load_file_test: $(BINDIR)/$(CONFIG)/load_file_test
-low_level_ping_pong_benchmark: $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark
-memory_profile_client: $(BINDIR)/$(CONFIG)/memory_profile_client
-memory_profile_server: $(BINDIR)/$(CONFIG)/memory_profile_server
-memory_profile_test: $(BINDIR)/$(CONFIG)/memory_profile_test
-message_compress_test: $(BINDIR)/$(CONFIG)/message_compress_test
-minimal_stack_is_minimal_test: $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test
-multiple_server_queues_test: $(BINDIR)/$(CONFIG)/multiple_server_queues_test
-murmur_hash_test: $(BINDIR)/$(CONFIG)/murmur_hash_test
-nanopb_fuzzer_response_test: $(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test
-nanopb_fuzzer_serverlist_test: $(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test
-no_server_test: $(BINDIR)/$(CONFIG)/no_server_test
-num_external_connectivity_watchers_test: $(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test
-parse_address_test: $(BINDIR)/$(CONFIG)/parse_address_test
-percent_decode_fuzzer: $(BINDIR)/$(CONFIG)/percent_decode_fuzzer
-percent_encode_fuzzer: $(BINDIR)/$(CONFIG)/percent_encode_fuzzer
-percent_encoding_test: $(BINDIR)/$(CONFIG)/percent_encoding_test
-pollset_set_test: $(BINDIR)/$(CONFIG)/pollset_set_test
-resolve_address_posix_test: $(BINDIR)/$(CONFIG)/resolve_address_posix_test
-resolve_address_test: $(BINDIR)/$(CONFIG)/resolve_address_test
-resource_quota_test: $(BINDIR)/$(CONFIG)/resource_quota_test
-secure_channel_create_test: $(BINDIR)/$(CONFIG)/secure_channel_create_test
-secure_endpoint_test: $(BINDIR)/$(CONFIG)/secure_endpoint_test
-sequential_connectivity_test: $(BINDIR)/$(CONFIG)/sequential_connectivity_test
-server_chttp2_test: $(BINDIR)/$(CONFIG)/server_chttp2_test
-server_fuzzer: $(BINDIR)/$(CONFIG)/server_fuzzer
-server_test: $(BINDIR)/$(CONFIG)/server_test
-slice_buffer_test: $(BINDIR)/$(CONFIG)/slice_buffer_test
-slice_hash_table_test: $(BINDIR)/$(CONFIG)/slice_hash_table_test
-slice_string_helpers_test: $(BINDIR)/$(CONFIG)/slice_string_helpers_test
-slice_test: $(BINDIR)/$(CONFIG)/slice_test
-sockaddr_resolver_test: $(BINDIR)/$(CONFIG)/sockaddr_resolver_test
-sockaddr_utils_test: $(BINDIR)/$(CONFIG)/sockaddr_utils_test
-socket_utils_test: $(BINDIR)/$(CONFIG)/socket_utils_test
-ssl_server_fuzzer: $(BINDIR)/$(CONFIG)/ssl_server_fuzzer
-ssl_transport_security_test: $(BINDIR)/$(CONFIG)/ssl_transport_security_test
-status_conversion_test: $(BINDIR)/$(CONFIG)/status_conversion_test
-stream_compression_test: $(BINDIR)/$(CONFIG)/stream_compression_test
-stream_owned_slice_test: $(BINDIR)/$(CONFIG)/stream_owned_slice_test
-tcp_client_posix_test: $(BINDIR)/$(CONFIG)/tcp_client_posix_test
-tcp_client_uv_test: $(BINDIR)/$(CONFIG)/tcp_client_uv_test
-tcp_posix_test: $(BINDIR)/$(CONFIG)/tcp_posix_test
-tcp_server_posix_test: $(BINDIR)/$(CONFIG)/tcp_server_posix_test
-tcp_server_uv_test: $(BINDIR)/$(CONFIG)/tcp_server_uv_test
-time_averaged_stats_test: $(BINDIR)/$(CONFIG)/time_averaged_stats_test
-timeout_encoding_test: $(BINDIR)/$(CONFIG)/timeout_encoding_test
-timer_heap_test: $(BINDIR)/$(CONFIG)/timer_heap_test
-timer_list_test: $(BINDIR)/$(CONFIG)/timer_list_test
-transport_connectivity_state_test: $(BINDIR)/$(CONFIG)/transport_connectivity_state_test
-transport_metadata_test: $(BINDIR)/$(CONFIG)/transport_metadata_test
-transport_security_test: $(BINDIR)/$(CONFIG)/transport_security_test
-udp_server_test: $(BINDIR)/$(CONFIG)/udp_server_test
-uri_fuzzer_test: $(BINDIR)/$(CONFIG)/uri_fuzzer_test
-uri_parser_test: $(BINDIR)/$(CONFIG)/uri_parser_test
-wakeup_fd_cv_test: $(BINDIR)/$(CONFIG)/wakeup_fd_cv_test
-alarm_cpp_test: $(BINDIR)/$(CONFIG)/alarm_cpp_test
-async_end2end_test: $(BINDIR)/$(CONFIG)/async_end2end_test
-auth_property_iterator_test: $(BINDIR)/$(CONFIG)/auth_property_iterator_test
-backoff_test: $(BINDIR)/$(CONFIG)/backoff_test
-bdp_estimator_test: $(BINDIR)/$(CONFIG)/bdp_estimator_test
-bm_arena: $(BINDIR)/$(CONFIG)/bm_arena
-bm_call_create: $(BINDIR)/$(CONFIG)/bm_call_create
-bm_chttp2_hpack: $(BINDIR)/$(CONFIG)/bm_chttp2_hpack
-bm_chttp2_transport: $(BINDIR)/$(CONFIG)/bm_chttp2_transport
-bm_closure: $(BINDIR)/$(CONFIG)/bm_closure
-bm_cq: $(BINDIR)/$(CONFIG)/bm_cq
-bm_cq_multiple_threads: $(BINDIR)/$(CONFIG)/bm_cq_multiple_threads
-bm_error: $(BINDIR)/$(CONFIG)/bm_error
-bm_fullstack_streaming_ping_pong: $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong
-bm_fullstack_streaming_pump: $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump
-bm_fullstack_trickle: $(BINDIR)/$(CONFIG)/bm_fullstack_trickle
-bm_fullstack_unary_ping_pong: $(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong
-bm_metadata: $(BINDIR)/$(CONFIG)/bm_metadata
-bm_pollset: $(BINDIR)/$(CONFIG)/bm_pollset
-channel_arguments_test: $(BINDIR)/$(CONFIG)/channel_arguments_test
-channel_filter_test: $(BINDIR)/$(CONFIG)/channel_filter_test
-chttp2_settings_timeout_test: $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test
-cli_call_test: $(BINDIR)/$(CONFIG)/cli_call_test
-client_channel_stress_test: $(BINDIR)/$(CONFIG)/client_channel_stress_test
-client_crash_test: $(BINDIR)/$(CONFIG)/client_crash_test
-client_crash_test_server: $(BINDIR)/$(CONFIG)/client_crash_test_server
-client_lb_end2end_test: $(BINDIR)/$(CONFIG)/client_lb_end2end_test
-codegen_test_full: $(BINDIR)/$(CONFIG)/codegen_test_full
-codegen_test_minimal: $(BINDIR)/$(CONFIG)/codegen_test_minimal
-credentials_test: $(BINDIR)/$(CONFIG)/credentials_test
-cxx_byte_buffer_test: $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test
-cxx_slice_test: $(BINDIR)/$(CONFIG)/cxx_slice_test
-cxx_string_ref_test: $(BINDIR)/$(CONFIG)/cxx_string_ref_test
-cxx_time_test: $(BINDIR)/$(CONFIG)/cxx_time_test
-end2end_test: $(BINDIR)/$(CONFIG)/end2end_test
-error_details_test: $(BINDIR)/$(CONFIG)/error_details_test
-exception_test: $(BINDIR)/$(CONFIG)/exception_test
-filter_end2end_test: $(BINDIR)/$(CONFIG)/filter_end2end_test
-generic_end2end_test: $(BINDIR)/$(CONFIG)/generic_end2end_test
-golden_file_test: $(BINDIR)/$(CONFIG)/golden_file_test
-grpc_cli: $(BINDIR)/$(CONFIG)/grpc_cli
-grpc_cpp_plugin: $(BINDIR)/$(CONFIG)/grpc_cpp_plugin
-grpc_csharp_plugin: $(BINDIR)/$(CONFIG)/grpc_csharp_plugin
-grpc_node_plugin: $(BINDIR)/$(CONFIG)/grpc_node_plugin
-grpc_objective_c_plugin: $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin
-grpc_php_plugin: $(BINDIR)/$(CONFIG)/grpc_php_plugin
-grpc_python_plugin: $(BINDIR)/$(CONFIG)/grpc_python_plugin
-grpc_ruby_plugin: $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
-grpc_tool_test: $(BINDIR)/$(CONFIG)/grpc_tool_test
-grpclb_api_test: $(BINDIR)/$(CONFIG)/grpclb_api_test
-grpclb_end2end_test: $(BINDIR)/$(CONFIG)/grpclb_end2end_test
-grpclb_test: $(BINDIR)/$(CONFIG)/grpclb_test
-h2_ssl_cert_test: $(BINDIR)/$(CONFIG)/h2_ssl_cert_test
-health_service_end2end_test: $(BINDIR)/$(CONFIG)/health_service_end2end_test
-http2_client: $(BINDIR)/$(CONFIG)/http2_client
-hybrid_end2end_test: $(BINDIR)/$(CONFIG)/hybrid_end2end_test
-inlined_vector_test: $(BINDIR)/$(CONFIG)/inlined_vector_test
-inproc_sync_unary_ping_pong_test: $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test
-interop_client: $(BINDIR)/$(CONFIG)/interop_client
-interop_server: $(BINDIR)/$(CONFIG)/interop_server
-interop_test: $(BINDIR)/$(CONFIG)/interop_test
-json_run_localhost: $(BINDIR)/$(CONFIG)/json_run_localhost
-memory_test: $(BINDIR)/$(CONFIG)/memory_test
-metrics_client: $(BINDIR)/$(CONFIG)/metrics_client
-mock_test: $(BINDIR)/$(CONFIG)/mock_test
-noop-benchmark: $(BINDIR)/$(CONFIG)/noop-benchmark
-orphanable_test: $(BINDIR)/$(CONFIG)/orphanable_test
-proto_server_reflection_test: $(BINDIR)/$(CONFIG)/proto_server_reflection_test
-proto_utils_test: $(BINDIR)/$(CONFIG)/proto_utils_test
-qps_interarrival_test: $(BINDIR)/$(CONFIG)/qps_interarrival_test
-qps_json_driver: $(BINDIR)/$(CONFIG)/qps_json_driver
-qps_openloop_test: $(BINDIR)/$(CONFIG)/qps_openloop_test
-qps_worker: $(BINDIR)/$(CONFIG)/qps_worker
-reconnect_interop_client: $(BINDIR)/$(CONFIG)/reconnect_interop_client
-reconnect_interop_server: $(BINDIR)/$(CONFIG)/reconnect_interop_server
-ref_counted_ptr_test: $(BINDIR)/$(CONFIG)/ref_counted_ptr_test
-ref_counted_test: $(BINDIR)/$(CONFIG)/ref_counted_test
-secure_auth_context_test: $(BINDIR)/$(CONFIG)/secure_auth_context_test
-secure_sync_unary_ping_pong_test: $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test
-server_builder_plugin_test: $(BINDIR)/$(CONFIG)/server_builder_plugin_test
-server_builder_test: $(BINDIR)/$(CONFIG)/server_builder_test
-server_context_test_spouse_test: $(BINDIR)/$(CONFIG)/server_context_test_spouse_test
-server_crash_test: $(BINDIR)/$(CONFIG)/server_crash_test
-server_crash_test_client: $(BINDIR)/$(CONFIG)/server_crash_test_client
-server_request_call_test: $(BINDIR)/$(CONFIG)/server_request_call_test
-shutdown_test: $(BINDIR)/$(CONFIG)/shutdown_test
-stats_test: $(BINDIR)/$(CONFIG)/stats_test
-status_test: $(BINDIR)/$(CONFIG)/status_test
-streaming_throughput_test: $(BINDIR)/$(CONFIG)/streaming_throughput_test
-stress_test: $(BINDIR)/$(CONFIG)/stress_test
-thread_manager_test: $(BINDIR)/$(CONFIG)/thread_manager_test
-thread_stress_test: $(BINDIR)/$(CONFIG)/thread_stress_test
-transport_pid_controller_test: $(BINDIR)/$(CONFIG)/transport_pid_controller_test
-writes_per_rpc_test: $(BINDIR)/$(CONFIG)/writes_per_rpc_test
-public_headers_must_be_c89: $(BINDIR)/$(CONFIG)/public_headers_must_be_c89
-gen_hpack_tables: $(BINDIR)/$(CONFIG)/gen_hpack_tables
-gen_legal_metadata_characters: $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters
-gen_percent_encoding_tables: $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables
-boringssl_aes_test: $(BINDIR)/$(CONFIG)/boringssl_aes_test
-boringssl_asn1_test: $(BINDIR)/$(CONFIG)/boringssl_asn1_test
-boringssl_base64_test: $(BINDIR)/$(CONFIG)/boringssl_base64_test
-boringssl_bio_test: $(BINDIR)/$(CONFIG)/boringssl_bio_test
-boringssl_bn_test: $(BINDIR)/$(CONFIG)/boringssl_bn_test
-boringssl_bytestring_test: $(BINDIR)/$(CONFIG)/boringssl_bytestring_test
-boringssl_aead_test: $(BINDIR)/$(CONFIG)/boringssl_aead_test
-boringssl_cipher_test: $(BINDIR)/$(CONFIG)/boringssl_cipher_test
-boringssl_cmac_test: $(BINDIR)/$(CONFIG)/boringssl_cmac_test
-boringssl_constant_time_test: $(BINDIR)/$(CONFIG)/boringssl_constant_time_test
-boringssl_ed25519_test: $(BINDIR)/$(CONFIG)/boringssl_ed25519_test
-boringssl_spake25519_test: $(BINDIR)/$(CONFIG)/boringssl_spake25519_test
-boringssl_x25519_test: $(BINDIR)/$(CONFIG)/boringssl_x25519_test
-boringssl_digest_test: $(BINDIR)/$(CONFIG)/boringssl_digest_test
-boringssl_example_mul: $(BINDIR)/$(CONFIG)/boringssl_example_mul
-boringssl_p256-x86_64_test: $(BINDIR)/$(CONFIG)/boringssl_p256-x86_64_test
-boringssl_ecdh_test: $(BINDIR)/$(CONFIG)/boringssl_ecdh_test
-boringssl_ecdsa_sign_test: $(BINDIR)/$(CONFIG)/boringssl_ecdsa_sign_test
-boringssl_ecdsa_test: $(BINDIR)/$(CONFIG)/boringssl_ecdsa_test
-boringssl_ecdsa_verify_test: $(BINDIR)/$(CONFIG)/boringssl_ecdsa_verify_test
-boringssl_evp_extra_test: $(BINDIR)/$(CONFIG)/boringssl_evp_extra_test
-boringssl_evp_test: $(BINDIR)/$(CONFIG)/boringssl_evp_test
-boringssl_pbkdf_test: $(BINDIR)/$(CONFIG)/boringssl_pbkdf_test
-boringssl_hkdf_test: $(BINDIR)/$(CONFIG)/boringssl_hkdf_test
-boringssl_hmac_test: $(BINDIR)/$(CONFIG)/boringssl_hmac_test
-boringssl_lhash_test: $(BINDIR)/$(CONFIG)/boringssl_lhash_test
-boringssl_gcm_test: $(BINDIR)/$(CONFIG)/boringssl_gcm_test
-boringssl_obj_test: $(BINDIR)/$(CONFIG)/boringssl_obj_test
-boringssl_pkcs12_test: $(BINDIR)/$(CONFIG)/boringssl_pkcs12_test
-boringssl_pkcs8_test: $(BINDIR)/$(CONFIG)/boringssl_pkcs8_test
-boringssl_poly1305_test: $(BINDIR)/$(CONFIG)/boringssl_poly1305_test
-boringssl_pool_test: $(BINDIR)/$(CONFIG)/boringssl_pool_test
-boringssl_refcount_test: $(BINDIR)/$(CONFIG)/boringssl_refcount_test
-boringssl_thread_test: $(BINDIR)/$(CONFIG)/boringssl_thread_test
-boringssl_pkcs7_test: $(BINDIR)/$(CONFIG)/boringssl_pkcs7_test
-boringssl_x509_test: $(BINDIR)/$(CONFIG)/boringssl_x509_test
-boringssl_tab_test: $(BINDIR)/$(CONFIG)/boringssl_tab_test
-boringssl_v3name_test: $(BINDIR)/$(CONFIG)/boringssl_v3name_test
-badreq_bad_client_test: $(BINDIR)/$(CONFIG)/badreq_bad_client_test
-connection_prefix_bad_client_test: $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test
-duplicate_header_bad_client_test: $(BINDIR)/$(CONFIG)/duplicate_header_bad_client_test
-head_of_line_blocking_bad_client_test: $(BINDIR)/$(CONFIG)/head_of_line_blocking_bad_client_test
-headers_bad_client_test: $(BINDIR)/$(CONFIG)/headers_bad_client_test
-initial_settings_frame_bad_client_test: $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test
-server_registered_method_bad_client_test: $(BINDIR)/$(CONFIG)/server_registered_method_bad_client_test
-simple_request_bad_client_test: $(BINDIR)/$(CONFIG)/simple_request_bad_client_test
-unknown_frame_bad_client_test: $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test
-window_overflow_bad_client_test: $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test
-bad_ssl_cert_server: $(BINDIR)/$(CONFIG)/bad_ssl_cert_server
-bad_ssl_cert_test: $(BINDIR)/$(CONFIG)/bad_ssl_cert_test
-h2_census_test: $(BINDIR)/$(CONFIG)/h2_census_test
-h2_compress_test: $(BINDIR)/$(CONFIG)/h2_compress_test
-h2_fakesec_test: $(BINDIR)/$(CONFIG)/h2_fakesec_test
-h2_fd_test: $(BINDIR)/$(CONFIG)/h2_fd_test
-h2_full_test: $(BINDIR)/$(CONFIG)/h2_full_test
-h2_full+pipe_test: $(BINDIR)/$(CONFIG)/h2_full+pipe_test
-h2_full+trace_test: $(BINDIR)/$(CONFIG)/h2_full+trace_test
-h2_full+workarounds_test: $(BINDIR)/$(CONFIG)/h2_full+workarounds_test
-h2_http_proxy_test: $(BINDIR)/$(CONFIG)/h2_http_proxy_test
-h2_load_reporting_test: $(BINDIR)/$(CONFIG)/h2_load_reporting_test
-h2_oauth2_test: $(BINDIR)/$(CONFIG)/h2_oauth2_test
-h2_proxy_test: $(BINDIR)/$(CONFIG)/h2_proxy_test
-h2_sockpair_test: $(BINDIR)/$(CONFIG)/h2_sockpair_test
-h2_sockpair+trace_test: $(BINDIR)/$(CONFIG)/h2_sockpair+trace_test
-h2_sockpair_1byte_test: $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test
-h2_ssl_test: $(BINDIR)/$(CONFIG)/h2_ssl_test
-h2_ssl_proxy_test: $(BINDIR)/$(CONFIG)/h2_ssl_proxy_test
-h2_uds_test: $(BINDIR)/$(CONFIG)/h2_uds_test
-inproc_test: $(BINDIR)/$(CONFIG)/inproc_test
-h2_census_nosec_test: $(BINDIR)/$(CONFIG)/h2_census_nosec_test
-h2_compress_nosec_test: $(BINDIR)/$(CONFIG)/h2_compress_nosec_test
-h2_fd_nosec_test: $(BINDIR)/$(CONFIG)/h2_fd_nosec_test
-h2_full_nosec_test: $(BINDIR)/$(CONFIG)/h2_full_nosec_test
-h2_full+pipe_nosec_test: $(BINDIR)/$(CONFIG)/h2_full+pipe_nosec_test
-h2_full+trace_nosec_test: $(BINDIR)/$(CONFIG)/h2_full+trace_nosec_test
-h2_full+workarounds_nosec_test: $(BINDIR)/$(CONFIG)/h2_full+workarounds_nosec_test
-h2_http_proxy_nosec_test: $(BINDIR)/$(CONFIG)/h2_http_proxy_nosec_test
-h2_load_reporting_nosec_test: $(BINDIR)/$(CONFIG)/h2_load_reporting_nosec_test
-h2_proxy_nosec_test: $(BINDIR)/$(CONFIG)/h2_proxy_nosec_test
-h2_sockpair_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair_nosec_test
-h2_sockpair+trace_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test
-h2_sockpair_1byte_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test
-h2_uds_nosec_test: $(BINDIR)/$(CONFIG)/h2_uds_nosec_test
-inproc_nosec_test: $(BINDIR)/$(CONFIG)/inproc_nosec_test
-resolver_component_test_unsecure: $(BINDIR)/$(CONFIG)/resolver_component_test_unsecure
-resolver_component_test: $(BINDIR)/$(CONFIG)/resolver_component_test
-resolver_component_tests_runner_invoker_unsecure: $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure
-resolver_component_tests_runner_invoker: $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker
-api_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/api_fuzzer_one_entry
-client_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/client_fuzzer_one_entry
-hpack_parser_fuzzer_test_one_entry: $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry
-http_request_fuzzer_test_one_entry: $(BINDIR)/$(CONFIG)/http_request_fuzzer_test_one_entry
-http_response_fuzzer_test_one_entry: $(BINDIR)/$(CONFIG)/http_response_fuzzer_test_one_entry
-json_fuzzer_test_one_entry: $(BINDIR)/$(CONFIG)/json_fuzzer_test_one_entry
-nanopb_fuzzer_response_test_one_entry: $(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test_one_entry
-nanopb_fuzzer_serverlist_test_one_entry: $(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test_one_entry
-percent_decode_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/percent_decode_fuzzer_one_entry
-percent_encode_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/percent_encode_fuzzer_one_entry
-server_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/server_fuzzer_one_entry
-ssl_server_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/ssl_server_fuzzer_one_entry
-uri_fuzzer_test_one_entry: $(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry
-
-run_dep_checks:
-	$(OPENSSL_ALPN_CHECK_CMD) || true
-	$(OPENSSL_NPN_CHECK_CMD) || true
-	$(ZLIB_CHECK_CMD) || true
-	$(PERFTOOLS_CHECK_CMD) || true
-	$(PROTOBUF_CHECK_CMD) || true
-	$(PROTOC_CHECK_VERSION_CMD) || true
-	$(CARES_CHECK_CMD) || true
-
-third_party/protobuf/configure:
-	$(E) "[AUTOGEN] Preparing protobuf"
-	$(Q)(cd third_party/protobuf ; autoreconf -f -i -Wall,no-obsolete)
-
-$(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure
-	$(E) "[MAKE]    Building protobuf"
-	$(Q)mkdir -p $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)(cd third_party/protobuf ; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(PROTOBUF_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(PROTOBUF_CPPFLAGS_EXTRA)" ./configure --disable-shared --enable-static $(PROTOBUF_CONFIG_OPTS))
-	$(Q)$(MAKE) -C third_party/protobuf clean
-	$(Q)$(MAKE) -C third_party/protobuf
-	$(Q)mkdir -p $(BINDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/.libs/libprotoc.a $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/.libs/libprotobuf.a $(LIBDIR)/$(CONFIG)/protobuf
-	$(Q)cp third_party/protobuf/src/protoc $(BINDIR)/$(CONFIG)/protobuf
-
-static: static_c static_cxx
-
-static_c: pc_c pc_c_unsecure cache.mk  $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
-
-static_cxx: pc_cxx pc_cxx_unsecure cache.mk  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
-
-shared: shared_c shared_cxx
-
-shared_c: pc_c pc_c_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-shared_cxx: pc_cxx pc_cxx_unsecure cache.mk $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-
-shared_csharp: shared_c  $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)
-grpc_csharp_ext: shared_csharp
-
-plugins: $(PROTOC_PLUGINS)
-
-privatelibs: privatelibs_c privatelibs_cxx
-
-privatelibs_c:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
-pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc
-
-pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc
-
-pc_cxx: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc
-
-pc_cxx_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc
-
-ifeq ($(EMBED_OPENSSL),true)
-privatelibs_cxx:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBDIR)/$(CONFIG)/libbenchmark.a
-else
-privatelibs_cxx:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libbenchmark.a
-endif
-
-
-buildtests: buildtests_c buildtests_cxx
-
-buildtests_c: privatelibs_c \
-  $(BINDIR)/$(CONFIG)/alarm_test \
-  $(BINDIR)/$(CONFIG)/algorithm_test \
-  $(BINDIR)/$(CONFIG)/alloc_test \
-  $(BINDIR)/$(CONFIG)/alpn_test \
-  $(BINDIR)/$(CONFIG)/arena_test \
-  $(BINDIR)/$(CONFIG)/bad_server_response_test \
-  $(BINDIR)/$(CONFIG)/bin_decoder_test \
-  $(BINDIR)/$(CONFIG)/bin_encoder_test \
-  $(BINDIR)/$(CONFIG)/byte_stream_test \
-  $(BINDIR)/$(CONFIG)/channel_create_test \
-  $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test \
-  $(BINDIR)/$(CONFIG)/chttp2_stream_map_test \
-  $(BINDIR)/$(CONFIG)/chttp2_varint_test \
-  $(BINDIR)/$(CONFIG)/combiner_test \
-  $(BINDIR)/$(CONFIG)/compression_test \
-  $(BINDIR)/$(CONFIG)/concurrent_connectivity_test \
-  $(BINDIR)/$(CONFIG)/connection_refused_test \
-  $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test \
-  $(BINDIR)/$(CONFIG)/dns_resolver_test \
-  $(BINDIR)/$(CONFIG)/dualstack_socket_test \
-  $(BINDIR)/$(CONFIG)/endpoint_pair_test \
-  $(BINDIR)/$(CONFIG)/error_test \
-  $(BINDIR)/$(CONFIG)/ev_epollsig_linux_test \
-  $(BINDIR)/$(CONFIG)/fake_resolver_test \
-  $(BINDIR)/$(CONFIG)/fake_transport_security_test \
-  $(BINDIR)/$(CONFIG)/fd_conservation_posix_test \
-  $(BINDIR)/$(CONFIG)/fd_posix_test \
-  $(BINDIR)/$(CONFIG)/fling_client \
-  $(BINDIR)/$(CONFIG)/fling_server \
-  $(BINDIR)/$(CONFIG)/fling_stream_test \
-  $(BINDIR)/$(CONFIG)/fling_test \
-  $(BINDIR)/$(CONFIG)/goaway_server_test \
-  $(BINDIR)/$(CONFIG)/gpr_avl_test \
-  $(BINDIR)/$(CONFIG)/gpr_cmdline_test \
-  $(BINDIR)/$(CONFIG)/gpr_cpu_test \
-  $(BINDIR)/$(CONFIG)/gpr_env_test \
-  $(BINDIR)/$(CONFIG)/gpr_host_port_test \
-  $(BINDIR)/$(CONFIG)/gpr_log_test \
-  $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test \
-  $(BINDIR)/$(CONFIG)/gpr_mpscq_test \
-  $(BINDIR)/$(CONFIG)/gpr_spinlock_test \
-  $(BINDIR)/$(CONFIG)/gpr_string_test \
-  $(BINDIR)/$(CONFIG)/gpr_sync_test \
-  $(BINDIR)/$(CONFIG)/gpr_thd_test \
-  $(BINDIR)/$(CONFIG)/gpr_time_test \
-  $(BINDIR)/$(CONFIG)/gpr_tls_test \
-  $(BINDIR)/$(CONFIG)/gpr_useful_test \
-  $(BINDIR)/$(CONFIG)/grpc_auth_context_test \
-  $(BINDIR)/$(CONFIG)/grpc_b64_test \
-  $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test \
-  $(BINDIR)/$(CONFIG)/grpc_channel_args_test \
-  $(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test \
-  $(BINDIR)/$(CONFIG)/grpc_channel_stack_test \
-  $(BINDIR)/$(CONFIG)/grpc_completion_queue_test \
-  $(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test \
-  $(BINDIR)/$(CONFIG)/grpc_credentials_test \
-  $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2 \
-  $(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test \
-  $(BINDIR)/$(CONFIG)/grpc_json_token_test \
-  $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test \
-  $(BINDIR)/$(CONFIG)/grpc_security_connector_test \
-  $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test \
-  $(BINDIR)/$(CONFIG)/handshake_client \
-  $(BINDIR)/$(CONFIG)/handshake_server \
-  $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker \
-  $(BINDIR)/$(CONFIG)/histogram_test \
-  $(BINDIR)/$(CONFIG)/hpack_parser_test \
-  $(BINDIR)/$(CONFIG)/hpack_table_test \
-  $(BINDIR)/$(CONFIG)/http_parser_test \
-  $(BINDIR)/$(CONFIG)/httpcli_format_request_test \
-  $(BINDIR)/$(CONFIG)/httpcli_test \
-  $(BINDIR)/$(CONFIG)/httpscli_test \
-  $(BINDIR)/$(CONFIG)/init_test \
-  $(BINDIR)/$(CONFIG)/invalid_call_argument_test \
-  $(BINDIR)/$(CONFIG)/json_rewrite \
-  $(BINDIR)/$(CONFIG)/json_rewrite_test \
-  $(BINDIR)/$(CONFIG)/json_stream_error_test \
-  $(BINDIR)/$(CONFIG)/json_test \
-  $(BINDIR)/$(CONFIG)/lame_client_test \
-  $(BINDIR)/$(CONFIG)/lb_policies_test \
-  $(BINDIR)/$(CONFIG)/load_file_test \
-  $(BINDIR)/$(CONFIG)/memory_profile_client \
-  $(BINDIR)/$(CONFIG)/memory_profile_server \
-  $(BINDIR)/$(CONFIG)/memory_profile_test \
-  $(BINDIR)/$(CONFIG)/message_compress_test \
-  $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test \
-  $(BINDIR)/$(CONFIG)/multiple_server_queues_test \
-  $(BINDIR)/$(CONFIG)/murmur_hash_test \
-  $(BINDIR)/$(CONFIG)/no_server_test \
-  $(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test \
-  $(BINDIR)/$(CONFIG)/parse_address_test \
-  $(BINDIR)/$(CONFIG)/percent_encoding_test \
-  $(BINDIR)/$(CONFIG)/pollset_set_test \
-  $(BINDIR)/$(CONFIG)/resolve_address_posix_test \
-  $(BINDIR)/$(CONFIG)/resolve_address_test \
-  $(BINDIR)/$(CONFIG)/resource_quota_test \
-  $(BINDIR)/$(CONFIG)/secure_channel_create_test \
-  $(BINDIR)/$(CONFIG)/secure_endpoint_test \
-  $(BINDIR)/$(CONFIG)/sequential_connectivity_test \
-  $(BINDIR)/$(CONFIG)/server_chttp2_test \
-  $(BINDIR)/$(CONFIG)/server_test \
-  $(BINDIR)/$(CONFIG)/slice_buffer_test \
-  $(BINDIR)/$(CONFIG)/slice_hash_table_test \
-  $(BINDIR)/$(CONFIG)/slice_string_helpers_test \
-  $(BINDIR)/$(CONFIG)/slice_test \
-  $(BINDIR)/$(CONFIG)/sockaddr_resolver_test \
-  $(BINDIR)/$(CONFIG)/sockaddr_utils_test \
-  $(BINDIR)/$(CONFIG)/socket_utils_test \
-  $(BINDIR)/$(CONFIG)/ssl_transport_security_test \
-  $(BINDIR)/$(CONFIG)/status_conversion_test \
-  $(BINDIR)/$(CONFIG)/stream_compression_test \
-  $(BINDIR)/$(CONFIG)/stream_owned_slice_test \
-  $(BINDIR)/$(CONFIG)/tcp_client_posix_test \
-  $(BINDIR)/$(CONFIG)/tcp_client_uv_test \
-  $(BINDIR)/$(CONFIG)/tcp_posix_test \
-  $(BINDIR)/$(CONFIG)/tcp_server_posix_test \
-  $(BINDIR)/$(CONFIG)/tcp_server_uv_test \
-  $(BINDIR)/$(CONFIG)/time_averaged_stats_test \
-  $(BINDIR)/$(CONFIG)/timeout_encoding_test \
-  $(BINDIR)/$(CONFIG)/timer_heap_test \
-  $(BINDIR)/$(CONFIG)/timer_list_test \
-  $(BINDIR)/$(CONFIG)/transport_connectivity_state_test \
-  $(BINDIR)/$(CONFIG)/transport_metadata_test \
-  $(BINDIR)/$(CONFIG)/transport_security_test \
-  $(BINDIR)/$(CONFIG)/udp_server_test \
-  $(BINDIR)/$(CONFIG)/uri_parser_test \
-  $(BINDIR)/$(CONFIG)/wakeup_fd_cv_test \
-  $(BINDIR)/$(CONFIG)/public_headers_must_be_c89 \
-  $(BINDIR)/$(CONFIG)/badreq_bad_client_test \
-  $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test \
-  $(BINDIR)/$(CONFIG)/duplicate_header_bad_client_test \
-  $(BINDIR)/$(CONFIG)/head_of_line_blocking_bad_client_test \
-  $(BINDIR)/$(CONFIG)/headers_bad_client_test \
-  $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test \
-  $(BINDIR)/$(CONFIG)/server_registered_method_bad_client_test \
-  $(BINDIR)/$(CONFIG)/simple_request_bad_client_test \
-  $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test \
-  $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test \
-  $(BINDIR)/$(CONFIG)/bad_ssl_cert_server \
-  $(BINDIR)/$(CONFIG)/bad_ssl_cert_test \
-  $(BINDIR)/$(CONFIG)/h2_census_test \
-  $(BINDIR)/$(CONFIG)/h2_compress_test \
-  $(BINDIR)/$(CONFIG)/h2_fakesec_test \
-  $(BINDIR)/$(CONFIG)/h2_fd_test \
-  $(BINDIR)/$(CONFIG)/h2_full_test \
-  $(BINDIR)/$(CONFIG)/h2_full+pipe_test \
-  $(BINDIR)/$(CONFIG)/h2_full+trace_test \
-  $(BINDIR)/$(CONFIG)/h2_full+workarounds_test \
-  $(BINDIR)/$(CONFIG)/h2_http_proxy_test \
-  $(BINDIR)/$(CONFIG)/h2_load_reporting_test \
-  $(BINDIR)/$(CONFIG)/h2_oauth2_test \
-  $(BINDIR)/$(CONFIG)/h2_proxy_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair+trace_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test \
-  $(BINDIR)/$(CONFIG)/h2_ssl_test \
-  $(BINDIR)/$(CONFIG)/h2_ssl_proxy_test \
-  $(BINDIR)/$(CONFIG)/h2_uds_test \
-  $(BINDIR)/$(CONFIG)/inproc_test \
-  $(BINDIR)/$(CONFIG)/h2_census_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_compress_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_fd_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_full_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_full+pipe_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_full+trace_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_full+workarounds_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_http_proxy_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_load_reporting_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_proxy_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test \
-  $(BINDIR)/$(CONFIG)/h2_uds_nosec_test \
-  $(BINDIR)/$(CONFIG)/inproc_nosec_test \
-  $(BINDIR)/$(CONFIG)/api_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/client_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry \
-  $(BINDIR)/$(CONFIG)/http_request_fuzzer_test_one_entry \
-  $(BINDIR)/$(CONFIG)/http_response_fuzzer_test_one_entry \
-  $(BINDIR)/$(CONFIG)/json_fuzzer_test_one_entry \
-  $(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test_one_entry \
-  $(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test_one_entry \
-  $(BINDIR)/$(CONFIG)/percent_decode_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/percent_encode_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/server_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/ssl_server_fuzzer_one_entry \
-  $(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry \
-
-
-ifeq ($(EMBED_OPENSSL),true)
-buildtests_cxx: privatelibs_cxx \
-  $(BINDIR)/$(CONFIG)/alarm_cpp_test \
-  $(BINDIR)/$(CONFIG)/async_end2end_test \
-  $(BINDIR)/$(CONFIG)/auth_property_iterator_test \
-  $(BINDIR)/$(CONFIG)/backoff_test \
-  $(BINDIR)/$(CONFIG)/bdp_estimator_test \
-  $(BINDIR)/$(CONFIG)/bm_arena \
-  $(BINDIR)/$(CONFIG)/bm_call_create \
-  $(BINDIR)/$(CONFIG)/bm_chttp2_hpack \
-  $(BINDIR)/$(CONFIG)/bm_chttp2_transport \
-  $(BINDIR)/$(CONFIG)/bm_closure \
-  $(BINDIR)/$(CONFIG)/bm_cq \
-  $(BINDIR)/$(CONFIG)/bm_cq_multiple_threads \
-  $(BINDIR)/$(CONFIG)/bm_error \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_trickle \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong \
-  $(BINDIR)/$(CONFIG)/bm_metadata \
-  $(BINDIR)/$(CONFIG)/bm_pollset \
-  $(BINDIR)/$(CONFIG)/channel_arguments_test \
-  $(BINDIR)/$(CONFIG)/channel_filter_test \
-  $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test \
-  $(BINDIR)/$(CONFIG)/cli_call_test \
-  $(BINDIR)/$(CONFIG)/client_channel_stress_test \
-  $(BINDIR)/$(CONFIG)/client_crash_test \
-  $(BINDIR)/$(CONFIG)/client_crash_test_server \
-  $(BINDIR)/$(CONFIG)/client_lb_end2end_test \
-  $(BINDIR)/$(CONFIG)/codegen_test_full \
-  $(BINDIR)/$(CONFIG)/codegen_test_minimal \
-  $(BINDIR)/$(CONFIG)/credentials_test \
-  $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test \
-  $(BINDIR)/$(CONFIG)/cxx_slice_test \
-  $(BINDIR)/$(CONFIG)/cxx_string_ref_test \
-  $(BINDIR)/$(CONFIG)/cxx_time_test \
-  $(BINDIR)/$(CONFIG)/end2end_test \
-  $(BINDIR)/$(CONFIG)/error_details_test \
-  $(BINDIR)/$(CONFIG)/exception_test \
-  $(BINDIR)/$(CONFIG)/filter_end2end_test \
-  $(BINDIR)/$(CONFIG)/generic_end2end_test \
-  $(BINDIR)/$(CONFIG)/golden_file_test \
-  $(BINDIR)/$(CONFIG)/grpc_cli \
-  $(BINDIR)/$(CONFIG)/grpc_tool_test \
-  $(BINDIR)/$(CONFIG)/grpclb_api_test \
-  $(BINDIR)/$(CONFIG)/grpclb_end2end_test \
-  $(BINDIR)/$(CONFIG)/grpclb_test \
-  $(BINDIR)/$(CONFIG)/h2_ssl_cert_test \
-  $(BINDIR)/$(CONFIG)/health_service_end2end_test \
-  $(BINDIR)/$(CONFIG)/http2_client \
-  $(BINDIR)/$(CONFIG)/hybrid_end2end_test \
-  $(BINDIR)/$(CONFIG)/inlined_vector_test \
-  $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test \
-  $(BINDIR)/$(CONFIG)/interop_client \
-  $(BINDIR)/$(CONFIG)/interop_server \
-  $(BINDIR)/$(CONFIG)/interop_test \
-  $(BINDIR)/$(CONFIG)/json_run_localhost \
-  $(BINDIR)/$(CONFIG)/memory_test \
-  $(BINDIR)/$(CONFIG)/metrics_client \
-  $(BINDIR)/$(CONFIG)/mock_test \
-  $(BINDIR)/$(CONFIG)/noop-benchmark \
-  $(BINDIR)/$(CONFIG)/orphanable_test \
-  $(BINDIR)/$(CONFIG)/proto_server_reflection_test \
-  $(BINDIR)/$(CONFIG)/proto_utils_test \
-  $(BINDIR)/$(CONFIG)/qps_interarrival_test \
-  $(BINDIR)/$(CONFIG)/qps_json_driver \
-  $(BINDIR)/$(CONFIG)/qps_openloop_test \
-  $(BINDIR)/$(CONFIG)/qps_worker \
-  $(BINDIR)/$(CONFIG)/reconnect_interop_client \
-  $(BINDIR)/$(CONFIG)/reconnect_interop_server \
-  $(BINDIR)/$(CONFIG)/ref_counted_ptr_test \
-  $(BINDIR)/$(CONFIG)/ref_counted_test \
-  $(BINDIR)/$(CONFIG)/secure_auth_context_test \
-  $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test \
-  $(BINDIR)/$(CONFIG)/server_builder_plugin_test \
-  $(BINDIR)/$(CONFIG)/server_builder_test \
-  $(BINDIR)/$(CONFIG)/server_context_test_spouse_test \
-  $(BINDIR)/$(CONFIG)/server_crash_test \
-  $(BINDIR)/$(CONFIG)/server_crash_test_client \
-  $(BINDIR)/$(CONFIG)/server_request_call_test \
-  $(BINDIR)/$(CONFIG)/shutdown_test \
-  $(BINDIR)/$(CONFIG)/stats_test \
-  $(BINDIR)/$(CONFIG)/status_test \
-  $(BINDIR)/$(CONFIG)/streaming_throughput_test \
-  $(BINDIR)/$(CONFIG)/stress_test \
-  $(BINDIR)/$(CONFIG)/thread_manager_test \
-  $(BINDIR)/$(CONFIG)/thread_stress_test \
-  $(BINDIR)/$(CONFIG)/transport_pid_controller_test \
-  $(BINDIR)/$(CONFIG)/writes_per_rpc_test \
-  $(BINDIR)/$(CONFIG)/boringssl_aes_test \
-  $(BINDIR)/$(CONFIG)/boringssl_asn1_test \
-  $(BINDIR)/$(CONFIG)/boringssl_base64_test \
-  $(BINDIR)/$(CONFIG)/boringssl_bio_test \
-  $(BINDIR)/$(CONFIG)/boringssl_bn_test \
-  $(BINDIR)/$(CONFIG)/boringssl_bytestring_test \
-  $(BINDIR)/$(CONFIG)/boringssl_aead_test \
-  $(BINDIR)/$(CONFIG)/boringssl_cipher_test \
-  $(BINDIR)/$(CONFIG)/boringssl_cmac_test \
-  $(BINDIR)/$(CONFIG)/boringssl_constant_time_test \
-  $(BINDIR)/$(CONFIG)/boringssl_ed25519_test \
-  $(BINDIR)/$(CONFIG)/boringssl_spake25519_test \
-  $(BINDIR)/$(CONFIG)/boringssl_x25519_test \
-  $(BINDIR)/$(CONFIG)/boringssl_digest_test \
-  $(BINDIR)/$(CONFIG)/boringssl_example_mul \
-  $(BINDIR)/$(CONFIG)/boringssl_p256-x86_64_test \
-  $(BINDIR)/$(CONFIG)/boringssl_ecdh_test \
-  $(BINDIR)/$(CONFIG)/boringssl_ecdsa_sign_test \
-  $(BINDIR)/$(CONFIG)/boringssl_ecdsa_test \
-  $(BINDIR)/$(CONFIG)/boringssl_ecdsa_verify_test \
-  $(BINDIR)/$(CONFIG)/boringssl_evp_extra_test \
-  $(BINDIR)/$(CONFIG)/boringssl_evp_test \
-  $(BINDIR)/$(CONFIG)/boringssl_pbkdf_test \
-  $(BINDIR)/$(CONFIG)/boringssl_hkdf_test \
-  $(BINDIR)/$(CONFIG)/boringssl_hmac_test \
-  $(BINDIR)/$(CONFIG)/boringssl_lhash_test \
-  $(BINDIR)/$(CONFIG)/boringssl_gcm_test \
-  $(BINDIR)/$(CONFIG)/boringssl_obj_test \
-  $(BINDIR)/$(CONFIG)/boringssl_pkcs12_test \
-  $(BINDIR)/$(CONFIG)/boringssl_pkcs8_test \
-  $(BINDIR)/$(CONFIG)/boringssl_poly1305_test \
-  $(BINDIR)/$(CONFIG)/boringssl_pool_test \
-  $(BINDIR)/$(CONFIG)/boringssl_refcount_test \
-  $(BINDIR)/$(CONFIG)/boringssl_thread_test \
-  $(BINDIR)/$(CONFIG)/boringssl_pkcs7_test \
-  $(BINDIR)/$(CONFIG)/boringssl_x509_test \
-  $(BINDIR)/$(CONFIG)/boringssl_tab_test \
-  $(BINDIR)/$(CONFIG)/boringssl_v3name_test \
-  $(BINDIR)/$(CONFIG)/resolver_component_test_unsecure \
-  $(BINDIR)/$(CONFIG)/resolver_component_test \
-  $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure \
-  $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker \
-
-else
-buildtests_cxx: privatelibs_cxx \
-  $(BINDIR)/$(CONFIG)/alarm_cpp_test \
-  $(BINDIR)/$(CONFIG)/async_end2end_test \
-  $(BINDIR)/$(CONFIG)/auth_property_iterator_test \
-  $(BINDIR)/$(CONFIG)/backoff_test \
-  $(BINDIR)/$(CONFIG)/bdp_estimator_test \
-  $(BINDIR)/$(CONFIG)/bm_arena \
-  $(BINDIR)/$(CONFIG)/bm_call_create \
-  $(BINDIR)/$(CONFIG)/bm_chttp2_hpack \
-  $(BINDIR)/$(CONFIG)/bm_chttp2_transport \
-  $(BINDIR)/$(CONFIG)/bm_closure \
-  $(BINDIR)/$(CONFIG)/bm_cq \
-  $(BINDIR)/$(CONFIG)/bm_cq_multiple_threads \
-  $(BINDIR)/$(CONFIG)/bm_error \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_trickle \
-  $(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong \
-  $(BINDIR)/$(CONFIG)/bm_metadata \
-  $(BINDIR)/$(CONFIG)/bm_pollset \
-  $(BINDIR)/$(CONFIG)/channel_arguments_test \
-  $(BINDIR)/$(CONFIG)/channel_filter_test \
-  $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test \
-  $(BINDIR)/$(CONFIG)/cli_call_test \
-  $(BINDIR)/$(CONFIG)/client_channel_stress_test \
-  $(BINDIR)/$(CONFIG)/client_crash_test \
-  $(BINDIR)/$(CONFIG)/client_crash_test_server \
-  $(BINDIR)/$(CONFIG)/client_lb_end2end_test \
-  $(BINDIR)/$(CONFIG)/codegen_test_full \
-  $(BINDIR)/$(CONFIG)/codegen_test_minimal \
-  $(BINDIR)/$(CONFIG)/credentials_test \
-  $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test \
-  $(BINDIR)/$(CONFIG)/cxx_slice_test \
-  $(BINDIR)/$(CONFIG)/cxx_string_ref_test \
-  $(BINDIR)/$(CONFIG)/cxx_time_test \
-  $(BINDIR)/$(CONFIG)/end2end_test \
-  $(BINDIR)/$(CONFIG)/error_details_test \
-  $(BINDIR)/$(CONFIG)/exception_test \
-  $(BINDIR)/$(CONFIG)/filter_end2end_test \
-  $(BINDIR)/$(CONFIG)/generic_end2end_test \
-  $(BINDIR)/$(CONFIG)/golden_file_test \
-  $(BINDIR)/$(CONFIG)/grpc_cli \
-  $(BINDIR)/$(CONFIG)/grpc_tool_test \
-  $(BINDIR)/$(CONFIG)/grpclb_api_test \
-  $(BINDIR)/$(CONFIG)/grpclb_end2end_test \
-  $(BINDIR)/$(CONFIG)/grpclb_test \
-  $(BINDIR)/$(CONFIG)/h2_ssl_cert_test \
-  $(BINDIR)/$(CONFIG)/health_service_end2end_test \
-  $(BINDIR)/$(CONFIG)/http2_client \
-  $(BINDIR)/$(CONFIG)/hybrid_end2end_test \
-  $(BINDIR)/$(CONFIG)/inlined_vector_test \
-  $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test \
-  $(BINDIR)/$(CONFIG)/interop_client \
-  $(BINDIR)/$(CONFIG)/interop_server \
-  $(BINDIR)/$(CONFIG)/interop_test \
-  $(BINDIR)/$(CONFIG)/json_run_localhost \
-  $(BINDIR)/$(CONFIG)/memory_test \
-  $(BINDIR)/$(CONFIG)/metrics_client \
-  $(BINDIR)/$(CONFIG)/mock_test \
-  $(BINDIR)/$(CONFIG)/noop-benchmark \
-  $(BINDIR)/$(CONFIG)/orphanable_test \
-  $(BINDIR)/$(CONFIG)/proto_server_reflection_test \
-  $(BINDIR)/$(CONFIG)/proto_utils_test \
-  $(BINDIR)/$(CONFIG)/qps_interarrival_test \
-  $(BINDIR)/$(CONFIG)/qps_json_driver \
-  $(BINDIR)/$(CONFIG)/qps_openloop_test \
-  $(BINDIR)/$(CONFIG)/qps_worker \
-  $(BINDIR)/$(CONFIG)/reconnect_interop_client \
-  $(BINDIR)/$(CONFIG)/reconnect_interop_server \
-  $(BINDIR)/$(CONFIG)/ref_counted_ptr_test \
-  $(BINDIR)/$(CONFIG)/ref_counted_test \
-  $(BINDIR)/$(CONFIG)/secure_auth_context_test \
-  $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test \
-  $(BINDIR)/$(CONFIG)/server_builder_plugin_test \
-  $(BINDIR)/$(CONFIG)/server_builder_test \
-  $(BINDIR)/$(CONFIG)/server_context_test_spouse_test \
-  $(BINDIR)/$(CONFIG)/server_crash_test \
-  $(BINDIR)/$(CONFIG)/server_crash_test_client \
-  $(BINDIR)/$(CONFIG)/server_request_call_test \
-  $(BINDIR)/$(CONFIG)/shutdown_test \
-  $(BINDIR)/$(CONFIG)/stats_test \
-  $(BINDIR)/$(CONFIG)/status_test \
-  $(BINDIR)/$(CONFIG)/streaming_throughput_test \
-  $(BINDIR)/$(CONFIG)/stress_test \
-  $(BINDIR)/$(CONFIG)/thread_manager_test \
-  $(BINDIR)/$(CONFIG)/thread_stress_test \
-  $(BINDIR)/$(CONFIG)/transport_pid_controller_test \
-  $(BINDIR)/$(CONFIG)/writes_per_rpc_test \
-  $(BINDIR)/$(CONFIG)/resolver_component_test_unsecure \
-  $(BINDIR)/$(CONFIG)/resolver_component_test \
-  $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure \
-  $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker \
-
-endif
-
-
-test: test_c test_cxx
-
-flaky_test: flaky_test_c flaky_test_cxx
-
-test_c: buildtests_c
-	$(E) "[RUN]     Testing alarm_test"
-	$(Q) $(BINDIR)/$(CONFIG)/alarm_test || ( echo test alarm_test failed ; exit 1 )
-	$(E) "[RUN]     Testing algorithm_test"
-	$(Q) $(BINDIR)/$(CONFIG)/algorithm_test || ( echo test algorithm_test failed ; exit 1 )
-	$(E) "[RUN]     Testing alloc_test"
-	$(Q) $(BINDIR)/$(CONFIG)/alloc_test || ( echo test alloc_test failed ; exit 1 )
-	$(E) "[RUN]     Testing alpn_test"
-	$(Q) $(BINDIR)/$(CONFIG)/alpn_test || ( echo test alpn_test failed ; exit 1 )
-	$(E) "[RUN]     Testing arena_test"
-	$(Q) $(BINDIR)/$(CONFIG)/arena_test || ( echo test arena_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bad_server_response_test"
-	$(Q) $(BINDIR)/$(CONFIG)/bad_server_response_test || ( echo test bad_server_response_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bin_decoder_test"
-	$(Q) $(BINDIR)/$(CONFIG)/bin_decoder_test || ( echo test bin_decoder_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bin_encoder_test"
-	$(Q) $(BINDIR)/$(CONFIG)/bin_encoder_test || ( echo test bin_encoder_test failed ; exit 1 )
-	$(E) "[RUN]     Testing byte_stream_test"
-	$(Q) $(BINDIR)/$(CONFIG)/byte_stream_test || ( echo test byte_stream_test failed ; exit 1 )
-	$(E) "[RUN]     Testing channel_create_test"
-	$(Q) $(BINDIR)/$(CONFIG)/channel_create_test || ( echo test channel_create_test failed ; exit 1 )
-	$(E) "[RUN]     Testing chttp2_hpack_encoder_test"
-	$(Q) $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test || ( echo test chttp2_hpack_encoder_test failed ; exit 1 )
-	$(E) "[RUN]     Testing chttp2_stream_map_test"
-	$(Q) $(BINDIR)/$(CONFIG)/chttp2_stream_map_test || ( echo test chttp2_stream_map_test failed ; exit 1 )
-	$(E) "[RUN]     Testing chttp2_varint_test"
-	$(Q) $(BINDIR)/$(CONFIG)/chttp2_varint_test || ( echo test chttp2_varint_test failed ; exit 1 )
-	$(E) "[RUN]     Testing combiner_test"
-	$(Q) $(BINDIR)/$(CONFIG)/combiner_test || ( echo test combiner_test failed ; exit 1 )
-	$(E) "[RUN]     Testing compression_test"
-	$(Q) $(BINDIR)/$(CONFIG)/compression_test || ( echo test compression_test failed ; exit 1 )
-	$(E) "[RUN]     Testing concurrent_connectivity_test"
-	$(Q) $(BINDIR)/$(CONFIG)/concurrent_connectivity_test || ( echo test concurrent_connectivity_test failed ; exit 1 )
-	$(E) "[RUN]     Testing connection_refused_test"
-	$(Q) $(BINDIR)/$(CONFIG)/connection_refused_test || ( echo test connection_refused_test failed ; exit 1 )
-	$(E) "[RUN]     Testing dns_resolver_connectivity_test"
-	$(Q) $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test || ( echo test dns_resolver_connectivity_test failed ; exit 1 )
-	$(E) "[RUN]     Testing dns_resolver_test"
-	$(Q) $(BINDIR)/$(CONFIG)/dns_resolver_test || ( echo test dns_resolver_test failed ; exit 1 )
-	$(E) "[RUN]     Testing dualstack_socket_test"
-	$(Q) $(BINDIR)/$(CONFIG)/dualstack_socket_test || ( echo test dualstack_socket_test failed ; exit 1 )
-	$(E) "[RUN]     Testing endpoint_pair_test"
-	$(Q) $(BINDIR)/$(CONFIG)/endpoint_pair_test || ( echo test endpoint_pair_test failed ; exit 1 )
-	$(E) "[RUN]     Testing error_test"
-	$(Q) $(BINDIR)/$(CONFIG)/error_test || ( echo test error_test failed ; exit 1 )
-	$(E) "[RUN]     Testing ev_epollsig_linux_test"
-	$(Q) $(BINDIR)/$(CONFIG)/ev_epollsig_linux_test || ( echo test ev_epollsig_linux_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fake_resolver_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fake_resolver_test || ( echo test fake_resolver_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fake_transport_security_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fake_transport_security_test || ( echo test fake_transport_security_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fd_conservation_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fd_conservation_posix_test || ( echo test fd_conservation_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fd_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fd_posix_test || ( echo test fd_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fling_stream_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fling_stream_test || ( echo test fling_stream_test failed ; exit 1 )
-	$(E) "[RUN]     Testing fling_test"
-	$(Q) $(BINDIR)/$(CONFIG)/fling_test || ( echo test fling_test failed ; exit 1 )
-	$(E) "[RUN]     Testing goaway_server_test"
-	$(Q) $(BINDIR)/$(CONFIG)/goaway_server_test || ( echo test goaway_server_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_avl_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_avl_test || ( echo test gpr_avl_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_cmdline_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_cmdline_test || ( echo test gpr_cmdline_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_cpu_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_cpu_test || ( echo test gpr_cpu_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_env_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_env_test || ( echo test gpr_env_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_host_port_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_host_port_test || ( echo test gpr_host_port_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_log_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_log_test || ( echo test gpr_log_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_manual_constructor_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test || ( echo test gpr_manual_constructor_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_mpscq_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_mpscq_test || ( echo test gpr_mpscq_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_spinlock_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_spinlock_test || ( echo test gpr_spinlock_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_string_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_string_test || ( echo test gpr_string_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_sync_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_sync_test || ( echo test gpr_sync_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_thd_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_thd_test || ( echo test gpr_thd_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_time_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_time_test || ( echo test gpr_time_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_tls_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_tls_test || ( echo test gpr_tls_test failed ; exit 1 )
-	$(E) "[RUN]     Testing gpr_useful_test"
-	$(Q) $(BINDIR)/$(CONFIG)/gpr_useful_test || ( echo test gpr_useful_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_auth_context_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_auth_context_test || ( echo test grpc_auth_context_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_b64_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_b64_test || ( echo test grpc_b64_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_byte_buffer_reader_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test || ( echo test grpc_byte_buffer_reader_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_channel_args_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_channel_args_test || ( echo test grpc_channel_args_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_channel_stack_builder_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test || ( echo test grpc_channel_stack_builder_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_channel_stack_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_channel_stack_test || ( echo test grpc_channel_stack_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_completion_queue_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_completion_queue_test || ( echo test grpc_completion_queue_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_completion_queue_threading_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test || ( echo test grpc_completion_queue_threading_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_credentials_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_credentials_test || ( echo test grpc_credentials_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_invalid_channel_args_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test || ( echo test grpc_invalid_channel_args_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_json_token_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_json_token_test || ( echo test grpc_json_token_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_jwt_verifier_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test || ( echo test grpc_jwt_verifier_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_security_connector_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_security_connector_test || ( echo test grpc_security_connector_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_ssl_credentials_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test || ( echo test grpc_ssl_credentials_test failed ; exit 1 )
-	$(E) "[RUN]     Testing handshake_client"
-	$(Q) $(BINDIR)/$(CONFIG)/handshake_client || ( echo test handshake_client failed ; exit 1 )
-	$(E) "[RUN]     Testing handshake_server"
-	$(Q) $(BINDIR)/$(CONFIG)/handshake_server || ( echo test handshake_server failed ; exit 1 )
-	$(E) "[RUN]     Testing handshake_server_with_readahead_handshaker"
-	$(Q) $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker || ( echo test handshake_server_with_readahead_handshaker failed ; exit 1 )
-	$(E) "[RUN]     Testing histogram_test"
-	$(Q) $(BINDIR)/$(CONFIG)/histogram_test || ( echo test histogram_test failed ; exit 1 )
-	$(E) "[RUN]     Testing hpack_parser_test"
-	$(Q) $(BINDIR)/$(CONFIG)/hpack_parser_test || ( echo test hpack_parser_test failed ; exit 1 )
-	$(E) "[RUN]     Testing hpack_table_test"
-	$(Q) $(BINDIR)/$(CONFIG)/hpack_table_test || ( echo test hpack_table_test failed ; exit 1 )
-	$(E) "[RUN]     Testing http_parser_test"
-	$(Q) $(BINDIR)/$(CONFIG)/http_parser_test || ( echo test http_parser_test failed ; exit 1 )
-	$(E) "[RUN]     Testing httpcli_format_request_test"
-	$(Q) $(BINDIR)/$(CONFIG)/httpcli_format_request_test || ( echo test httpcli_format_request_test failed ; exit 1 )
-	$(E) "[RUN]     Testing httpcli_test"
-	$(Q) $(BINDIR)/$(CONFIG)/httpcli_test || ( echo test httpcli_test failed ; exit 1 )
-	$(E) "[RUN]     Testing httpscli_test"
-	$(Q) $(BINDIR)/$(CONFIG)/httpscli_test || ( echo test httpscli_test failed ; exit 1 )
-	$(E) "[RUN]     Testing init_test"
-	$(Q) $(BINDIR)/$(CONFIG)/init_test || ( echo test init_test failed ; exit 1 )
-	$(E) "[RUN]     Testing invalid_call_argument_test"
-	$(Q) $(BINDIR)/$(CONFIG)/invalid_call_argument_test || ( echo test invalid_call_argument_test failed ; exit 1 )
-	$(E) "[RUN]     Testing json_rewrite_test"
-	$(Q) $(BINDIR)/$(CONFIG)/json_rewrite_test || ( echo test json_rewrite_test failed ; exit 1 )
-	$(E) "[RUN]     Testing json_stream_error_test"
-	$(Q) $(BINDIR)/$(CONFIG)/json_stream_error_test || ( echo test json_stream_error_test failed ; exit 1 )
-	$(E) "[RUN]     Testing json_test"
-	$(Q) $(BINDIR)/$(CONFIG)/json_test || ( echo test json_test failed ; exit 1 )
-	$(E) "[RUN]     Testing lame_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/lame_client_test || ( echo test lame_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing load_file_test"
-	$(Q) $(BINDIR)/$(CONFIG)/load_file_test || ( echo test load_file_test failed ; exit 1 )
-	$(E) "[RUN]     Testing memory_profile_test"
-	$(Q) $(BINDIR)/$(CONFIG)/memory_profile_test || ( echo test memory_profile_test failed ; exit 1 )
-	$(E) "[RUN]     Testing message_compress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/message_compress_test || ( echo test message_compress_test failed ; exit 1 )
-	$(E) "[RUN]     Testing minimal_stack_is_minimal_test"
-	$(Q) $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test || ( echo test minimal_stack_is_minimal_test failed ; exit 1 )
-	$(E) "[RUN]     Testing multiple_server_queues_test"
-	$(Q) $(BINDIR)/$(CONFIG)/multiple_server_queues_test || ( echo test multiple_server_queues_test failed ; exit 1 )
-	$(E) "[RUN]     Testing murmur_hash_test"
-	$(Q) $(BINDIR)/$(CONFIG)/murmur_hash_test || ( echo test murmur_hash_test failed ; exit 1 )
-	$(E) "[RUN]     Testing no_server_test"
-	$(Q) $(BINDIR)/$(CONFIG)/no_server_test || ( echo test no_server_test failed ; exit 1 )
-	$(E) "[RUN]     Testing num_external_connectivity_watchers_test"
-	$(Q) $(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test || ( echo test num_external_connectivity_watchers_test failed ; exit 1 )
-	$(E) "[RUN]     Testing parse_address_test"
-	$(Q) $(BINDIR)/$(CONFIG)/parse_address_test || ( echo test parse_address_test failed ; exit 1 )
-	$(E) "[RUN]     Testing percent_encoding_test"
-	$(Q) $(BINDIR)/$(CONFIG)/percent_encoding_test || ( echo test percent_encoding_test failed ; exit 1 )
-	$(E) "[RUN]     Testing pollset_set_test"
-	$(Q) $(BINDIR)/$(CONFIG)/pollset_set_test || ( echo test pollset_set_test failed ; exit 1 )
-	$(E) "[RUN]     Testing resolve_address_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/resolve_address_posix_test || ( echo test resolve_address_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing resolve_address_test"
-	$(Q) $(BINDIR)/$(CONFIG)/resolve_address_test || ( echo test resolve_address_test failed ; exit 1 )
-	$(E) "[RUN]     Testing resource_quota_test"
-	$(Q) $(BINDIR)/$(CONFIG)/resource_quota_test || ( echo test resource_quota_test failed ; exit 1 )
-	$(E) "[RUN]     Testing secure_channel_create_test"
-	$(Q) $(BINDIR)/$(CONFIG)/secure_channel_create_test || ( echo test secure_channel_create_test failed ; exit 1 )
-	$(E) "[RUN]     Testing secure_endpoint_test"
-	$(Q) $(BINDIR)/$(CONFIG)/secure_endpoint_test || ( echo test secure_endpoint_test failed ; exit 1 )
-	$(E) "[RUN]     Testing sequential_connectivity_test"
-	$(Q) $(BINDIR)/$(CONFIG)/sequential_connectivity_test || ( echo test sequential_connectivity_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_chttp2_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_chttp2_test || ( echo test server_chttp2_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_test || ( echo test server_test failed ; exit 1 )
-	$(E) "[RUN]     Testing slice_buffer_test"
-	$(Q) $(BINDIR)/$(CONFIG)/slice_buffer_test || ( echo test slice_buffer_test failed ; exit 1 )
-	$(E) "[RUN]     Testing slice_hash_table_test"
-	$(Q) $(BINDIR)/$(CONFIG)/slice_hash_table_test || ( echo test slice_hash_table_test failed ; exit 1 )
-	$(E) "[RUN]     Testing slice_string_helpers_test"
-	$(Q) $(BINDIR)/$(CONFIG)/slice_string_helpers_test || ( echo test slice_string_helpers_test failed ; exit 1 )
-	$(E) "[RUN]     Testing slice_test"
-	$(Q) $(BINDIR)/$(CONFIG)/slice_test || ( echo test slice_test failed ; exit 1 )
-	$(E) "[RUN]     Testing sockaddr_resolver_test"
-	$(Q) $(BINDIR)/$(CONFIG)/sockaddr_resolver_test || ( echo test sockaddr_resolver_test failed ; exit 1 )
-	$(E) "[RUN]     Testing sockaddr_utils_test"
-	$(Q) $(BINDIR)/$(CONFIG)/sockaddr_utils_test || ( echo test sockaddr_utils_test failed ; exit 1 )
-	$(E) "[RUN]     Testing socket_utils_test"
-	$(Q) $(BINDIR)/$(CONFIG)/socket_utils_test || ( echo test socket_utils_test failed ; exit 1 )
-	$(E) "[RUN]     Testing ssl_transport_security_test"
-	$(Q) $(BINDIR)/$(CONFIG)/ssl_transport_security_test || ( echo test ssl_transport_security_test failed ; exit 1 )
-	$(E) "[RUN]     Testing status_conversion_test"
-	$(Q) $(BINDIR)/$(CONFIG)/status_conversion_test || ( echo test status_conversion_test failed ; exit 1 )
-	$(E) "[RUN]     Testing stream_compression_test"
-	$(Q) $(BINDIR)/$(CONFIG)/stream_compression_test || ( echo test stream_compression_test failed ; exit 1 )
-	$(E) "[RUN]     Testing stream_owned_slice_test"
-	$(Q) $(BINDIR)/$(CONFIG)/stream_owned_slice_test || ( echo test stream_owned_slice_test failed ; exit 1 )
-	$(E) "[RUN]     Testing tcp_client_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/tcp_client_posix_test || ( echo test tcp_client_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing tcp_client_uv_test"
-	$(Q) $(BINDIR)/$(CONFIG)/tcp_client_uv_test || ( echo test tcp_client_uv_test failed ; exit 1 )
-	$(E) "[RUN]     Testing tcp_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/tcp_posix_test || ( echo test tcp_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing tcp_server_posix_test"
-	$(Q) $(BINDIR)/$(CONFIG)/tcp_server_posix_test || ( echo test tcp_server_posix_test failed ; exit 1 )
-	$(E) "[RUN]     Testing tcp_server_uv_test"
-	$(Q) $(BINDIR)/$(CONFIG)/tcp_server_uv_test || ( echo test tcp_server_uv_test failed ; exit 1 )
-	$(E) "[RUN]     Testing time_averaged_stats_test"
-	$(Q) $(BINDIR)/$(CONFIG)/time_averaged_stats_test || ( echo test time_averaged_stats_test failed ; exit 1 )
-	$(E) "[RUN]     Testing timeout_encoding_test"
-	$(Q) $(BINDIR)/$(CONFIG)/timeout_encoding_test || ( echo test timeout_encoding_test failed ; exit 1 )
-	$(E) "[RUN]     Testing timer_heap_test"
-	$(Q) $(BINDIR)/$(CONFIG)/timer_heap_test || ( echo test timer_heap_test failed ; exit 1 )
-	$(E) "[RUN]     Testing timer_list_test"
-	$(Q) $(BINDIR)/$(CONFIG)/timer_list_test || ( echo test timer_list_test failed ; exit 1 )
-	$(E) "[RUN]     Testing transport_connectivity_state_test"
-	$(Q) $(BINDIR)/$(CONFIG)/transport_connectivity_state_test || ( echo test transport_connectivity_state_test failed ; exit 1 )
-	$(E) "[RUN]     Testing transport_metadata_test"
-	$(Q) $(BINDIR)/$(CONFIG)/transport_metadata_test || ( echo test transport_metadata_test failed ; exit 1 )
-	$(E) "[RUN]     Testing transport_security_test"
-	$(Q) $(BINDIR)/$(CONFIG)/transport_security_test || ( echo test transport_security_test failed ; exit 1 )
-	$(E) "[RUN]     Testing udp_server_test"
-	$(Q) $(BINDIR)/$(CONFIG)/udp_server_test || ( echo test udp_server_test failed ; exit 1 )
-	$(E) "[RUN]     Testing uri_parser_test"
-	$(Q) $(BINDIR)/$(CONFIG)/uri_parser_test || ( echo test uri_parser_test failed ; exit 1 )
-	$(E) "[RUN]     Testing wakeup_fd_cv_test"
-	$(Q) $(BINDIR)/$(CONFIG)/wakeup_fd_cv_test || ( echo test wakeup_fd_cv_test failed ; exit 1 )
-	$(E) "[RUN]     Testing public_headers_must_be_c89"
-	$(Q) $(BINDIR)/$(CONFIG)/public_headers_must_be_c89 || ( echo test public_headers_must_be_c89 failed ; exit 1 )
-	$(E) "[RUN]     Testing badreq_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/badreq_bad_client_test || ( echo test badreq_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing connection_prefix_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test || ( echo test connection_prefix_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing duplicate_header_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/duplicate_header_bad_client_test || ( echo test duplicate_header_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing head_of_line_blocking_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/head_of_line_blocking_bad_client_test || ( echo test head_of_line_blocking_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing headers_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/headers_bad_client_test || ( echo test headers_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing initial_settings_frame_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test || ( echo test initial_settings_frame_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_registered_method_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_registered_method_bad_client_test || ( echo test server_registered_method_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing simple_request_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/simple_request_bad_client_test || ( echo test simple_request_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing unknown_frame_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test || ( echo test unknown_frame_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing window_overflow_bad_client_test"
-	$(Q) $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test || ( echo test window_overflow_bad_client_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bad_ssl_cert_test"
-	$(Q) $(BINDIR)/$(CONFIG)/bad_ssl_cert_test || ( echo test bad_ssl_cert_test failed ; exit 1 )
-
-
-flaky_test_c: buildtests_c
-
-
-test_cxx: buildtests_cxx
-	$(E) "[RUN]     Testing alarm_cpp_test"
-	$(Q) $(BINDIR)/$(CONFIG)/alarm_cpp_test || ( echo test alarm_cpp_test failed ; exit 1 )
-	$(E) "[RUN]     Testing async_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/async_end2end_test || ( echo test async_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing auth_property_iterator_test"
-	$(Q) $(BINDIR)/$(CONFIG)/auth_property_iterator_test || ( echo test auth_property_iterator_test failed ; exit 1 )
-	$(E) "[RUN]     Testing backoff_test"
-	$(Q) $(BINDIR)/$(CONFIG)/backoff_test || ( echo test backoff_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bdp_estimator_test"
-	$(Q) $(BINDIR)/$(CONFIG)/bdp_estimator_test || ( echo test bdp_estimator_test failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_arena"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_arena || ( echo test bm_arena failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_call_create"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_call_create || ( echo test bm_call_create failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_chttp2_hpack"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_chttp2_hpack || ( echo test bm_chttp2_hpack failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_chttp2_transport"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_chttp2_transport || ( echo test bm_chttp2_transport failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_closure"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_closure || ( echo test bm_closure failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_cq"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_cq || ( echo test bm_cq failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_cq_multiple_threads"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_cq_multiple_threads || ( echo test bm_cq_multiple_threads failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_error"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_error || ( echo test bm_error failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_fullstack_streaming_ping_pong"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong || ( echo test bm_fullstack_streaming_ping_pong failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_fullstack_streaming_pump"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump || ( echo test bm_fullstack_streaming_pump failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_fullstack_trickle"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_fullstack_trickle || ( echo test bm_fullstack_trickle failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_fullstack_unary_ping_pong"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong || ( echo test bm_fullstack_unary_ping_pong failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_metadata"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_metadata || ( echo test bm_metadata failed ; exit 1 )
-	$(E) "[RUN]     Testing bm_pollset"
-	$(Q) $(BINDIR)/$(CONFIG)/bm_pollset || ( echo test bm_pollset failed ; exit 1 )
-	$(E) "[RUN]     Testing channel_arguments_test"
-	$(Q) $(BINDIR)/$(CONFIG)/channel_arguments_test || ( echo test channel_arguments_test failed ; exit 1 )
-	$(E) "[RUN]     Testing channel_filter_test"
-	$(Q) $(BINDIR)/$(CONFIG)/channel_filter_test || ( echo test channel_filter_test failed ; exit 1 )
-	$(E) "[RUN]     Testing chttp2_settings_timeout_test"
-	$(Q) $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test || ( echo test chttp2_settings_timeout_test failed ; exit 1 )
-	$(E) "[RUN]     Testing cli_call_test"
-	$(Q) $(BINDIR)/$(CONFIG)/cli_call_test || ( echo test cli_call_test failed ; exit 1 )
-	$(E) "[RUN]     Testing client_channel_stress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/client_channel_stress_test || ( echo test client_channel_stress_test failed ; exit 1 )
-	$(E) "[RUN]     Testing client_crash_test"
-	$(Q) $(BINDIR)/$(CONFIG)/client_crash_test || ( echo test client_crash_test failed ; exit 1 )
-	$(E) "[RUN]     Testing client_lb_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/client_lb_end2end_test || ( echo test client_lb_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing codegen_test_full"
-	$(Q) $(BINDIR)/$(CONFIG)/codegen_test_full || ( echo test codegen_test_full failed ; exit 1 )
-	$(E) "[RUN]     Testing codegen_test_minimal"
-	$(Q) $(BINDIR)/$(CONFIG)/codegen_test_minimal || ( echo test codegen_test_minimal failed ; exit 1 )
-	$(E) "[RUN]     Testing credentials_test"
-	$(Q) $(BINDIR)/$(CONFIG)/credentials_test || ( echo test credentials_test failed ; exit 1 )
-	$(E) "[RUN]     Testing cxx_byte_buffer_test"
-	$(Q) $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test || ( echo test cxx_byte_buffer_test failed ; exit 1 )
-	$(E) "[RUN]     Testing cxx_slice_test"
-	$(Q) $(BINDIR)/$(CONFIG)/cxx_slice_test || ( echo test cxx_slice_test failed ; exit 1 )
-	$(E) "[RUN]     Testing cxx_string_ref_test"
-	$(Q) $(BINDIR)/$(CONFIG)/cxx_string_ref_test || ( echo test cxx_string_ref_test failed ; exit 1 )
-	$(E) "[RUN]     Testing cxx_time_test"
-	$(Q) $(BINDIR)/$(CONFIG)/cxx_time_test || ( echo test cxx_time_test failed ; exit 1 )
-	$(E) "[RUN]     Testing end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/end2end_test || ( echo test end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing error_details_test"
-	$(Q) $(BINDIR)/$(CONFIG)/error_details_test || ( echo test error_details_test failed ; exit 1 )
-	$(E) "[RUN]     Testing exception_test"
-	$(Q) $(BINDIR)/$(CONFIG)/exception_test || ( echo test exception_test failed ; exit 1 )
-	$(E) "[RUN]     Testing filter_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/filter_end2end_test || ( echo test filter_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing generic_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/generic_end2end_test || ( echo test generic_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing golden_file_test"
-	$(Q) $(BINDIR)/$(CONFIG)/golden_file_test || ( echo test golden_file_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpc_tool_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpc_tool_test || ( echo test grpc_tool_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpclb_api_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpclb_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpclb_end2end_test || ( echo test grpclb_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing grpclb_test"
-	$(Q) $(BINDIR)/$(CONFIG)/grpclb_test || ( echo test grpclb_test failed ; exit 1 )
-	$(E) "[RUN]     Testing h2_ssl_cert_test"
-	$(Q) $(BINDIR)/$(CONFIG)/h2_ssl_cert_test || ( echo test h2_ssl_cert_test failed ; exit 1 )
-	$(E) "[RUN]     Testing health_service_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/health_service_end2end_test || ( echo test health_service_end2end_test failed ; exit 1 )
-	$(E) "[RUN]     Testing inlined_vector_test"
-	$(Q) $(BINDIR)/$(CONFIG)/inlined_vector_test || ( echo test inlined_vector_test failed ; exit 1 )
-	$(E) "[RUN]     Testing inproc_sync_unary_ping_pong_test"
-	$(Q) $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test || ( echo test inproc_sync_unary_ping_pong_test failed ; exit 1 )
-	$(E) "[RUN]     Testing interop_test"
-	$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
-	$(E) "[RUN]     Testing memory_test"
-	$(Q) $(BINDIR)/$(CONFIG)/memory_test || ( echo test memory_test failed ; exit 1 )
-	$(E) "[RUN]     Testing mock_test"
-	$(Q) $(BINDIR)/$(CONFIG)/mock_test || ( echo test mock_test failed ; exit 1 )
-	$(E) "[RUN]     Testing noop-benchmark"
-	$(Q) $(BINDIR)/$(CONFIG)/noop-benchmark || ( echo test noop-benchmark failed ; exit 1 )
-	$(E) "[RUN]     Testing orphanable_test"
-	$(Q) $(BINDIR)/$(CONFIG)/orphanable_test || ( echo test orphanable_test failed ; exit 1 )
-	$(E) "[RUN]     Testing proto_server_reflection_test"
-	$(Q) $(BINDIR)/$(CONFIG)/proto_server_reflection_test || ( echo test proto_server_reflection_test failed ; exit 1 )
-	$(E) "[RUN]     Testing proto_utils_test"
-	$(Q) $(BINDIR)/$(CONFIG)/proto_utils_test || ( echo test proto_utils_test failed ; exit 1 )
-	$(E) "[RUN]     Testing qps_openloop_test"
-	$(Q) $(BINDIR)/$(CONFIG)/qps_openloop_test || ( echo test qps_openloop_test failed ; exit 1 )
-	$(E) "[RUN]     Testing ref_counted_ptr_test"
-	$(Q) $(BINDIR)/$(CONFIG)/ref_counted_ptr_test || ( echo test ref_counted_ptr_test failed ; exit 1 )
-	$(E) "[RUN]     Testing ref_counted_test"
-	$(Q) $(BINDIR)/$(CONFIG)/ref_counted_test || ( echo test ref_counted_test failed ; exit 1 )
-	$(E) "[RUN]     Testing secure_auth_context_test"
-	$(Q) $(BINDIR)/$(CONFIG)/secure_auth_context_test || ( echo test secure_auth_context_test failed ; exit 1 )
-	$(E) "[RUN]     Testing secure_sync_unary_ping_pong_test"
-	$(Q) $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test || ( echo test secure_sync_unary_ping_pong_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_builder_plugin_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_builder_plugin_test || ( echo test server_builder_plugin_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_builder_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_builder_test || ( echo test server_builder_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_context_test_spouse_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_context_test_spouse_test || ( echo test server_context_test_spouse_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_crash_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_crash_test || ( echo test server_crash_test failed ; exit 1 )
-	$(E) "[RUN]     Testing server_request_call_test"
-	$(Q) $(BINDIR)/$(CONFIG)/server_request_call_test || ( echo test server_request_call_test failed ; exit 1 )
-	$(E) "[RUN]     Testing shutdown_test"
-	$(Q) $(BINDIR)/$(CONFIG)/shutdown_test || ( echo test shutdown_test failed ; exit 1 )
-	$(E) "[RUN]     Testing stats_test"
-	$(Q) $(BINDIR)/$(CONFIG)/stats_test || ( echo test stats_test failed ; exit 1 )
-	$(E) "[RUN]     Testing status_test"
-	$(Q) $(BINDIR)/$(CONFIG)/status_test || ( echo test status_test failed ; exit 1 )
-	$(E) "[RUN]     Testing streaming_throughput_test"
-	$(Q) $(BINDIR)/$(CONFIG)/streaming_throughput_test || ( echo test streaming_throughput_test failed ; exit 1 )
-	$(E) "[RUN]     Testing thread_manager_test"
-	$(Q) $(BINDIR)/$(CONFIG)/thread_manager_test || ( echo test thread_manager_test failed ; exit 1 )
-	$(E) "[RUN]     Testing thread_stress_test"
-	$(Q) $(BINDIR)/$(CONFIG)/thread_stress_test || ( echo test thread_stress_test failed ; exit 1 )
-	$(E) "[RUN]     Testing transport_pid_controller_test"
-	$(Q) $(BINDIR)/$(CONFIG)/transport_pid_controller_test || ( echo test transport_pid_controller_test failed ; exit 1 )
-	$(E) "[RUN]     Testing writes_per_rpc_test"
-	$(Q) $(BINDIR)/$(CONFIG)/writes_per_rpc_test || ( echo test writes_per_rpc_test failed ; exit 1 )
-	$(E) "[RUN]     Testing resolver_component_tests_runner_invoker_unsecure"
-	$(Q) $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure || ( echo test resolver_component_tests_runner_invoker_unsecure failed ; exit 1 )
-	$(E) "[RUN]     Testing resolver_component_tests_runner_invoker"
-	$(Q) $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker || ( echo test resolver_component_tests_runner_invoker failed ; exit 1 )
-
-
-flaky_test_cxx: buildtests_cxx
-	$(E) "[RUN]     Testing hybrid_end2end_test"
-	$(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
-
-
-test_python: static_c
-	$(E) "[RUN]     Testing python code"
-	$(Q) tools/run_tests/run_tests.py -lpython -c$(CONFIG)
-
-
-tools: tools_c tools_cxx
-
-
-tools_c: privatelibs_c $(BINDIR)/$(CONFIG)/check_epollexclusive $(BINDIR)/$(CONFIG)/grpc_create_jwt $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token $(BINDIR)/$(CONFIG)/grpc_verify_jwt $(BINDIR)/$(CONFIG)/gen_hpack_tables $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables
-
-tools_cxx: privatelibs_cxx
-
-buildbenchmarks: privatelibs $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark
-
-benchmarks: buildbenchmarks
-
-strip: strip-static strip-shared
-
-strip-static: strip-static_c strip-static_cxx
-
-strip-shared: strip-shared_c strip-shared_cxx
-
-
-# TODO(nnoble): the strip target is stripping in-place, instead
-# of copying files in a temporary folder.
-# This prevents proper debugging after running make install.
-
-strip-static_c: static_c
-ifeq ($(CONFIG),opt)
-	$(E) "[STRIP]   Stripping libgpr.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[STRIP]   Stripping libgrpc.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[STRIP]   Stripping libgrpc_cronet.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
-	$(E) "[STRIP]   Stripping libgrpc_unsecure.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
-endif
-
-strip-static_cxx: static_cxx
-ifeq ($(CONFIG),opt)
-	$(E) "[STRIP]   Stripping libgrpc++.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++.a
-	$(E) "[STRIP]   Stripping libgrpc++_cronet.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a
-	$(E) "[STRIP]   Stripping libgrpc++_error_details.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
-	$(E) "[STRIP]   Stripping libgrpc++_reflection.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
-	$(E) "[STRIP]   Stripping libgrpc++_unsecure.a"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
-endif
-
-strip-shared_c: shared_c
-ifeq ($(CONFIG),opt)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-endif
-
-strip-shared_cxx: shared_cxx
-ifeq ($(CONFIG),opt)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-endif
-
-strip-shared_csharp: shared_csharp
-ifeq ($(CONFIG),opt)
-	$(E) "[STRIP]   Stripping $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)"
-	$(Q) $(STRIP) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)
-endif
-
-cache.mk::
-	$(E) "[MAKE]    Generating $@"
-	$(Q) echo "$(CACHE_MK)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPC_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPC_UNSECURE_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPCXX_PC_FILE)" | tr , '\n' >$@
-
-$(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc:
-	$(E) "[MAKE]    Generating $@"
-	$(Q) mkdir -p $(@D)
-	$(Q) echo "$(GRPCXX_UNSECURE_PC_FILE)" | tr , '\n' >$@
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/core/stats.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/core/stats.pb.cc: src/proto/grpc/core/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc: src/proto/grpc/core/stats.proto $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/health/v1/health.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/health/v1/health.pb.cc: src/proto/grpc/health/v1/health.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc: src/proto/grpc/health/v1/health.proto $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: src/proto/grpc/lb/v1/load_balancer.proto $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: src/proto/grpc/reflection/v1alpha/reflection.proto $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/status/status.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/status/status.pb.cc: src/proto/grpc/status/status.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc: src/proto/grpc/status/status.proto $(GENDIR)/src/proto/grpc/status/status.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: protoc_dep_error
-else
-
-
-$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: src/proto/grpc/testing/compiler_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: src/proto/grpc/testing/compiler_test.proto $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=generate_mock_code=true:$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/control.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/control.pb.cc: src/proto/grpc/testing/control.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: src/proto/grpc/testing/control.proto $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc: src/proto/grpc/testing/duplicate/echo_duplicate.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc: src/proto/grpc/testing/duplicate/echo_duplicate.proto $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/echo.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc: protoc_dep_error
-else
-
-
-$(GENDIR)/src/proto/grpc/testing/echo.pb.cc: src/proto/grpc/testing/echo.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc: src/proto/grpc/testing/echo.proto $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=generate_mock_code=true:$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: src/proto/grpc/testing/echo_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: src/proto/grpc/testing/echo_messages.proto $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: src/proto/grpc/testing/empty.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: src/proto/grpc/testing/empty.proto $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: src/proto/grpc/testing/messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: src/proto/grpc/testing/messages.proto $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: src/proto/grpc/testing/metrics.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: src/proto/grpc/testing/metrics.proto $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: src/proto/grpc/testing/payloads.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: src/proto/grpc/testing/payloads.proto $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/services.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/services.pb.cc: src/proto/grpc/testing/services.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc: src/proto/grpc/testing/services.proto $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/stats.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/stats.pb.cc: src/proto/grpc/testing/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/core/stats.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc: src/proto/grpc/testing/stats.proto $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-ifeq ($(NO_PROTOC),true)
-$(GENDIR)/src/proto/grpc/testing/test.pb.cc: protoc_dep_error
-$(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc: protoc_dep_error
-else
-
-$(GENDIR)/src/proto/grpc/testing/test.pb.cc: src/proto/grpc/testing/test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc
-	$(E) "[PROTOC]  Generating protobuf CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --cpp_out=$(GENDIR) $<
-
-$(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc: src/proto/grpc/testing/test.proto $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc
-	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(PROTOC) -Ithird_party/protobuf/src -I. --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(PROTOC_PLUGINS_DIR)/grpc_cpp_plugin$(EXECUTABLE_SUFFIX) $<
-endif
-
-
-ifeq ($(CONFIG),stapprof)
-src/core/profiling/stap_timers.c: $(GENDIR)/src/core/profiling/stap_probes.h
-ifeq ($(HAS_SYSTEMTAP),true)
-$(GENDIR)/src/core/profiling/stap_probes.h: src/core/profiling/stap_probes.d
-	$(E) "[DTRACE]  Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(DTRACE) -C -h -s $< -o $@
-else
-$(GENDIR)/src/core/profiling/stap_probes.h: systemtap_dep_error stop
-endif
-endif
-
-$(OBJDIR)/$(CONFIG)/%.o : %.c
-	$(E) "[C]       Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CC) $(CPPFLAGS) $(CFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/%.o : $(GENDIR)/%.pb.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/src/compiler/%.o : src/compiler/%.cc
-	$(E) "[HOSTCXX] Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_CXX) $(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/src/core/%.o : src/core/%.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COREFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/test/core/%.o : test/core/%.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COREFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-$(OBJDIR)/$(CONFIG)/%.o : %.cc
-	$(E) "[CXX]     Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-install: install_c install_cxx install-plugins install-certs
-
-install_c: install-headers_c install-static_c install-shared_c
-
-install_cxx: install-headers_cxx install-static_cxx install-shared_cxx
-
-install_csharp: install-shared_csharp install_c
-
-install_grpc_csharp_ext: install_csharp
-
-install-headers: install-headers_c install-headers_cxx
-
-install-headers_c:
-	$(E) "[INSTALL] Installing public C headers"
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
-install-headers_cxx:
-	$(E) "[INSTALL] Installing public C++ headers"
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
-install-static: install-static_c install-static_cxx
-
-install-static_c: static_c strip-static_c install-pkg-config_c
-	$(E) "[INSTALL] Installing libgpr.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgpr.a $(prefix)/lib/libgpr.a
-	$(E) "[INSTALL] Installing libgrpc.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc.a $(prefix)/lib/libgrpc.a
-	$(E) "[INSTALL] Installing libgrpc_cronet.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(prefix)/lib/libgrpc_cronet.a
-	$(E) "[INSTALL] Installing libgrpc_unsecure.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(prefix)/lib/libgrpc_unsecure.a
-
-install-static_cxx: static_cxx strip-static_cxx install-pkg-config_cxx
-	$(E) "[INSTALL] Installing libgrpc++.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(prefix)/lib/libgrpc++.a
-	$(E) "[INSTALL] Installing libgrpc++_cronet.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a $(prefix)/lib/libgrpc++_cronet.a
-	$(E) "[INSTALL] Installing libgrpc++_error_details.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(prefix)/lib/libgrpc++_error_details.a
-	$(E) "[INSTALL] Installing libgrpc++_reflection.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(prefix)/lib/libgrpc++_reflection.a
-	$(E) "[INSTALL] Installing libgrpc++_unsecure.a"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(prefix)/lib/libgrpc++_unsecure.a
-
-
-
-install-shared_c: shared_c strip-shared_c install-pkg-config_c
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgpr.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_cronet.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/$(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_unsecure.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so
-endif
-ifneq ($(SYSTEM),MINGW32)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ldconfig || true
-endif
-endif
-
-
-install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_cronet.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_error_details.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_reflection.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so
-endif
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_unsecure.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so
-endif
-ifneq ($(SYSTEM),MINGW32)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ldconfig || true
-endif
-endif
-
-
-install-shared_csharp: shared_csharp strip-shared_csharp
-	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)"
-	$(Q) $(INSTALL) -d $(prefix)/lib
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP)
-ifeq ($(SYSTEM),MINGW32)
-	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a $(prefix)/lib/libgrpc_csharp_ext.a
-else ifneq ($(SYSTEM),Darwin)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so
-endif
-ifneq ($(SYSTEM),MINGW32)
-ifneq ($(SYSTEM),Darwin)
-	$(Q) ldconfig || true
-endif
-endif
-
-
-install-plugins: $(PROTOC_PLUGINS)
-	$(E) "[INSTALL] Installing grpc protoc plugins"
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_cpp_plugin $(prefix)/bin/grpc_cpp_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_csharp_plugin $(prefix)/bin/grpc_csharp_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_node_plugin $(prefix)/bin/grpc_node_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin $(prefix)/bin/grpc_objective_c_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_php_plugin $(prefix)/bin/grpc_php_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_python_plugin $(prefix)/bin/grpc_python_plugin
-	$(Q) $(INSTALL) -d $(prefix)/bin
-	$(Q) $(INSTALL) $(BINDIR)/$(CONFIG)/grpc_ruby_plugin $(prefix)/bin/grpc_ruby_plugin
-
-install-pkg-config_c: pc_c pc_c_unsecure
-	$(E) "[INSTALL] Installing C pkg-config files"
-	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
-	$(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(prefix)/lib/pkgconfig/grpc.pc
-	$(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(prefix)/lib/pkgconfig/grpc_unsecure.pc
-
-install-pkg-config_cxx: pc_cxx pc_cxx_unsecure
-	$(E) "[INSTALL] Installing C++ pkg-config files"
-	$(Q) $(INSTALL) -d $(prefix)/lib/pkgconfig
-	$(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++.pc $(prefix)/lib/pkgconfig/grpc++.pc
-	$(Q) $(INSTALL) -m 0644 $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc $(prefix)/lib/pkgconfig/grpc++_unsecure.pc
-
-install-certs: etc/roots.pem
-	$(E) "[INSTALL] Installing root certificates"
-	$(Q) $(INSTALL) -d $(prefix)/share/grpc
-	$(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem
-
-clean:
-	$(E) "[CLEAN]   Cleaning build directories."
-	$(Q) $(RM) -rf $(OBJDIR) $(LIBDIR) $(BINDIR) $(GENDIR) cache.mk
-
-
-# The various libraries
-
-
-LIBGPR_SRC = \
-    src/core/lib/gpr/alloc.cc \
-    src/core/lib/gpr/arena.cc \
-    src/core/lib/gpr/atm.cc \
-    src/core/lib/gpr/avl.cc \
-    src/core/lib/gpr/cmdline.cc \
-    src/core/lib/gpr/cpu_iphone.cc \
-    src/core/lib/gpr/cpu_linux.cc \
-    src/core/lib/gpr/cpu_posix.cc \
-    src/core/lib/gpr/cpu_windows.cc \
-    src/core/lib/gpr/env_linux.cc \
-    src/core/lib/gpr/env_posix.cc \
-    src/core/lib/gpr/env_windows.cc \
-    src/core/lib/gpr/fork.cc \
-    src/core/lib/gpr/host_port.cc \
-    src/core/lib/gpr/log.cc \
-    src/core/lib/gpr/log_android.cc \
-    src/core/lib/gpr/log_linux.cc \
-    src/core/lib/gpr/log_posix.cc \
-    src/core/lib/gpr/log_windows.cc \
-    src/core/lib/gpr/mpscq.cc \
-    src/core/lib/gpr/murmur_hash.cc \
-    src/core/lib/gpr/string.cc \
-    src/core/lib/gpr/string_posix.cc \
-    src/core/lib/gpr/string_util_windows.cc \
-    src/core/lib/gpr/string_windows.cc \
-    src/core/lib/gpr/subprocess_posix.cc \
-    src/core/lib/gpr/subprocess_windows.cc \
-    src/core/lib/gpr/sync.cc \
-    src/core/lib/gpr/sync_posix.cc \
-    src/core/lib/gpr/sync_windows.cc \
-    src/core/lib/gpr/thd.cc \
-    src/core/lib/gpr/thd_posix.cc \
-    src/core/lib/gpr/thd_windows.cc \
-    src/core/lib/gpr/time.cc \
-    src/core/lib/gpr/time_posix.cc \
-    src/core/lib/gpr/time_precise.cc \
-    src/core/lib/gpr/time_windows.cc \
-    src/core/lib/gpr/tls_pthread.cc \
-    src/core/lib/gpr/tmpfile_msys.cc \
-    src/core/lib/gpr/tmpfile_posix.cc \
-    src/core/lib/gpr/tmpfile_windows.cc \
-    src/core/lib/gpr/wrap_memcpy.cc \
-    src/core/lib/profiling/basic_timers.cc \
-    src/core/lib/profiling/stap_timers.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/avl.h \
-    include/grpc/support/cmdline.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/host_port.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/subprocess.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd.h \
-    include/grpc/support/time.h \
-    include/grpc/support/tls.h \
-    include/grpc/support/tls_gcc.h \
-    include/grpc/support/tls_msvc.h \
-    include/grpc/support/tls_pthread.h \
-    include/grpc/support/useful.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-
-LIBGPR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_SRC))))
-
-
-$(LIBDIR)/$(CONFIG)/libgpr.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBGPR_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBGPR_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgpr.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS)  $(ZLIB_DEP) $(CARES_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-$(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OBJS)  $(ZLIB_DEP) $(CARES_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.5 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.5
-	$(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
-endif
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGPR_OBJS:.o=.dep)
-endif
-
-
-LIBGPR_TEST_UTIL_SRC = \
-    test/core/util/test_config.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBGPR_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGPR_TEST_UTIL_SRC))))
-
-
-$(LIBDIR)/$(CONFIG)/libgpr_test_util.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBGPR_TEST_UTIL_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgpr_test_util.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBGPR_TEST_UTIL_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgpr_test_util.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGPR_TEST_UTIL_OBJS:.o=.dep)
-endif
-
-
-LIBGRPC_SRC = \
-    src/core/lib/surface/init.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-    src/core/lib/http/httpcli_security_connector.cc \
-    src/core/lib/security/context/security_context.cc \
-    src/core/lib/security/credentials/composite/composite_credentials.cc \
-    src/core/lib/security/credentials/credentials.cc \
-    src/core/lib/security/credentials/credentials_metadata.cc \
-    src/core/lib/security/credentials/fake/fake_credentials.cc \
-    src/core/lib/security/credentials/google_default/credentials_generic.cc \
-    src/core/lib/security/credentials/google_default/google_default_credentials.cc \
-    src/core/lib/security/credentials/iam/iam_credentials.cc \
-    src/core/lib/security/credentials/jwt/json_token.cc \
-    src/core/lib/security/credentials/jwt/jwt_credentials.cc \
-    src/core/lib/security/credentials/jwt/jwt_verifier.cc \
-    src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
-    src/core/lib/security/credentials/plugin/plugin_credentials.cc \
-    src/core/lib/security/credentials/ssl/ssl_credentials.cc \
-    src/core/lib/security/transport/client_auth_filter.cc \
-    src/core/lib/security/transport/lb_targets_info.cc \
-    src/core/lib/security/transport/secure_endpoint.cc \
-    src/core/lib/security/transport/security_connector.cc \
-    src/core/lib/security/transport/security_handshaker.cc \
-    src/core/lib/security/transport/server_auth_filter.cc \
-    src/core/lib/security/transport/tsi_error.cc \
-    src/core/lib/security/util/json_util.cc \
-    src/core/lib/surface/init_secure.cc \
-    src/core/tsi/fake_transport_security.cc \
-    src/core/tsi/gts_transport_security.cc \
-    src/core/tsi/ssl_transport_security.cc \
-    src/core/tsi/transport_security_grpc.cc \
-    src/core/tsi/transport_security.cc \
-    src/core/tsi/transport_security_adapter.cc \
-    src/core/ext/transport/chttp2/server/chttp2_server.cc \
-    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
-    src/core/ext/transport/inproc/inproc_plugin.cc \
-    src/core/ext/transport/inproc/inproc_transport.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
-    third_party/nanopb/pb_common.c \
-    third_party/nanopb/pb_decode.c \
-    third_party/nanopb/pb_encode.c \
-    src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-    src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
-    src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc \
-    src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
-    src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
-    src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_filter.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc \
-    src/core/ext/census/grpc_context.cc \
-    src/core/ext/filters/max_age/max_age_filter.cc \
-    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
-    src/core/ext/filters/workarounds/workaround_utils.cc \
-    src/core/plugin_registry/grpc_plugin_registry.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/grpc_security.h \
-    include/grpc/byte_buffer.h \
-    include/grpc/byte_buffer_reader.h \
-    include/grpc/compression.h \
-    include/grpc/fork.h \
-    include/grpc/grpc.h \
-    include/grpc/grpc_posix.h \
-    include/grpc/grpc_security_constants.h \
-    include/grpc/load_reporting.h \
-    include/grpc/slice.h \
-    include/grpc/slice_buffer.h \
-    include/grpc/status.h \
-    include/grpc/support/workaround_list.h \
-    include/grpc/census.h \
-
-LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBGRPC_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-$(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.5 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
-endif
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC_CRONET_SRC = \
-    src/core/lib/surface/init.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc \
-    src/core/ext/transport/cronet/transport/cronet_api_dummy.cc \
-    src/core/ext/transport/cronet/transport/cronet_transport.cc \
-    src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/lib/http/httpcli_security_connector.cc \
-    src/core/lib/security/context/security_context.cc \
-    src/core/lib/security/credentials/composite/composite_credentials.cc \
-    src/core/lib/security/credentials/credentials.cc \
-    src/core/lib/security/credentials/credentials_metadata.cc \
-    src/core/lib/security/credentials/fake/fake_credentials.cc \
-    src/core/lib/security/credentials/google_default/credentials_generic.cc \
-    src/core/lib/security/credentials/google_default/google_default_credentials.cc \
-    src/core/lib/security/credentials/iam/iam_credentials.cc \
-    src/core/lib/security/credentials/jwt/json_token.cc \
-    src/core/lib/security/credentials/jwt/jwt_credentials.cc \
-    src/core/lib/security/credentials/jwt/jwt_verifier.cc \
-    src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
-    src/core/lib/security/credentials/plugin/plugin_credentials.cc \
-    src/core/lib/security/credentials/ssl/ssl_credentials.cc \
-    src/core/lib/security/transport/client_auth_filter.cc \
-    src/core/lib/security/transport/lb_targets_info.cc \
-    src/core/lib/security/transport/secure_endpoint.cc \
-    src/core/lib/security/transport/security_connector.cc \
-    src/core/lib/security/transport/security_handshaker.cc \
-    src/core/lib/security/transport/server_auth_filter.cc \
-    src/core/lib/security/transport/tsi_error.cc \
-    src/core/lib/security/util/json_util.cc \
-    src/core/lib/surface/init_secure.cc \
-    src/core/tsi/fake_transport_security.cc \
-    src/core/tsi/gts_transport_security.cc \
-    src/core/tsi/ssl_transport_security.cc \
-    src/core/tsi/transport_security_grpc.cc \
-    src/core/tsi/transport_security.cc \
-    src/core/tsi/transport_security_adapter.cc \
-    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_filter.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc \
-    src/core/plugin_registry/grpc_cronet_plugin_registry.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/grpc_cronet.h \
-    include/grpc/grpc_security.h \
-    include/grpc/grpc_security_constants.h \
-
-LIBGRPC_CRONET_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_CRONET_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): openssl_dep_error
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a $(LIBGRPC_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cronet.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-$(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_CRONET_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.5 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so
-endif
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_CRONET_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC_TEST_UTIL_SRC = \
-    test/core/end2end/data/client_certs.cc \
-    test/core/end2end/data/server1_cert.cc \
-    test/core/end2end/data/server1_key.cc \
-    test/core/end2end/data/test_root_cert.cc \
-    test/core/security/oauth2_utils.cc \
-    src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-    test/core/end2end/cq_verifier.cc \
-    test/core/end2end/fixtures/http_proxy_fixture.cc \
-    test/core/end2end/fixtures/proxy.cc \
-    test/core/iomgr/endpoint_tests.cc \
-    test/core/util/debugger_macros.cc \
-    test/core/util/grpc_profiler.cc \
-    test/core/util/histogram.cc \
-    test/core/util/memory_counters.cc \
-    test/core/util/mock_endpoint.cc \
-    test/core/util/parse_hexstring.cc \
-    test/core/util/passthru_endpoint.cc \
-    test/core/util/port.cc \
-    test/core/util/port_isolated_runtime_environment.cc \
-    test/core/util/port_server_client.cc \
-    test/core/util/slice_splitter.cc \
-    test/core/util/tracer_util.cc \
-    test/core/util/trickle_endpoint.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-
-LIBGRPC_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBGRPC_TEST_UTIL_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBGRPC_TEST_UTIL_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_TEST_UTIL_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
-    src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-    test/core/end2end/cq_verifier.cc \
-    test/core/end2end/fixtures/http_proxy_fixture.cc \
-    test/core/end2end/fixtures/proxy.cc \
-    test/core/iomgr/endpoint_tests.cc \
-    test/core/util/debugger_macros.cc \
-    test/core/util/grpc_profiler.cc \
-    test/core/util/histogram.cc \
-    test/core/util/memory_counters.cc \
-    test/core/util/mock_endpoint.cc \
-    test/core/util/parse_hexstring.cc \
-    test/core/util/passthru_endpoint.cc \
-    test/core/util/port.cc \
-    test/core/util/port_isolated_runtime_environment.cc \
-    test/core/util/port_server_client.cc \
-    test/core/util/slice_splitter.cc \
-    test/core/util/tracer_util.cc \
-    test/core/util/trickle_endpoint.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-
-LIBGRPC_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_TEST_UTIL_UNSECURE_SRC))))
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
-endif
-
-
-LIBGRPC_UNSECURE_SRC = \
-    src/core/lib/surface/init.cc \
-    src/core/lib/surface/init_unsecure.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-    src/core/ext/transport/chttp2/server/chttp2_server.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
-    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/inproc/inproc_plugin.cc \
-    src/core/ext/transport/inproc/inproc_transport.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
-    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
-    src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
-    src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
-    src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_filter.cc \
-    src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
-    src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
-    third_party/nanopb/pb_common.c \
-    third_party/nanopb/pb_decode.c \
-    third_party/nanopb/pb_encode.c \
-    src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
-    src/core/ext/filters/client_channel/lb_policy/subchannel_list.cc \
-    src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
-    src/core/ext/census/grpc_context.cc \
-    src/core/ext/filters/max_age/max_age_filter.cc \
-    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
-    src/core/ext/filters/workarounds/workaround_utils.cc \
-    src/core/plugin_registry/grpc_unsecure_plugin_registry.cc \
-
-PUBLIC_HEADERS_C += \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/byte_buffer.h \
-    include/grpc/byte_buffer_reader.h \
-    include/grpc/compression.h \
-    include/grpc/fork.h \
-    include/grpc/grpc.h \
-    include/grpc/grpc_posix.h \
-    include/grpc/grpc_security_constants.h \
-    include/grpc/load_reporting.h \
-    include/grpc/slice.h \
-    include/grpc/slice_buffer.h \
-    include/grpc/status.h \
-    include/grpc/support/workaround_list.h \
-    include/grpc/census.h \
-
-LIBGRPC_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_UNSECURE_SRC))))
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBGRPC_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-$(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_UNSECURE_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-	$(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.5 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.5
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
-endif
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_UNSECURE_OBJS:.o=.dep)
-endif
-
-
-LIBRECONNECT_SERVER_SRC = \
-    test/core/util/reconnect_server.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBRECONNECT_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBRECONNECT_SERVER_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libreconnect_server.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libreconnect_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBRECONNECT_SERVER_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libreconnect_server.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBRECONNECT_SERVER_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libreconnect_server.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBRECONNECT_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBTEST_TCP_SERVER_SRC = \
-    test/core/util/test_tcp_server.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBTEST_TCP_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBTEST_TCP_SERVER_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libtest_tcp_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBTEST_TCP_SERVER_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBTEST_TCP_SERVER_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBTEST_TCP_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC++_SRC = \
-    src/cpp/client/insecure_credentials.cc \
-    src/cpp/client/secure_credentials.cc \
-    src/cpp/common/auth_property_iterator.cc \
-    src/cpp/common/secure_auth_context.cc \
-    src/cpp/common/secure_channel_arguments.cc \
-    src/cpp/common/secure_create_auth_context.cc \
-    src/cpp/server/insecure_server_credentials.cc \
-    src/cpp/server/secure_server_credentials.cc \
-    src/cpp/client/channel_cc.cc \
-    src/cpp/client/client_context.cc \
-    src/cpp/client/create_channel.cc \
-    src/cpp/client/create_channel_internal.cc \
-    src/cpp/client/create_channel_posix.cc \
-    src/cpp/client/credentials_cc.cc \
-    src/cpp/client/generic_stub.cc \
-    src/cpp/common/channel_arguments.cc \
-    src/cpp/common/channel_filter.cc \
-    src/cpp/common/completion_queue_cc.cc \
-    src/cpp/common/core_codegen.cc \
-    src/cpp/common/resource_quota_cc.cc \
-    src/cpp/common/rpc_method.cc \
-    src/cpp/common/version_cc.cc \
-    src/cpp/server/async_generic_service.cc \
-    src/cpp/server/channel_argument_option.cc \
-    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health/default_health_check_service.cc \
-    src/cpp/server/health/health.pb.c \
-    src/cpp/server/health/health_check_service.cc \
-    src/cpp/server/health/health_check_service_server_builder_option.cc \
-    src/cpp/server/server_builder.cc \
-    src/cpp/server/server_cc.cc \
-    src/cpp/server/server_context.cc \
-    src/cpp/server/server_credentials.cc \
-    src/cpp/server/server_posix.cc \
-    src/cpp/thread_manager/thread_manager.cc \
-    src/cpp/util/byte_buffer_cc.cc \
-    src/cpp/util/slice_cc.cc \
-    src/cpp/util/status.cc \
-    src/cpp/util/string_ref.cc \
-    src/cpp/util/time_cc.cc \
-    src/cpp/codegen/codegen_init.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/alarm.h \
-    include/grpc++/channel.h \
-    include/grpc++/client_context.h \
-    include/grpc++/completion_queue.h \
-    include/grpc++/create_channel.h \
-    include/grpc++/create_channel_posix.h \
-    include/grpc++/ext/health_check_service_server_builder_option.h \
-    include/grpc++/generic/async_generic_service.h \
-    include/grpc++/generic/generic_stub.h \
-    include/grpc++/grpc++.h \
-    include/grpc++/health_check_service_interface.h \
-    include/grpc++/impl/call.h \
-    include/grpc++/impl/channel_argument_option.h \
-    include/grpc++/impl/client_unary_call.h \
-    include/grpc++/impl/codegen/core_codegen.h \
-    include/grpc++/impl/grpc_library.h \
-    include/grpc++/impl/method_handler_impl.h \
-    include/grpc++/impl/rpc_method.h \
-    include/grpc++/impl/rpc_service_method.h \
-    include/grpc++/impl/serialization_traits.h \
-    include/grpc++/impl/server_builder_option.h \
-    include/grpc++/impl/server_builder_plugin.h \
-    include/grpc++/impl/server_initializer.h \
-    include/grpc++/impl/service_type.h \
-    include/grpc++/resource_quota.h \
-    include/grpc++/security/auth_context.h \
-    include/grpc++/security/auth_metadata_processor.h \
-    include/grpc++/security/credentials.h \
-    include/grpc++/security/server_credentials.h \
-    include/grpc++/server.h \
-    include/grpc++/server_builder.h \
-    include/grpc++/server_context.h \
-    include/grpc++/server_posix.h \
-    include/grpc++/support/async_stream.h \
-    include/grpc++/support/async_unary_call.h \
-    include/grpc++/support/byte_buffer.h \
-    include/grpc++/support/channel_arguments.h \
-    include/grpc++/support/config.h \
-    include/grpc++/support/slice.h \
-    include/grpc++/support/status.h \
-    include/grpc++/support/status_code_enum.h \
-    include/grpc++/support/string_ref.h \
-    include/grpc++/support/stub_options.h \
-    include/grpc++/support/sync_stream.h \
-    include/grpc++/support/time.h \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/avl.h \
-    include/grpc/support/cmdline.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/host_port.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/subprocess.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd.h \
-    include/grpc/support/time.h \
-    include/grpc/support/tls.h \
-    include/grpc/support/tls_gcc.h \
-    include/grpc/support/tls_msvc.h \
-    include/grpc/support/tls_pthread.h \
-    include/grpc/support/useful.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/byte_buffer.h \
-    include/grpc/byte_buffer_reader.h \
-    include/grpc/compression.h \
-    include/grpc/fork.h \
-    include/grpc/grpc.h \
-    include/grpc/grpc_posix.h \
-    include/grpc/grpc_security_constants.h \
-    include/grpc/load_reporting.h \
-    include/grpc/slice.h \
-    include/grpc/slice_buffer.h \
-    include/grpc/status.h \
-    include/grpc/support/workaround_list.h \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc++/impl/codegen/async_stream.h \
-    include/grpc++/impl/codegen/async_unary_call.h \
-    include/grpc++/impl/codegen/byte_buffer.h \
-    include/grpc++/impl/codegen/call.h \
-    include/grpc++/impl/codegen/call_hook.h \
-    include/grpc++/impl/codegen/channel_interface.h \
-    include/grpc++/impl/codegen/client_context.h \
-    include/grpc++/impl/codegen/client_unary_call.h \
-    include/grpc++/impl/codegen/completion_queue.h \
-    include/grpc++/impl/codegen/completion_queue_tag.h \
-    include/grpc++/impl/codegen/config.h \
-    include/grpc++/impl/codegen/core_codegen_interface.h \
-    include/grpc++/impl/codegen/create_auth_context.h \
-    include/grpc++/impl/codegen/grpc_library.h \
-    include/grpc++/impl/codegen/metadata_map.h \
-    include/grpc++/impl/codegen/method_handler_impl.h \
-    include/grpc++/impl/codegen/rpc_method.h \
-    include/grpc++/impl/codegen/rpc_service_method.h \
-    include/grpc++/impl/codegen/security/auth_context.h \
-    include/grpc++/impl/codegen/serialization_traits.h \
-    include/grpc++/impl/codegen/server_context.h \
-    include/grpc++/impl/codegen/server_interface.h \
-    include/grpc++/impl/codegen/service_type.h \
-    include/grpc++/impl/codegen/slice.h \
-    include/grpc++/impl/codegen/status.h \
-    include/grpc++/impl/codegen/status_code_enum.h \
-    include/grpc++/impl/codegen/string_ref.h \
-    include/grpc++/impl/codegen/stub_options.h \
-    include/grpc++/impl/codegen/sync_stream.h \
-    include/grpc++/impl/codegen/time.h \
-    include/grpc++/impl/codegen/proto_utils.h \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++.a: protobuf_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBGRPC++_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc$(SHARED_VERSION_CORE)-dll -lgpr$(SHARED_VERSION_CORE)-dll
-else
-$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr
-else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc -lgpr
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP).so
-endif
-endif
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC++_CORE_STATS_SRC = \
-    $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc \
-    src/cpp/util/core_stats.cc \
-
-PUBLIC_HEADERS_CXX += \
-    src/cpp/util/core_stats.h \
-
-LIBGRPC++_CORE_STATS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_CORE_STATS_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CORE_STATS_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBGRPC++_CORE_STATS_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_CORE_STATS_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/src/cpp/util/core_stats.o: $(GENDIR)/src/proto/grpc/core/stats.pb.cc $(GENDIR)/src/proto/grpc/core/stats.grpc.pb.cc
-
-
-LIBGRPC++_CRONET_SRC = \
-    src/cpp/client/cronet_credentials.cc \
-    src/cpp/client/insecure_credentials.cc \
-    src/cpp/common/insecure_create_auth_context.cc \
-    src/cpp/server/insecure_server_credentials.cc \
-    src/cpp/client/channel_cc.cc \
-    src/cpp/client/client_context.cc \
-    src/cpp/client/create_channel.cc \
-    src/cpp/client/create_channel_internal.cc \
-    src/cpp/client/create_channel_posix.cc \
-    src/cpp/client/credentials_cc.cc \
-    src/cpp/client/generic_stub.cc \
-    src/cpp/common/channel_arguments.cc \
-    src/cpp/common/channel_filter.cc \
-    src/cpp/common/completion_queue_cc.cc \
-    src/cpp/common/core_codegen.cc \
-    src/cpp/common/resource_quota_cc.cc \
-    src/cpp/common/rpc_method.cc \
-    src/cpp/common/version_cc.cc \
-    src/cpp/server/async_generic_service.cc \
-    src/cpp/server/channel_argument_option.cc \
-    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health/default_health_check_service.cc \
-    src/cpp/server/health/health.pb.c \
-    src/cpp/server/health/health_check_service.cc \
-    src/cpp/server/health/health_check_service_server_builder_option.cc \
-    src/cpp/server/server_builder.cc \
-    src/cpp/server/server_cc.cc \
-    src/cpp/server/server_context.cc \
-    src/cpp/server/server_credentials.cc \
-    src/cpp/server/server_posix.cc \
-    src/cpp/thread_manager/thread_manager.cc \
-    src/cpp/util/byte_buffer_cc.cc \
-    src/cpp/util/slice_cc.cc \
-    src/cpp/util/status.cc \
-    src/cpp/util/string_ref.cc \
-    src/cpp/util/time_cc.cc \
-    src/cpp/codegen/codegen_init.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
-    src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
-    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
-    src/core/ext/transport/chttp2/transport/bin_decoder.cc \
-    src/core/ext/transport/chttp2/transport/bin_encoder.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
-    src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
-    src/core/ext/transport/chttp2/transport/flow_control.cc \
-    src/core/ext/transport/chttp2/transport/frame_data.cc \
-    src/core/ext/transport/chttp2/transport/frame_goaway.cc \
-    src/core/ext/transport/chttp2/transport/frame_ping.cc \
-    src/core/ext/transport/chttp2/transport/frame_rst_stream.cc \
-    src/core/ext/transport/chttp2/transport/frame_settings.cc \
-    src/core/ext/transport/chttp2/transport/frame_window_update.cc \
-    src/core/ext/transport/chttp2/transport/hpack_encoder.cc \
-    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
-    src/core/ext/transport/chttp2/transport/hpack_table.cc \
-    src/core/ext/transport/chttp2/transport/http2_settings.cc \
-    src/core/ext/transport/chttp2/transport/huffsyms.cc \
-    src/core/ext/transport/chttp2/transport/incoming_metadata.cc \
-    src/core/ext/transport/chttp2/transport/parsing.cc \
-    src/core/ext/transport/chttp2/transport/stream_lists.cc \
-    src/core/ext/transport/chttp2/transport/stream_map.cc \
-    src/core/ext/transport/chttp2/transport/varint.cc \
-    src/core/ext/transport/chttp2/transport/writing.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/channel/channel_args.cc \
-    src/core/lib/channel/channel_stack.cc \
-    src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/connected_channel.cc \
-    src/core/lib/channel/handshaker.cc \
-    src/core/lib/channel/handshaker_factory.cc \
-    src/core/lib/channel/handshaker_registry.cc \
-    src/core/lib/compression/compression.cc \
-    src/core/lib/compression/message_compress.cc \
-    src/core/lib/compression/stream_compression.cc \
-    src/core/lib/compression/stream_compression_gzip.cc \
-    src/core/lib/compression/stream_compression_identity.cc \
-    src/core/lib/debug/stats.cc \
-    src/core/lib/debug/stats_data.cc \
-    src/core/lib/http/format_request.cc \
-    src/core/lib/http/httpcli.cc \
-    src/core/lib/http/parser.cc \
-    src/core/lib/iomgr/call_combiner.cc \
-    src/core/lib/iomgr/combiner.cc \
-    src/core/lib/iomgr/endpoint.cc \
-    src/core/lib/iomgr/endpoint_pair_posix.cc \
-    src/core/lib/iomgr/endpoint_pair_uv.cc \
-    src/core/lib/iomgr/endpoint_pair_windows.cc \
-    src/core/lib/iomgr/error.cc \
-    src/core/lib/iomgr/ev_epoll1_linux.cc \
-    src/core/lib/iomgr/ev_epollex_linux.cc \
-    src/core/lib/iomgr/ev_epollsig_linux.cc \
-    src/core/lib/iomgr/ev_poll_posix.cc \
-    src/core/lib/iomgr/ev_posix.cc \
-    src/core/lib/iomgr/ev_windows.cc \
-    src/core/lib/iomgr/exec_ctx.cc \
-    src/core/lib/iomgr/executor.cc \
-    src/core/lib/iomgr/fork_posix.cc \
-    src/core/lib/iomgr/fork_windows.cc \
-    src/core/lib/iomgr/gethostname_fallback.cc \
-    src/core/lib/iomgr/gethostname_host_name_max.cc \
-    src/core/lib/iomgr/gethostname_sysconf.cc \
-    src/core/lib/iomgr/iocp_windows.cc \
-    src/core/lib/iomgr/iomgr.cc \
-    src/core/lib/iomgr/iomgr_posix.cc \
-    src/core/lib/iomgr/iomgr_uv.cc \
-    src/core/lib/iomgr/iomgr_windows.cc \
-    src/core/lib/iomgr/is_epollexclusive_available.cc \
-    src/core/lib/iomgr/load_file.cc \
-    src/core/lib/iomgr/lockfree_event.cc \
-    src/core/lib/iomgr/network_status_tracker.cc \
-    src/core/lib/iomgr/polling_entity.cc \
-    src/core/lib/iomgr/pollset_set_uv.cc \
-    src/core/lib/iomgr/pollset_set_windows.cc \
-    src/core/lib/iomgr/pollset_uv.cc \
-    src/core/lib/iomgr/pollset_windows.cc \
-    src/core/lib/iomgr/resolve_address_posix.cc \
-    src/core/lib/iomgr/resolve_address_uv.cc \
-    src/core/lib/iomgr/resolve_address_windows.cc \
-    src/core/lib/iomgr/resource_quota.cc \
-    src/core/lib/iomgr/sockaddr_utils.cc \
-    src/core/lib/iomgr/socket_factory_posix.cc \
-    src/core/lib/iomgr/socket_mutator.cc \
-    src/core/lib/iomgr/socket_utils_common_posix.cc \
-    src/core/lib/iomgr/socket_utils_linux.cc \
-    src/core/lib/iomgr/socket_utils_posix.cc \
-    src/core/lib/iomgr/socket_utils_uv.cc \
-    src/core/lib/iomgr/socket_utils_windows.cc \
-    src/core/lib/iomgr/socket_windows.cc \
-    src/core/lib/iomgr/tcp_client_posix.cc \
-    src/core/lib/iomgr/tcp_client_uv.cc \
-    src/core/lib/iomgr/tcp_client_windows.cc \
-    src/core/lib/iomgr/tcp_posix.cc \
-    src/core/lib/iomgr/tcp_server_posix.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
-    src/core/lib/iomgr/tcp_server_uv.cc \
-    src/core/lib/iomgr/tcp_server_windows.cc \
-    src/core/lib/iomgr/tcp_uv.cc \
-    src/core/lib/iomgr/tcp_windows.cc \
-    src/core/lib/iomgr/time_averaged_stats.cc \
-    src/core/lib/iomgr/timer_generic.cc \
-    src/core/lib/iomgr/timer_heap.cc \
-    src/core/lib/iomgr/timer_manager.cc \
-    src/core/lib/iomgr/timer_uv.cc \
-    src/core/lib/iomgr/udp_server.cc \
-    src/core/lib/iomgr/unix_sockets_posix.cc \
-    src/core/lib/iomgr/unix_sockets_posix_noop.cc \
-    src/core/lib/iomgr/wakeup_fd_cv.cc \
-    src/core/lib/iomgr/wakeup_fd_eventfd.cc \
-    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
-    src/core/lib/iomgr/wakeup_fd_pipe.cc \
-    src/core/lib/iomgr/wakeup_fd_posix.cc \
-    src/core/lib/json/json.cc \
-    src/core/lib/json/json_reader.cc \
-    src/core/lib/json/json_string.cc \
-    src/core/lib/json/json_writer.cc \
-    src/core/lib/slice/b64.cc \
-    src/core/lib/slice/percent_encoding.cc \
-    src/core/lib/slice/slice.cc \
-    src/core/lib/slice/slice_buffer.cc \
-    src/core/lib/slice/slice_hash_table.cc \
-    src/core/lib/slice/slice_intern.cc \
-    src/core/lib/slice/slice_string_helpers.cc \
-    src/core/lib/surface/alarm.cc \
-    src/core/lib/surface/api_trace.cc \
-    src/core/lib/surface/byte_buffer.cc \
-    src/core/lib/surface/byte_buffer_reader.cc \
-    src/core/lib/surface/call.cc \
-    src/core/lib/surface/call_details.cc \
-    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/channel.cc \
-    src/core/lib/surface/channel_init.cc \
-    src/core/lib/surface/channel_ping.cc \
-    src/core/lib/surface/channel_stack_type.cc \
-    src/core/lib/surface/completion_queue.cc \
-    src/core/lib/surface/completion_queue_factory.cc \
-    src/core/lib/surface/event_string.cc \
-    src/core/lib/surface/lame_client.cc \
-    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server.cc \
-    src/core/lib/surface/validate_metadata.cc \
-    src/core/lib/surface/version.cc \
-    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/byte_stream.cc \
-    src/core/lib/transport/connectivity_state.cc \
-    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/metadata.cc \
-    src/core/lib/transport/metadata_batch.cc \
-    src/core/lib/transport/pid_controller.cc \
-    src/core/lib/transport/service_config.cc \
-    src/core/lib/transport/static_metadata.cc \
-    src/core/lib/transport/status_conversion.cc \
-    src/core/lib/transport/timeout_encoding.cc \
-    src/core/lib/transport/transport.cc \
-    src/core/lib/transport/transport_op_string.cc \
-    src/core/lib/debug/trace.cc \
-    src/core/ext/transport/chttp2/alpn/alpn.cc \
-    src/core/ext/filters/http/client/http_client_filter.cc \
-    src/core/ext/filters/http/http_filters_plugin.cc \
-    src/core/ext/filters/http/message_compress/message_compress_filter.cc \
-    src/core/ext/filters/http/server/http_server_filter.cc \
-    src/core/ext/filters/client_channel/backup_poller.cc \
-    src/core/ext/filters/client_channel/channel_connectivity.cc \
-    src/core/ext/filters/client_channel/client_channel.cc \
-    src/core/ext/filters/client_channel/client_channel_factory.cc \
-    src/core/ext/filters/client_channel/client_channel_plugin.cc \
-    src/core/ext/filters/client_channel/connector.cc \
-    src/core/ext/filters/client_channel/http_connect_handshaker.cc \
-    src/core/ext/filters/client_channel/http_proxy.cc \
-    src/core/ext/filters/client_channel/lb_policy.cc \
-    src/core/ext/filters/client_channel/lb_policy_factory.cc \
-    src/core/ext/filters/client_channel/lb_policy_registry.cc \
-    src/core/ext/filters/client_channel/parse_address.cc \
-    src/core/ext/filters/client_channel/proxy_mapper.cc \
-    src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
-    src/core/ext/filters/client_channel/resolver.cc \
-    src/core/ext/filters/client_channel/resolver_factory.cc \
-    src/core/ext/filters/client_channel/resolver_registry.cc \
-    src/core/ext/filters/client_channel/retry_throttle.cc \
-    src/core/ext/filters/client_channel/subchannel.cc \
-    src/core/ext/filters/client_channel/subchannel_index.cc \
-    src/core/ext/filters/client_channel/uri_parser.cc \
-    src/core/ext/filters/deadline/deadline_filter.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
-    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
-    src/core/ext/transport/chttp2/server/chttp2_server.cc \
-    src/core/ext/census/grpc_context.cc \
-    third_party/nanopb/pb_common.c \
-    third_party/nanopb/pb_decode.c \
-    third_party/nanopb/pb_encode.c \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/alarm.h \
-    include/grpc++/channel.h \
-    include/grpc++/client_context.h \
-    include/grpc++/completion_queue.h \
-    include/grpc++/create_channel.h \
-    include/grpc++/create_channel_posix.h \
-    include/grpc++/ext/health_check_service_server_builder_option.h \
-    include/grpc++/generic/async_generic_service.h \
-    include/grpc++/generic/generic_stub.h \
-    include/grpc++/grpc++.h \
-    include/grpc++/health_check_service_interface.h \
-    include/grpc++/impl/call.h \
-    include/grpc++/impl/channel_argument_option.h \
-    include/grpc++/impl/client_unary_call.h \
-    include/grpc++/impl/codegen/core_codegen.h \
-    include/grpc++/impl/grpc_library.h \
-    include/grpc++/impl/method_handler_impl.h \
-    include/grpc++/impl/rpc_method.h \
-    include/grpc++/impl/rpc_service_method.h \
-    include/grpc++/impl/serialization_traits.h \
-    include/grpc++/impl/server_builder_option.h \
-    include/grpc++/impl/server_builder_plugin.h \
-    include/grpc++/impl/server_initializer.h \
-    include/grpc++/impl/service_type.h \
-    include/grpc++/resource_quota.h \
-    include/grpc++/security/auth_context.h \
-    include/grpc++/security/auth_metadata_processor.h \
-    include/grpc++/security/credentials.h \
-    include/grpc++/security/server_credentials.h \
-    include/grpc++/server.h \
-    include/grpc++/server_builder.h \
-    include/grpc++/server_context.h \
-    include/grpc++/server_posix.h \
-    include/grpc++/support/async_stream.h \
-    include/grpc++/support/async_unary_call.h \
-    include/grpc++/support/byte_buffer.h \
-    include/grpc++/support/channel_arguments.h \
-    include/grpc++/support/config.h \
-    include/grpc++/support/slice.h \
-    include/grpc++/support/status.h \
-    include/grpc++/support/status_code_enum.h \
-    include/grpc++/support/string_ref.h \
-    include/grpc++/support/stub_options.h \
-    include/grpc++/support/sync_stream.h \
-    include/grpc++/support/time.h \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/avl.h \
-    include/grpc/support/cmdline.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/host_port.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/subprocess.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd.h \
-    include/grpc/support/time.h \
-    include/grpc/support/tls.h \
-    include/grpc/support/tls_gcc.h \
-    include/grpc/support/tls_msvc.h \
-    include/grpc/support/tls_pthread.h \
-    include/grpc/support/useful.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/byte_buffer.h \
-    include/grpc/byte_buffer_reader.h \
-    include/grpc/compression.h \
-    include/grpc/fork.h \
-    include/grpc/grpc.h \
-    include/grpc/grpc_posix.h \
-    include/grpc/grpc_security_constants.h \
-    include/grpc/load_reporting.h \
-    include/grpc/slice.h \
-    include/grpc/slice_buffer.h \
-    include/grpc/status.h \
-    include/grpc/support/workaround_list.h \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc++/impl/codegen/async_stream.h \
-    include/grpc++/impl/codegen/async_unary_call.h \
-    include/grpc++/impl/codegen/byte_buffer.h \
-    include/grpc++/impl/codegen/call.h \
-    include/grpc++/impl/codegen/call_hook.h \
-    include/grpc++/impl/codegen/channel_interface.h \
-    include/grpc++/impl/codegen/client_context.h \
-    include/grpc++/impl/codegen/client_unary_call.h \
-    include/grpc++/impl/codegen/completion_queue.h \
-    include/grpc++/impl/codegen/completion_queue_tag.h \
-    include/grpc++/impl/codegen/config.h \
-    include/grpc++/impl/codegen/core_codegen_interface.h \
-    include/grpc++/impl/codegen/create_auth_context.h \
-    include/grpc++/impl/codegen/grpc_library.h \
-    include/grpc++/impl/codegen/metadata_map.h \
-    include/grpc++/impl/codegen/method_handler_impl.h \
-    include/grpc++/impl/codegen/rpc_method.h \
-    include/grpc++/impl/codegen/rpc_service_method.h \
-    include/grpc++/impl/codegen/security/auth_context.h \
-    include/grpc++/impl/codegen/serialization_traits.h \
-    include/grpc++/impl/codegen/server_context.h \
-    include/grpc++/impl/codegen/server_interface.h \
-    include/grpc++/impl/codegen/service_type.h \
-    include/grpc++/impl/codegen/slice.h \
-    include/grpc++/impl/codegen/status.h \
-    include/grpc++/impl/codegen/status_code_enum.h \
-    include/grpc++/impl/codegen/string_ref.h \
-    include/grpc++/impl/codegen/stub_options.h \
-    include/grpc++/impl/codegen/sync_stream.h \
-    include/grpc++/impl/codegen/time.h \
-    include/grpc/census.h \
-
-LIBGRPC++_CRONET_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_CRONET_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a: protobuf_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a $(LIBGRPC++_CRONET_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS)  $(OPENSSL_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_cronet.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_CRONET_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_cronet$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_CRONET_OBJS) $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_cronet$(SHARED_VERSION_CORE)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
-else
-$(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_CRONET_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_CRONET_OBJS) $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_cronet -lgrpc
-else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_cronet.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_CRONET_OBJS) $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_cronet -lgrpc
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP).so
-endif
-endif
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_CRONET_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC++_ERROR_DETAILS_SRC = \
-    $(GENDIR)/src/proto/grpc/status/status.pb.cc $(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc \
-    src/cpp/util/error_details.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/support/error_details.h \
-
-LIBGRPC++_ERROR_DETAILS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_ERROR_DETAILS_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: protobuf_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll
-else
-$(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_ERROR_DETAILS_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
-else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_error_details.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_ERROR_DETAILS_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP).so
-endif
-endif
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_ERROR_DETAILS_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/src/cpp/util/error_details.o: $(GENDIR)/src/proto/grpc/status/status.pb.cc $(GENDIR)/src/proto/grpc/status/status.grpc.pb.cc
-
-
-LIBGRPC++_PROTO_REFLECTION_DESC_DB_SRC = \
-    test/cpp/util/proto_reflection_descriptor_database.cc \
-    $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_PROTO_REFLECTION_DESC_DB_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/util/proto_reflection_descriptor_database.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-
-
-LIBGRPC++_REFLECTION_SRC = \
-    src/cpp/ext/proto_server_reflection.cc \
-    src/cpp/ext/proto_server_reflection_plugin.cc \
-    $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/ext/proto_server_reflection_plugin.h \
-
-LIBGRPC++_REFLECTION_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_REFLECTION_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): openssl_dep_error
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: protobuf_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_REFLECTION_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBGRPC++_REFLECTION_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++$(SHARED_VERSION_CPP)-dll -lgrpc$(SHARED_VERSION_CORE)-dll
-else
-$(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_REFLECTION_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc++.$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT_CORE) $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
-else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_reflection.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_REFLECTION_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgrpc++ -lgrpc
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP).so
-endif
-endif
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_REFLECTION_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/src/cpp/ext/proto_server_reflection.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/src/cpp/ext/proto_server_reflection_plugin.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-
-
-LIBGRPC++_TEST_CONFIG_SRC = \
-    test/cpp/util/test_config_cc.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBGRPC++_TEST_CONFIG_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_CONFIG_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_CONFIG_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBGRPC++_TEST_CONFIG_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_TEST_CONFIG_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC++_TEST_UTIL_SRC = \
-    $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc \
-    test/cpp/end2end/test_service_impl.cc \
-    test/cpp/util/byte_buffer_proto_helper.cc \
-    test/cpp/util/create_test_channel.cc \
-    test/cpp/util/string_ref_helper.cc \
-    test/cpp/util/subprocess.cc \
-    test/cpp/util/test_credentials_provider.cc \
-    src/cpp/codegen/codegen_init.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/impl/codegen/async_stream.h \
-    include/grpc++/impl/codegen/async_unary_call.h \
-    include/grpc++/impl/codegen/byte_buffer.h \
-    include/grpc++/impl/codegen/call.h \
-    include/grpc++/impl/codegen/call_hook.h \
-    include/grpc++/impl/codegen/channel_interface.h \
-    include/grpc++/impl/codegen/client_context.h \
-    include/grpc++/impl/codegen/client_unary_call.h \
-    include/grpc++/impl/codegen/completion_queue.h \
-    include/grpc++/impl/codegen/completion_queue_tag.h \
-    include/grpc++/impl/codegen/config.h \
-    include/grpc++/impl/codegen/core_codegen_interface.h \
-    include/grpc++/impl/codegen/create_auth_context.h \
-    include/grpc++/impl/codegen/grpc_library.h \
-    include/grpc++/impl/codegen/metadata_map.h \
-    include/grpc++/impl/codegen/method_handler_impl.h \
-    include/grpc++/impl/codegen/rpc_method.h \
-    include/grpc++/impl/codegen/rpc_service_method.h \
-    include/grpc++/impl/codegen/security/auth_context.h \
-    include/grpc++/impl/codegen/serialization_traits.h \
-    include/grpc++/impl/codegen/server_context.h \
-    include/grpc++/impl/codegen/server_interface.h \
-    include/grpc++/impl/codegen/service_type.h \
-    include/grpc++/impl/codegen/slice.h \
-    include/grpc++/impl/codegen/status.h \
-    include/grpc++/impl/codegen/status_code_enum.h \
-    include/grpc++/impl/codegen/string_ref.h \
-    include/grpc++/impl/codegen/stub_options.h \
-    include/grpc++/impl/codegen/sync_stream.h \
-    include/grpc++/impl/codegen/time.h \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc++/impl/codegen/proto_utils.h \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC++_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_UTIL_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBGRPC++_TEST_UTIL_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/test_service_impl.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/byte_buffer_proto_helper.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/string_ref_helper.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/subprocess.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/test_credentials_provider.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-
-
-LIBGRPC++_TEST_UTIL_UNSECURE_SRC = \
-    $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc \
-    test/cpp/end2end/test_service_impl.cc \
-    test/cpp/util/byte_buffer_proto_helper.cc \
-    test/cpp/util/string_ref_helper.cc \
-    test/cpp/util/subprocess.cc \
-    src/cpp/codegen/codegen_init.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/impl/codegen/async_stream.h \
-    include/grpc++/impl/codegen/async_unary_call.h \
-    include/grpc++/impl/codegen/byte_buffer.h \
-    include/grpc++/impl/codegen/call.h \
-    include/grpc++/impl/codegen/call_hook.h \
-    include/grpc++/impl/codegen/channel_interface.h \
-    include/grpc++/impl/codegen/client_context.h \
-    include/grpc++/impl/codegen/client_unary_call.h \
-    include/grpc++/impl/codegen/completion_queue.h \
-    include/grpc++/impl/codegen/completion_queue_tag.h \
-    include/grpc++/impl/codegen/config.h \
-    include/grpc++/impl/codegen/core_codegen_interface.h \
-    include/grpc++/impl/codegen/create_auth_context.h \
-    include/grpc++/impl/codegen/grpc_library.h \
-    include/grpc++/impl/codegen/metadata_map.h \
-    include/grpc++/impl/codegen/method_handler_impl.h \
-    include/grpc++/impl/codegen/rpc_method.h \
-    include/grpc++/impl/codegen/rpc_service_method.h \
-    include/grpc++/impl/codegen/security/auth_context.h \
-    include/grpc++/impl/codegen/serialization_traits.h \
-    include/grpc++/impl/codegen/server_context.h \
-    include/grpc++/impl/codegen/server_interface.h \
-    include/grpc++/impl/codegen/service_type.h \
-    include/grpc++/impl/codegen/slice.h \
-    include/grpc++/impl/codegen/status.h \
-    include/grpc++/impl/codegen/status_code_enum.h \
-    include/grpc++/impl/codegen/string_ref.h \
-    include/grpc++/impl/codegen/stub_options.h \
-    include/grpc++/impl/codegen/sync_stream.h \
-    include/grpc++/impl/codegen/time.h \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc++/impl/codegen/proto_utils.h \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC++_TEST_UTIL_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_UTIL_UNSECURE_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/test_service_impl.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/byte_buffer_proto_helper.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/string_ref_helper.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/subprocess.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(GENDIR)/src/proto/grpc/health/v1/health.pb.cc $(GENDIR)/src/proto/grpc/health/v1/health.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
-
-
-LIBGRPC++_UNSECURE_SRC = \
-    src/cpp/client/insecure_credentials.cc \
-    src/cpp/common/insecure_create_auth_context.cc \
-    src/cpp/server/insecure_server_credentials.cc \
-    src/cpp/client/channel_cc.cc \
-    src/cpp/client/client_context.cc \
-    src/cpp/client/create_channel.cc \
-    src/cpp/client/create_channel_internal.cc \
-    src/cpp/client/create_channel_posix.cc \
-    src/cpp/client/credentials_cc.cc \
-    src/cpp/client/generic_stub.cc \
-    src/cpp/common/channel_arguments.cc \
-    src/cpp/common/channel_filter.cc \
-    src/cpp/common/completion_queue_cc.cc \
-    src/cpp/common/core_codegen.cc \
-    src/cpp/common/resource_quota_cc.cc \
-    src/cpp/common/rpc_method.cc \
-    src/cpp/common/version_cc.cc \
-    src/cpp/server/async_generic_service.cc \
-    src/cpp/server/channel_argument_option.cc \
-    src/cpp/server/create_default_thread_pool.cc \
-    src/cpp/server/dynamic_thread_pool.cc \
-    src/cpp/server/health/default_health_check_service.cc \
-    src/cpp/server/health/health.pb.c \
-    src/cpp/server/health/health_check_service.cc \
-    src/cpp/server/health/health_check_service_server_builder_option.cc \
-    src/cpp/server/server_builder.cc \
-    src/cpp/server/server_cc.cc \
-    src/cpp/server/server_context.cc \
-    src/cpp/server/server_credentials.cc \
-    src/cpp/server/server_posix.cc \
-    src/cpp/thread_manager/thread_manager.cc \
-    src/cpp/util/byte_buffer_cc.cc \
-    src/cpp/util/slice_cc.cc \
-    src/cpp/util/status.cc \
-    src/cpp/util/string_ref.cc \
-    src/cpp/util/time_cc.cc \
-    src/cpp/codegen/codegen_init.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/alarm.h \
-    include/grpc++/channel.h \
-    include/grpc++/client_context.h \
-    include/grpc++/completion_queue.h \
-    include/grpc++/create_channel.h \
-    include/grpc++/create_channel_posix.h \
-    include/grpc++/ext/health_check_service_server_builder_option.h \
-    include/grpc++/generic/async_generic_service.h \
-    include/grpc++/generic/generic_stub.h \
-    include/grpc++/grpc++.h \
-    include/grpc++/health_check_service_interface.h \
-    include/grpc++/impl/call.h \
-    include/grpc++/impl/channel_argument_option.h \
-    include/grpc++/impl/client_unary_call.h \
-    include/grpc++/impl/codegen/core_codegen.h \
-    include/grpc++/impl/grpc_library.h \
-    include/grpc++/impl/method_handler_impl.h \
-    include/grpc++/impl/rpc_method.h \
-    include/grpc++/impl/rpc_service_method.h \
-    include/grpc++/impl/serialization_traits.h \
-    include/grpc++/impl/server_builder_option.h \
-    include/grpc++/impl/server_builder_plugin.h \
-    include/grpc++/impl/server_initializer.h \
-    include/grpc++/impl/service_type.h \
-    include/grpc++/resource_quota.h \
-    include/grpc++/security/auth_context.h \
-    include/grpc++/security/auth_metadata_processor.h \
-    include/grpc++/security/credentials.h \
-    include/grpc++/security/server_credentials.h \
-    include/grpc++/server.h \
-    include/grpc++/server_builder.h \
-    include/grpc++/server_context.h \
-    include/grpc++/server_posix.h \
-    include/grpc++/support/async_stream.h \
-    include/grpc++/support/async_unary_call.h \
-    include/grpc++/support/byte_buffer.h \
-    include/grpc++/support/channel_arguments.h \
-    include/grpc++/support/config.h \
-    include/grpc++/support/slice.h \
-    include/grpc++/support/status.h \
-    include/grpc++/support/status_code_enum.h \
-    include/grpc++/support/string_ref.h \
-    include/grpc++/support/stub_options.h \
-    include/grpc++/support/sync_stream.h \
-    include/grpc++/support/time.h \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/avl.h \
-    include/grpc/support/cmdline.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/host_port.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/subprocess.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd.h \
-    include/grpc/support/time.h \
-    include/grpc/support/tls.h \
-    include/grpc/support/tls_gcc.h \
-    include/grpc/support/tls_msvc.h \
-    include/grpc/support/tls_pthread.h \
-    include/grpc/support/useful.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_slice.h \
-    include/grpc/impl/codegen/gpr_types.h \
-    include/grpc/impl/codegen/port_platform.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
-    include/grpc/byte_buffer.h \
-    include/grpc/byte_buffer_reader.h \
-    include/grpc/compression.h \
-    include/grpc/fork.h \
-    include/grpc/grpc.h \
-    include/grpc/grpc_posix.h \
-    include/grpc/grpc_security_constants.h \
-    include/grpc/load_reporting.h \
-    include/grpc/slice.h \
-    include/grpc/slice_buffer.h \
-    include/grpc/status.h \
-    include/grpc/support/workaround_list.h \
-    include/grpc/impl/codegen/byte_buffer.h \
-    include/grpc/impl/codegen/byte_buffer_reader.h \
-    include/grpc/impl/codegen/compression_types.h \
-    include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/propagation_bits.h \
-    include/grpc/impl/codegen/slice.h \
-    include/grpc/impl/codegen/status.h \
-    include/grpc++/impl/codegen/async_stream.h \
-    include/grpc++/impl/codegen/async_unary_call.h \
-    include/grpc++/impl/codegen/byte_buffer.h \
-    include/grpc++/impl/codegen/call.h \
-    include/grpc++/impl/codegen/call_hook.h \
-    include/grpc++/impl/codegen/channel_interface.h \
-    include/grpc++/impl/codegen/client_context.h \
-    include/grpc++/impl/codegen/client_unary_call.h \
-    include/grpc++/impl/codegen/completion_queue.h \
-    include/grpc++/impl/codegen/completion_queue_tag.h \
-    include/grpc++/impl/codegen/config.h \
-    include/grpc++/impl/codegen/core_codegen_interface.h \
-    include/grpc++/impl/codegen/create_auth_context.h \
-    include/grpc++/impl/codegen/grpc_library.h \
-    include/grpc++/impl/codegen/metadata_map.h \
-    include/grpc++/impl/codegen/method_handler_impl.h \
-    include/grpc++/impl/codegen/rpc_method.h \
-    include/grpc++/impl/codegen/rpc_service_method.h \
-    include/grpc++/impl/codegen/security/auth_context.h \
-    include/grpc++/impl/codegen/serialization_traits.h \
-    include/grpc++/impl/codegen/server_context.h \
-    include/grpc++/impl/codegen/server_interface.h \
-    include/grpc++/impl/codegen/service_type.h \
-    include/grpc++/impl/codegen/slice.h \
-    include/grpc++/impl/codegen/status.h \
-    include/grpc++/impl/codegen/status_code_enum.h \
-    include/grpc++/impl/codegen/string_ref.h \
-    include/grpc++/impl/codegen/stub_options.h \
-    include/grpc++/impl/codegen/sync_stream.h \
-    include/grpc++/impl/codegen/time.h \
-
-LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC))))
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: protobuf_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): protobuf_dep_error
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBGRPC++_UNSECURE_OBJS)  $(LIBGPR_OBJS)  $(ZLIB_MERGE_OBJS)  $(CARES_MERGE_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr$(SHARED_VERSION_CORE)-dll -lgrpc_unsecure$(SHARED_VERSION_CORE)-dll
-else
-$(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP): $(LIBGRPC++_UNSECURE_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgpr.$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.$(SHARED_EXT_CORE)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure
-else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++_unsecure.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBGRPC++_UNSECURE_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) -lgpr -lgrpc_unsecure
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP).so
-endif
-endif
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC++_UNSECURE_OBJS:.o=.dep)
-endif
-
-
-LIBGRPC_BENCHMARK_SRC = \
-    test/cpp/microbenchmarks/helpers.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBGRPC_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_BENCHMARK_SRC))))
-
-$(LIBGRPC_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC_BENCHMARK_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBGRPC_BENCHMARK_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_BENCHMARK_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBGRPC_CLI_LIBS_SRC = \
-    test/cpp/util/cli_call.cc \
-    test/cpp/util/cli_credentials.cc \
-    test/cpp/util/grpc_tool.cc \
-    test/cpp/util/proto_file_parser.cc \
-    test/cpp/util/service_describer.cc \
-    $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC_CLI_LIBS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_CLI_LIBS_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBGRPC_CLI_LIBS_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBGRPC_CLI_LIBS_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_CLI_LIBS_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_credentials.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/grpc_tool.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/proto_file_parser.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/service_describer.o: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc
-
-
-LIBGRPC_PLUGIN_SUPPORT_SRC = \
-    src/compiler/cpp_generator.cc \
-    src/compiler/csharp_generator.cc \
-    src/compiler/node_generator.cc \
-    src/compiler/objective_c_generator.cc \
-    src/compiler/php_generator.cc \
-    src/compiler/python_generator.cc \
-    src/compiler/ruby_generator.cc \
-
-PUBLIC_HEADERS_CXX += \
-    include/grpc++/impl/codegen/config_protobuf.h \
-
-LIBGRPC_PLUGIN_SUPPORT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_PLUGIN_SUPPORT_SRC))))
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_PLUGIN_SUPPORT_OBJS:.o=.dep)
-endif
-
-
-LIBHTTP2_CLIENT_MAIN_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/http2_client.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBHTTP2_CLIENT_MAIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBHTTP2_CLIENT_MAIN_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libhttp2_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBHTTP2_CLIENT_MAIN_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBHTTP2_CLIENT_MAIN_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBHTTP2_CLIENT_MAIN_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/http2_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-LIBINTEROP_CLIENT_HELPER_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    test/cpp/interop/client_helper.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBINTEROP_CLIENT_HELPER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBINTEROP_CLIENT_HELPER_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_HELPER_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBINTEROP_CLIENT_HELPER_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBINTEROP_CLIENT_HELPER_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client_helper.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc
-
-
-LIBINTEROP_CLIENT_MAIN_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/client.cc \
-    test/cpp/interop/interop_client.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBINTEROP_CLIENT_MAIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBINTEROP_CLIENT_MAIN_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libinterop_client_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_CLIENT_MAIN_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBINTEROP_CLIENT_MAIN_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_client_main.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-LIBINTEROP_SERVER_HELPER_SRC = \
-    test/cpp/interop/server_helper.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBINTEROP_SERVER_HELPER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBINTEROP_SERVER_HELPER_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_helper.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_HELPER_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBINTEROP_SERVER_HELPER_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBINTEROP_SERVER_HELPER_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBINTEROP_SERVER_LIB_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/interop_server.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBINTEROP_SERVER_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBINTEROP_SERVER_LIB_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_lib.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBINTEROP_SERVER_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBINTEROP_SERVER_LIB_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-LIBINTEROP_SERVER_MAIN_SRC = \
-    test/cpp/interop/interop_server_bootstrap.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBINTEROP_SERVER_MAIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBINTEROP_SERVER_MAIN_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libinterop_server_main.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBINTEROP_SERVER_MAIN_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBINTEROP_SERVER_MAIN_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libinterop_server_main.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBQPS_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc \
-    test/cpp/qps/benchmark_config.cc \
-    test/cpp/qps/client_async.cc \
-    test/cpp/qps/client_sync.cc \
-    test/cpp/qps/driver.cc \
-    test/cpp/qps/parse_json.cc \
-    test/cpp/qps/qps_worker.cc \
-    test/cpp/qps/report.cc \
-    test/cpp/qps/server_async.cc \
-    test/cpp/qps/server_sync.cc \
-    test/cpp/qps/usage_timer.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBQPS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBQPS_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libqps.a: openssl_dep_error
-
-
-else
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libqps.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libqps.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(PROTOBUF_DEP) $(LIBQPS_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libqps.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBQPS_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libqps.a
-endif
-
-
-
-
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBQPS_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/benchmark_config.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/parse_json.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/usage_timer.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc
-
-
-LIBGRPC_CSHARP_EXT_SRC = \
-    src/csharp/ext/grpc_csharp_ext.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBGRPC_CSHARP_EXT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_CSHARP_EXT_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: openssl_dep_error
-
-$(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): openssl_dep_error
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBGRPC_CSHARP_EXT_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a $(LIBGRPC_CSHARP_EXT_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext.a
-endif
-
-
-
-ifeq ($(SYSTEM),MINGW32)
-$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-$(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP): $(LIBGRPC_CSHARP_EXT_OBJS)  $(ZLIB_DEP) $(CARES_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_DEP)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-ifeq ($(SYSTEM),Darwin)
-	$(Q) $(LD) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-else
-	$(Q) $(LD) $(LDFLAGS) $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_csharp_ext.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBGRPC_CSHARP_EXT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so.1
-	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP).so
-endif
-endif
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBGRPC_CSHARP_EXT_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBBORINGSSL_SRC = \
-    src/boringssl/err_data.c \
-    third_party/boringssl/crypto/aes/aes.c \
-    third_party/boringssl/crypto/aes/key_wrap.c \
-    third_party/boringssl/crypto/aes/mode_wrappers.c \
-    third_party/boringssl/crypto/asn1/a_bitstr.c \
-    third_party/boringssl/crypto/asn1/a_bool.c \
-    third_party/boringssl/crypto/asn1/a_d2i_fp.c \
-    third_party/boringssl/crypto/asn1/a_dup.c \
-    third_party/boringssl/crypto/asn1/a_enum.c \
-    third_party/boringssl/crypto/asn1/a_gentm.c \
-    third_party/boringssl/crypto/asn1/a_i2d_fp.c \
-    third_party/boringssl/crypto/asn1/a_int.c \
-    third_party/boringssl/crypto/asn1/a_mbstr.c \
-    third_party/boringssl/crypto/asn1/a_object.c \
-    third_party/boringssl/crypto/asn1/a_octet.c \
-    third_party/boringssl/crypto/asn1/a_print.c \
-    third_party/boringssl/crypto/asn1/a_strnid.c \
-    third_party/boringssl/crypto/asn1/a_time.c \
-    third_party/boringssl/crypto/asn1/a_type.c \
-    third_party/boringssl/crypto/asn1/a_utctm.c \
-    third_party/boringssl/crypto/asn1/a_utf8.c \
-    third_party/boringssl/crypto/asn1/asn1_lib.c \
-    third_party/boringssl/crypto/asn1/asn1_par.c \
-    third_party/boringssl/crypto/asn1/asn_pack.c \
-    third_party/boringssl/crypto/asn1/f_enum.c \
-    third_party/boringssl/crypto/asn1/f_int.c \
-    third_party/boringssl/crypto/asn1/f_string.c \
-    third_party/boringssl/crypto/asn1/t_bitst.c \
-    third_party/boringssl/crypto/asn1/tasn_dec.c \
-    third_party/boringssl/crypto/asn1/tasn_enc.c \
-    third_party/boringssl/crypto/asn1/tasn_fre.c \
-    third_party/boringssl/crypto/asn1/tasn_new.c \
-    third_party/boringssl/crypto/asn1/tasn_typ.c \
-    third_party/boringssl/crypto/asn1/tasn_utl.c \
-    third_party/boringssl/crypto/asn1/time_support.c \
-    third_party/boringssl/crypto/asn1/x_bignum.c \
-    third_party/boringssl/crypto/asn1/x_long.c \
-    third_party/boringssl/crypto/base64/base64.c \
-    third_party/boringssl/crypto/bio/bio.c \
-    third_party/boringssl/crypto/bio/bio_mem.c \
-    third_party/boringssl/crypto/bio/connect.c \
-    third_party/boringssl/crypto/bio/fd.c \
-    third_party/boringssl/crypto/bio/file.c \
-    third_party/boringssl/crypto/bio/hexdump.c \
-    third_party/boringssl/crypto/bio/pair.c \
-    third_party/boringssl/crypto/bio/printf.c \
-    third_party/boringssl/crypto/bio/socket.c \
-    third_party/boringssl/crypto/bio/socket_helper.c \
-    third_party/boringssl/crypto/bn/add.c \
-    third_party/boringssl/crypto/bn/asm/x86_64-gcc.c \
-    third_party/boringssl/crypto/bn/bn.c \
-    third_party/boringssl/crypto/bn/bn_asn1.c \
-    third_party/boringssl/crypto/bn/cmp.c \
-    third_party/boringssl/crypto/bn/convert.c \
-    third_party/boringssl/crypto/bn/ctx.c \
-    third_party/boringssl/crypto/bn/div.c \
-    third_party/boringssl/crypto/bn/exponentiation.c \
-    third_party/boringssl/crypto/bn/gcd.c \
-    third_party/boringssl/crypto/bn/generic.c \
-    third_party/boringssl/crypto/bn/kronecker.c \
-    third_party/boringssl/crypto/bn/montgomery.c \
-    third_party/boringssl/crypto/bn/montgomery_inv.c \
-    third_party/boringssl/crypto/bn/mul.c \
-    third_party/boringssl/crypto/bn/prime.c \
-    third_party/boringssl/crypto/bn/random.c \
-    third_party/boringssl/crypto/bn/rsaz_exp.c \
-    third_party/boringssl/crypto/bn/shift.c \
-    third_party/boringssl/crypto/bn/sqrt.c \
-    third_party/boringssl/crypto/buf/buf.c \
-    third_party/boringssl/crypto/bytestring/asn1_compat.c \
-    third_party/boringssl/crypto/bytestring/ber.c \
-    third_party/boringssl/crypto/bytestring/cbb.c \
-    third_party/boringssl/crypto/bytestring/cbs.c \
-    third_party/boringssl/crypto/chacha/chacha.c \
-    third_party/boringssl/crypto/cipher/aead.c \
-    third_party/boringssl/crypto/cipher/cipher.c \
-    third_party/boringssl/crypto/cipher/derive_key.c \
-    third_party/boringssl/crypto/cipher/e_aes.c \
-    third_party/boringssl/crypto/cipher/e_chacha20poly1305.c \
-    third_party/boringssl/crypto/cipher/e_des.c \
-    third_party/boringssl/crypto/cipher/e_null.c \
-    third_party/boringssl/crypto/cipher/e_rc2.c \
-    third_party/boringssl/crypto/cipher/e_rc4.c \
-    third_party/boringssl/crypto/cipher/e_ssl3.c \
-    third_party/boringssl/crypto/cipher/e_tls.c \
-    third_party/boringssl/crypto/cipher/tls_cbc.c \
-    third_party/boringssl/crypto/cmac/cmac.c \
-    third_party/boringssl/crypto/conf/conf.c \
-    third_party/boringssl/crypto/cpu-aarch64-linux.c \
-    third_party/boringssl/crypto/cpu-arm-linux.c \
-    third_party/boringssl/crypto/cpu-arm.c \
-    third_party/boringssl/crypto/cpu-intel.c \
-    third_party/boringssl/crypto/cpu-ppc64le.c \
-    third_party/boringssl/crypto/crypto.c \
-    third_party/boringssl/crypto/curve25519/curve25519.c \
-    third_party/boringssl/crypto/curve25519/spake25519.c \
-    third_party/boringssl/crypto/curve25519/x25519-x86_64.c \
-    third_party/boringssl/crypto/des/des.c \
-    third_party/boringssl/crypto/dh/check.c \
-    third_party/boringssl/crypto/dh/dh.c \
-    third_party/boringssl/crypto/dh/dh_asn1.c \
-    third_party/boringssl/crypto/dh/params.c \
-    third_party/boringssl/crypto/digest/digest.c \
-    third_party/boringssl/crypto/digest/digests.c \
-    third_party/boringssl/crypto/dsa/dsa.c \
-    third_party/boringssl/crypto/dsa/dsa_asn1.c \
-    third_party/boringssl/crypto/ec/ec.c \
-    third_party/boringssl/crypto/ec/ec_asn1.c \
-    third_party/boringssl/crypto/ec/ec_key.c \
-    third_party/boringssl/crypto/ec/ec_montgomery.c \
-    third_party/boringssl/crypto/ec/oct.c \
-    third_party/boringssl/crypto/ec/p224-64.c \
-    third_party/boringssl/crypto/ec/p256-64.c \
-    third_party/boringssl/crypto/ec/p256-x86_64.c \
-    third_party/boringssl/crypto/ec/simple.c \
-    third_party/boringssl/crypto/ec/util-64.c \
-    third_party/boringssl/crypto/ec/wnaf.c \
-    third_party/boringssl/crypto/ecdh/ecdh.c \
-    third_party/boringssl/crypto/ecdsa/ecdsa.c \
-    third_party/boringssl/crypto/ecdsa/ecdsa_asn1.c \
-    third_party/boringssl/crypto/engine/engine.c \
-    third_party/boringssl/crypto/err/err.c \
-    third_party/boringssl/crypto/evp/digestsign.c \
-    third_party/boringssl/crypto/evp/evp.c \
-    third_party/boringssl/crypto/evp/evp_asn1.c \
-    third_party/boringssl/crypto/evp/evp_ctx.c \
-    third_party/boringssl/crypto/evp/p_dsa_asn1.c \
-    third_party/boringssl/crypto/evp/p_ec.c \
-    third_party/boringssl/crypto/evp/p_ec_asn1.c \
-    third_party/boringssl/crypto/evp/p_rsa.c \
-    third_party/boringssl/crypto/evp/p_rsa_asn1.c \
-    third_party/boringssl/crypto/evp/pbkdf.c \
-    third_party/boringssl/crypto/evp/print.c \
-    third_party/boringssl/crypto/evp/sign.c \
-    third_party/boringssl/crypto/ex_data.c \
-    third_party/boringssl/crypto/hkdf/hkdf.c \
-    third_party/boringssl/crypto/hmac/hmac.c \
-    third_party/boringssl/crypto/lhash/lhash.c \
-    third_party/boringssl/crypto/md4/md4.c \
-    third_party/boringssl/crypto/md5/md5.c \
-    third_party/boringssl/crypto/mem.c \
-    third_party/boringssl/crypto/modes/cbc.c \
-    third_party/boringssl/crypto/modes/cfb.c \
-    third_party/boringssl/crypto/modes/ctr.c \
-    third_party/boringssl/crypto/modes/gcm.c \
-    third_party/boringssl/crypto/modes/ofb.c \
-    third_party/boringssl/crypto/modes/polyval.c \
-    third_party/boringssl/crypto/obj/obj.c \
-    third_party/boringssl/crypto/obj/obj_xref.c \
-    third_party/boringssl/crypto/pem/pem_all.c \
-    third_party/boringssl/crypto/pem/pem_info.c \
-    third_party/boringssl/crypto/pem/pem_lib.c \
-    third_party/boringssl/crypto/pem/pem_oth.c \
-    third_party/boringssl/crypto/pem/pem_pk8.c \
-    third_party/boringssl/crypto/pem/pem_pkey.c \
-    third_party/boringssl/crypto/pem/pem_x509.c \
-    third_party/boringssl/crypto/pem/pem_xaux.c \
-    third_party/boringssl/crypto/pkcs8/p5_pbev2.c \
-    third_party/boringssl/crypto/pkcs8/p8_pkey.c \
-    third_party/boringssl/crypto/pkcs8/pkcs8.c \
-    third_party/boringssl/crypto/poly1305/poly1305.c \
-    third_party/boringssl/crypto/poly1305/poly1305_arm.c \
-    third_party/boringssl/crypto/poly1305/poly1305_vec.c \
-    third_party/boringssl/crypto/pool/pool.c \
-    third_party/boringssl/crypto/rand/deterministic.c \
-    third_party/boringssl/crypto/rand/fuchsia.c \
-    third_party/boringssl/crypto/rand/rand.c \
-    third_party/boringssl/crypto/rand/urandom.c \
-    third_party/boringssl/crypto/rand/windows.c \
-    third_party/boringssl/crypto/rc4/rc4.c \
-    third_party/boringssl/crypto/refcount_c11.c \
-    third_party/boringssl/crypto/refcount_lock.c \
-    third_party/boringssl/crypto/rsa/blinding.c \
-    third_party/boringssl/crypto/rsa/padding.c \
-    third_party/boringssl/crypto/rsa/rsa.c \
-    third_party/boringssl/crypto/rsa/rsa_asn1.c \
-    third_party/boringssl/crypto/rsa/rsa_impl.c \
-    third_party/boringssl/crypto/sha/sha1-altivec.c \
-    third_party/boringssl/crypto/sha/sha1.c \
-    third_party/boringssl/crypto/sha/sha256.c \
-    third_party/boringssl/crypto/sha/sha512.c \
-    third_party/boringssl/crypto/stack/stack.c \
-    third_party/boringssl/crypto/thread.c \
-    third_party/boringssl/crypto/thread_none.c \
-    third_party/boringssl/crypto/thread_pthread.c \
-    third_party/boringssl/crypto/thread_win.c \
-    third_party/boringssl/crypto/x509/a_digest.c \
-    third_party/boringssl/crypto/x509/a_sign.c \
-    third_party/boringssl/crypto/x509/a_strex.c \
-    third_party/boringssl/crypto/x509/a_verify.c \
-    third_party/boringssl/crypto/x509/algorithm.c \
-    third_party/boringssl/crypto/x509/asn1_gen.c \
-    third_party/boringssl/crypto/x509/by_dir.c \
-    third_party/boringssl/crypto/x509/by_file.c \
-    third_party/boringssl/crypto/x509/i2d_pr.c \
-    third_party/boringssl/crypto/x509/pkcs7.c \
-    third_party/boringssl/crypto/x509/rsa_pss.c \
-    third_party/boringssl/crypto/x509/t_crl.c \
-    third_party/boringssl/crypto/x509/t_req.c \
-    third_party/boringssl/crypto/x509/t_x509.c \
-    third_party/boringssl/crypto/x509/t_x509a.c \
-    third_party/boringssl/crypto/x509/x509.c \
-    third_party/boringssl/crypto/x509/x509_att.c \
-    third_party/boringssl/crypto/x509/x509_cmp.c \
-    third_party/boringssl/crypto/x509/x509_d2.c \
-    third_party/boringssl/crypto/x509/x509_def.c \
-    third_party/boringssl/crypto/x509/x509_ext.c \
-    third_party/boringssl/crypto/x509/x509_lu.c \
-    third_party/boringssl/crypto/x509/x509_obj.c \
-    third_party/boringssl/crypto/x509/x509_r2x.c \
-    third_party/boringssl/crypto/x509/x509_req.c \
-    third_party/boringssl/crypto/x509/x509_set.c \
-    third_party/boringssl/crypto/x509/x509_trs.c \
-    third_party/boringssl/crypto/x509/x509_txt.c \
-    third_party/boringssl/crypto/x509/x509_v3.c \
-    third_party/boringssl/crypto/x509/x509_vfy.c \
-    third_party/boringssl/crypto/x509/x509_vpm.c \
-    third_party/boringssl/crypto/x509/x509cset.c \
-    third_party/boringssl/crypto/x509/x509name.c \
-    third_party/boringssl/crypto/x509/x509rset.c \
-    third_party/boringssl/crypto/x509/x509spki.c \
-    third_party/boringssl/crypto/x509/x509type.c \
-    third_party/boringssl/crypto/x509/x_algor.c \
-    third_party/boringssl/crypto/x509/x_all.c \
-    third_party/boringssl/crypto/x509/x_attrib.c \
-    third_party/boringssl/crypto/x509/x_crl.c \
-    third_party/boringssl/crypto/x509/x_exten.c \
-    third_party/boringssl/crypto/x509/x_info.c \
-    third_party/boringssl/crypto/x509/x_name.c \
-    third_party/boringssl/crypto/x509/x_pkey.c \
-    third_party/boringssl/crypto/x509/x_pubkey.c \
-    third_party/boringssl/crypto/x509/x_req.c \
-    third_party/boringssl/crypto/x509/x_sig.c \
-    third_party/boringssl/crypto/x509/x_spki.c \
-    third_party/boringssl/crypto/x509/x_val.c \
-    third_party/boringssl/crypto/x509/x_x509.c \
-    third_party/boringssl/crypto/x509/x_x509a.c \
-    third_party/boringssl/crypto/x509v3/pcy_cache.c \
-    third_party/boringssl/crypto/x509v3/pcy_data.c \
-    third_party/boringssl/crypto/x509v3/pcy_lib.c \
-    third_party/boringssl/crypto/x509v3/pcy_map.c \
-    third_party/boringssl/crypto/x509v3/pcy_node.c \
-    third_party/boringssl/crypto/x509v3/pcy_tree.c \
-    third_party/boringssl/crypto/x509v3/v3_akey.c \
-    third_party/boringssl/crypto/x509v3/v3_akeya.c \
-    third_party/boringssl/crypto/x509v3/v3_alt.c \
-    third_party/boringssl/crypto/x509v3/v3_bcons.c \
-    third_party/boringssl/crypto/x509v3/v3_bitst.c \
-    third_party/boringssl/crypto/x509v3/v3_conf.c \
-    third_party/boringssl/crypto/x509v3/v3_cpols.c \
-    third_party/boringssl/crypto/x509v3/v3_crld.c \
-    third_party/boringssl/crypto/x509v3/v3_enum.c \
-    third_party/boringssl/crypto/x509v3/v3_extku.c \
-    third_party/boringssl/crypto/x509v3/v3_genn.c \
-    third_party/boringssl/crypto/x509v3/v3_ia5.c \
-    third_party/boringssl/crypto/x509v3/v3_info.c \
-    third_party/boringssl/crypto/x509v3/v3_int.c \
-    third_party/boringssl/crypto/x509v3/v3_lib.c \
-    third_party/boringssl/crypto/x509v3/v3_ncons.c \
-    third_party/boringssl/crypto/x509v3/v3_pci.c \
-    third_party/boringssl/crypto/x509v3/v3_pcia.c \
-    third_party/boringssl/crypto/x509v3/v3_pcons.c \
-    third_party/boringssl/crypto/x509v3/v3_pku.c \
-    third_party/boringssl/crypto/x509v3/v3_pmaps.c \
-    third_party/boringssl/crypto/x509v3/v3_prn.c \
-    third_party/boringssl/crypto/x509v3/v3_purp.c \
-    third_party/boringssl/crypto/x509v3/v3_skey.c \
-    third_party/boringssl/crypto/x509v3/v3_sxnet.c \
-    third_party/boringssl/crypto/x509v3/v3_utl.c \
-    third_party/boringssl/ssl/bio_ssl.c \
-    third_party/boringssl/ssl/custom_extensions.c \
-    third_party/boringssl/ssl/d1_both.c \
-    third_party/boringssl/ssl/d1_lib.c \
-    third_party/boringssl/ssl/d1_pkt.c \
-    third_party/boringssl/ssl/d1_srtp.c \
-    third_party/boringssl/ssl/dtls_method.c \
-    third_party/boringssl/ssl/dtls_record.c \
-    third_party/boringssl/ssl/handshake_client.c \
-    third_party/boringssl/ssl/handshake_server.c \
-    third_party/boringssl/ssl/s3_both.c \
-    third_party/boringssl/ssl/s3_lib.c \
-    third_party/boringssl/ssl/s3_pkt.c \
-    third_party/boringssl/ssl/ssl_aead_ctx.c \
-    third_party/boringssl/ssl/ssl_asn1.c \
-    third_party/boringssl/ssl/ssl_buffer.c \
-    third_party/boringssl/ssl/ssl_cert.c \
-    third_party/boringssl/ssl/ssl_cipher.c \
-    third_party/boringssl/ssl/ssl_ecdh.c \
-    third_party/boringssl/ssl/ssl_file.c \
-    third_party/boringssl/ssl/ssl_lib.c \
-    third_party/boringssl/ssl/ssl_privkey.c \
-    third_party/boringssl/ssl/ssl_privkey_cc.cc \
-    third_party/boringssl/ssl/ssl_session.c \
-    third_party/boringssl/ssl/ssl_stat.c \
-    third_party/boringssl/ssl/ssl_transcript.c \
-    third_party/boringssl/ssl/ssl_x509.c \
-    third_party/boringssl/ssl/t1_enc.c \
-    third_party/boringssl/ssl/t1_lib.c \
-    third_party/boringssl/ssl/tls13_both.c \
-    third_party/boringssl/ssl/tls13_client.c \
-    third_party/boringssl/ssl/tls13_enc.c \
-    third_party/boringssl/ssl/tls13_server.c \
-    third_party/boringssl/ssl/tls_method.c \
-    third_party/boringssl/ssl/tls_record.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_SRC))))
-
-$(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl.a $(LIBBORINGSSL_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_TEST_UTIL_SRC = \
-    third_party/boringssl/crypto/test/file_test.cc \
-    third_party/boringssl/crypto/test/malloc.cc \
-    third_party/boringssl/crypto/test/test_util.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_TEST_UTIL_SRC))))
-
-$(LIBBORINGSSL_TEST_UTIL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_TEST_UTIL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_test_util.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_TEST_UTIL_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBBORINGSSL_TEST_UTIL_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_TEST_UTIL_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_AES_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/aes/aes_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_AES_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_AES_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_AES_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_AES_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_AES_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBBORINGSSL_AES_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_AES_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ASN1_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/asn1/asn1_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ASN1_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ASN1_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ASN1_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ASN1_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ASN1_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBBORINGSSL_ASN1_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ASN1_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_BASE64_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/base64/base64_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_BASE64_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_BASE64_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_BASE64_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_BASE64_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_BASE64_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBBORINGSSL_BASE64_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_BASE64_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_BIO_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/bio/bio_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_BIO_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_BIO_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_BIO_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_BIO_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_BIO_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBBORINGSSL_BIO_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_BIO_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_BN_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/bn/bn_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_BN_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_BN_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_BN_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_BN_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_BN_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBBORINGSSL_BN_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_BN_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_BYTESTRING_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/bytestring/bytestring_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_BYTESTRING_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_BYTESTRING_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_AEAD_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/cipher/aead_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_AEAD_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_AEAD_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_AEAD_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_AEAD_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_AEAD_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBBORINGSSL_AEAD_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_AEAD_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_CIPHER_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/cipher/cipher_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_CIPHER_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_CIPHER_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_CIPHER_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_CIPHER_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_CIPHER_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBBORINGSSL_CIPHER_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_CIPHER_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_CMAC_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/cmac/cmac_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_CMAC_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_CMAC_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_CMAC_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_CMAC_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_CMAC_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBBORINGSSL_CMAC_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_CMAC_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/constant_time_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a $(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_CONSTANT_TIME_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ED25519_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/curve25519/ed25519_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ED25519_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ED25519_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ED25519_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ED25519_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ED25519_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBBORINGSSL_ED25519_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ED25519_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_SPAKE25519_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/curve25519/spake25519_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_SPAKE25519_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a $(LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_SPAKE25519_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_X25519_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/curve25519/x25519_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_X25519_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_X25519_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_X25519_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_X25519_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_X25519_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBBORINGSSL_X25519_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_X25519_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_DIGEST_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/digest/digest_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_DIGEST_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_DIGEST_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_DIGEST_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_DIGEST_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_DIGEST_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBBORINGSSL_DIGEST_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_DIGEST_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_EXAMPLE_MUL_LIB_SRC = \
-    third_party/boringssl/crypto/ec/example_mul.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_EXAMPLE_MUL_LIB_SRC))))
-
-$(LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a $(LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_EXAMPLE_MUL_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_P256-X86_64_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/ec/p256-x86_64_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_P256-X86_64_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a $(LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_P256-X86_64_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ECDH_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/ecdh/ecdh_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ECDH_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ECDH_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ECDH_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ECDH_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ECDH_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a $(LIBBORINGSSL_ECDH_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ECDH_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/ecdsa/ecdsa_sign_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a $(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ECDSA_SIGN_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ECDSA_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/ecdsa/ecdsa_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ECDSA_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ECDSA_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ECDSA_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ECDSA_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ECDSA_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBBORINGSSL_ECDSA_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ECDSA_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/ecdsa/ecdsa_verify_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a $(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_ECDSA_VERIFY_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_EVP_EXTRA_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/evp/evp_extra_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_EVP_EXTRA_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_EVP_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/evp/evp_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_EVP_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_EVP_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_EVP_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_EVP_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_EVP_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBBORINGSSL_EVP_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_EVP_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_PBKDF_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/evp/pbkdf_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_PBKDF_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_PBKDF_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_PBKDF_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_PBKDF_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_PBKDF_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBBORINGSSL_PBKDF_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_PBKDF_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_HKDF_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/hkdf/hkdf_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_HKDF_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_HKDF_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_HKDF_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_HKDF_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_HKDF_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a $(LIBBORINGSSL_HKDF_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_HKDF_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_HMAC_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/hmac/hmac_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_HMAC_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_HMAC_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_HMAC_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_HMAC_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_HMAC_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBBORINGSSL_HMAC_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_HMAC_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_LHASH_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/lhash/lhash_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_LHASH_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_LHASH_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_LHASH_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_LHASH_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_LHASH_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a $(LIBBORINGSSL_LHASH_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_LHASH_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_GCM_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/modes/gcm_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_GCM_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_GCM_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_GCM_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_GCM_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_GCM_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a $(LIBBORINGSSL_GCM_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_GCM_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_OBJ_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/obj/obj_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_OBJ_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_OBJ_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_OBJ_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_OBJ_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_OBJ_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a $(LIBBORINGSSL_OBJ_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_OBJ_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_PKCS12_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/pkcs8/pkcs12_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_PKCS12_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_PKCS12_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_PKCS12_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_PKCS12_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_PKCS12_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBBORINGSSL_PKCS12_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_PKCS12_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_PKCS8_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/pkcs8/pkcs8_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_PKCS8_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_PKCS8_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_PKCS8_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_PKCS8_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_PKCS8_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBBORINGSSL_PKCS8_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_PKCS8_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_POLY1305_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/poly1305/poly1305_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_POLY1305_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_POLY1305_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_POLY1305_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_POLY1305_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_POLY1305_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBBORINGSSL_POLY1305_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_POLY1305_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_POOL_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/pool/pool_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_POOL_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_POOL_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_POOL_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_POOL_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_POOL_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a $(LIBBORINGSSL_POOL_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_POOL_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_REFCOUNT_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/refcount_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_REFCOUNT_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a $(LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_REFCOUNT_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_THREAD_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/thread_test.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_THREAD_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_THREAD_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_THREAD_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_THREAD_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_THREAD_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a $(LIBBORINGSSL_THREAD_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_THREAD_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_PKCS7_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/x509/pkcs7_test.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_PKCS7_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_PKCS7_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_PKCS7_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_PKCS7_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_PKCS7_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a $(LIBBORINGSSL_PKCS7_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_PKCS7_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_X509_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/x509/x509_test.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBORINGSSL_X509_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_X509_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_X509_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_X509_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBORINGSSL_X509_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBBORINGSSL_X509_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_X509_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_TAB_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/x509v3/tab_test.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_TAB_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_TAB_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_TAB_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_TAB_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_TAB_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a $(LIBBORINGSSL_TAB_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_TAB_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBORINGSSL_V3NAME_TEST_LIB_SRC = \
-    third_party/boringssl/crypto/x509v3/v3name_test.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBBORINGSSL_V3NAME_TEST_LIB_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBORINGSSL_V3NAME_TEST_LIB_SRC))))
-
-$(LIBBORINGSSL_V3NAME_TEST_LIB_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(LIBBORINGSSL_V3NAME_TEST_LIB_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-$(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBBORINGSSL_V3NAME_TEST_LIB_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a $(LIBBORINGSSL_V3NAME_TEST_LIB_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBORINGSSL_V3NAME_TEST_LIB_OBJS:.o=.dep)
-endif
-
-
-LIBBENCHMARK_SRC = \
-    third_party/benchmark/src/benchmark.cc \
-    third_party/benchmark/src/benchmark_register.cc \
-    third_party/benchmark/src/colorprint.cc \
-    third_party/benchmark/src/commandlineflags.cc \
-    third_party/benchmark/src/complexity.cc \
-    third_party/benchmark/src/console_reporter.cc \
-    third_party/benchmark/src/counter.cc \
-    third_party/benchmark/src/csv_reporter.cc \
-    third_party/benchmark/src/json_reporter.cc \
-    third_party/benchmark/src/reporter.cc \
-    third_party/benchmark/src/sleep.cc \
-    third_party/benchmark/src/string_util.cc \
-    third_party/benchmark/src/sysinfo.cc \
-    third_party/benchmark/src/timers.cc \
-
-PUBLIC_HEADERS_CXX += \
-
-LIBBENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBENCHMARK_SRC))))
-
-$(LIBBENCHMARK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build a C++ library if you don't have protobuf - a bit overreached, but still okay.
-
-$(LIBDIR)/$(CONFIG)/libbenchmark.a: protobuf_dep_error
-
-
-else
-
-$(LIBDIR)/$(CONFIG)/libbenchmark.a: $(ZLIB_DEP) $(CARES_DEP)  $(PROTOBUF_DEP) $(LIBBENCHMARK_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbenchmark.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBBENCHMARK_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbenchmark.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_DEPS),true)
--include $(LIBBENCHMARK_OBJS:.o=.dep)
-endif
-
-
-LIBZ_SRC = \
-    third_party/zlib/adler32.c \
-    third_party/zlib/compress.c \
-    third_party/zlib/crc32.c \
-    third_party/zlib/deflate.c \
-    third_party/zlib/gzclose.c \
-    third_party/zlib/gzlib.c \
-    third_party/zlib/gzread.c \
-    third_party/zlib/gzwrite.c \
-    third_party/zlib/infback.c \
-    third_party/zlib/inffast.c \
-    third_party/zlib/inflate.c \
-    third_party/zlib/inftrees.c \
-    third_party/zlib/trees.c \
-    third_party/zlib/uncompr.c \
-    third_party/zlib/zutil.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC))))
-
-$(LIBZ_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
-
-$(LIBDIR)/$(CONFIG)/libz.a: $(CARES_DEP)  $(LIBZ_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libz.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libz.a $(LIBZ_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libz.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBZ_OBJS:.o=.dep)
-endif
-
-
-LIBARES_SRC = \
-    third_party/cares/cares/ares__close_sockets.c \
-    third_party/cares/cares/ares__get_hostent.c \
-    third_party/cares/cares/ares__read_line.c \
-    third_party/cares/cares/ares__timeval.c \
-    third_party/cares/cares/ares_cancel.c \
-    third_party/cares/cares/ares_create_query.c \
-    third_party/cares/cares/ares_data.c \
-    third_party/cares/cares/ares_destroy.c \
-    third_party/cares/cares/ares_expand_name.c \
-    third_party/cares/cares/ares_expand_string.c \
-    third_party/cares/cares/ares_fds.c \
-    third_party/cares/cares/ares_free_hostent.c \
-    third_party/cares/cares/ares_free_string.c \
-    third_party/cares/cares/ares_getenv.c \
-    third_party/cares/cares/ares_gethostbyaddr.c \
-    third_party/cares/cares/ares_gethostbyname.c \
-    third_party/cares/cares/ares_getnameinfo.c \
-    third_party/cares/cares/ares_getopt.c \
-    third_party/cares/cares/ares_getsock.c \
-    third_party/cares/cares/ares_init.c \
-    third_party/cares/cares/ares_library_init.c \
-    third_party/cares/cares/ares_llist.c \
-    third_party/cares/cares/ares_mkquery.c \
-    third_party/cares/cares/ares_nowarn.c \
-    third_party/cares/cares/ares_options.c \
-    third_party/cares/cares/ares_parse_a_reply.c \
-    third_party/cares/cares/ares_parse_aaaa_reply.c \
-    third_party/cares/cares/ares_parse_mx_reply.c \
-    third_party/cares/cares/ares_parse_naptr_reply.c \
-    third_party/cares/cares/ares_parse_ns_reply.c \
-    third_party/cares/cares/ares_parse_ptr_reply.c \
-    third_party/cares/cares/ares_parse_soa_reply.c \
-    third_party/cares/cares/ares_parse_srv_reply.c \
-    third_party/cares/cares/ares_parse_txt_reply.c \
-    third_party/cares/cares/ares_platform.c \
-    third_party/cares/cares/ares_process.c \
-    third_party/cares/cares/ares_query.c \
-    third_party/cares/cares/ares_search.c \
-    third_party/cares/cares/ares_send.c \
-    third_party/cares/cares/ares_strcasecmp.c \
-    third_party/cares/cares/ares_strdup.c \
-    third_party/cares/cares/ares_strerror.c \
-    third_party/cares/cares/ares_timeout.c \
-    third_party/cares/cares/ares_version.c \
-    third_party/cares/cares/ares_writev.c \
-    third_party/cares/cares/bitncmp.c \
-    third_party/cares/cares/inet_net_pton.c \
-    third_party/cares/cares/inet_ntop.c \
-    third_party/cares/cares/windows_port.c \
-
-PUBLIC_HEADERS_C += \
-
-LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC))))
-
-$(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
-$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
-
-$(LIBDIR)/$(CONFIG)/libares.a: $(ZLIB_DEP)  $(LIBARES_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libares.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libares.a $(LIBARES_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libares.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBARES_OBJS:.o=.dep)
-endif
-
-
-LIBBAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/bad_client.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBBAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBAD_CLIENT_TEST_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libbad_client_test.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libbad_client_test.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBBAD_CLIENT_TEST_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_client_test.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBBAD_CLIENT_TEST_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbad_client_test.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBBAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBBAD_SSL_TEST_SERVER_SRC = \
-    test/core/bad_ssl/server_common.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBBAD_SSL_TEST_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBBAD_SSL_TEST_SERVER_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBBAD_SSL_TEST_SERVER_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBBAD_SSL_TEST_SERVER_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBBAD_SSL_TEST_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBEND2END_TESTS_SRC = \
-    test/core/end2end/end2end_tests.cc \
-    test/core/end2end/end2end_test_utils.cc \
-    test/core/end2end/tests/authority_not_supported.cc \
-    test/core/end2end/tests/bad_hostname.cc \
-    test/core/end2end/tests/bad_ping.cc \
-    test/core/end2end/tests/binary_metadata.cc \
-    test/core/end2end/tests/call_creds.cc \
-    test/core/end2end/tests/cancel_after_accept.cc \
-    test/core/end2end/tests/cancel_after_client_done.cc \
-    test/core/end2end/tests/cancel_after_invoke.cc \
-    test/core/end2end/tests/cancel_after_round_trip.cc \
-    test/core/end2end/tests/cancel_before_invoke.cc \
-    test/core/end2end/tests/cancel_in_a_vacuum.cc \
-    test/core/end2end/tests/cancel_with_status.cc \
-    test/core/end2end/tests/compressed_payload.cc \
-    test/core/end2end/tests/connectivity.cc \
-    test/core/end2end/tests/default_host.cc \
-    test/core/end2end/tests/disappearing_server.cc \
-    test/core/end2end/tests/empty_batch.cc \
-    test/core/end2end/tests/filter_call_init_fails.cc \
-    test/core/end2end/tests/filter_causes_close.cc \
-    test/core/end2end/tests/filter_latency.cc \
-    test/core/end2end/tests/filter_status_code.cc \
-    test/core/end2end/tests/graceful_server_shutdown.cc \
-    test/core/end2end/tests/high_initial_seqno.cc \
-    test/core/end2end/tests/hpack_size.cc \
-    test/core/end2end/tests/idempotent_request.cc \
-    test/core/end2end/tests/invoke_large_request.cc \
-    test/core/end2end/tests/keepalive_timeout.cc \
-    test/core/end2end/tests/large_metadata.cc \
-    test/core/end2end/tests/load_reporting_hook.cc \
-    test/core/end2end/tests/max_concurrent_streams.cc \
-    test/core/end2end/tests/max_connection_age.cc \
-    test/core/end2end/tests/max_connection_idle.cc \
-    test/core/end2end/tests/max_message_length.cc \
-    test/core/end2end/tests/negative_deadline.cc \
-    test/core/end2end/tests/network_status_change.cc \
-    test/core/end2end/tests/no_logging.cc \
-    test/core/end2end/tests/no_op.cc \
-    test/core/end2end/tests/payload.cc \
-    test/core/end2end/tests/ping.cc \
-    test/core/end2end/tests/ping_pong_streaming.cc \
-    test/core/end2end/tests/proxy_auth.cc \
-    test/core/end2end/tests/registered_call.cc \
-    test/core/end2end/tests/request_with_flags.cc \
-    test/core/end2end/tests/request_with_payload.cc \
-    test/core/end2end/tests/resource_quota_server.cc \
-    test/core/end2end/tests/server_finishes_request.cc \
-    test/core/end2end/tests/shutdown_finishes_calls.cc \
-    test/core/end2end/tests/shutdown_finishes_tags.cc \
-    test/core/end2end/tests/simple_cacheable_request.cc \
-    test/core/end2end/tests/simple_delayed_request.cc \
-    test/core/end2end/tests/simple_metadata.cc \
-    test/core/end2end/tests/simple_request.cc \
-    test/core/end2end/tests/stream_compression_compressed_payload.cc \
-    test/core/end2end/tests/stream_compression_payload.cc \
-    test/core/end2end/tests/stream_compression_ping_pong_streaming.cc \
-    test/core/end2end/tests/streaming_error_response.cc \
-    test/core/end2end/tests/trailing_metadata.cc \
-    test/core/end2end/tests/workaround_cronet_compression.cc \
-    test/core/end2end/tests/write_buffering.cc \
-    test/core/end2end/tests/write_buffering_at_end.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBEND2END_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_TESTS_SRC))))
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure libraries if you don't have OpenSSL.
-
-$(LIBDIR)/$(CONFIG)/libend2end_tests.a: openssl_dep_error
-
-
-else
-
-
-$(LIBDIR)/$(CONFIG)/libend2end_tests.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(CARES_DEP) $(LIBEND2END_TESTS_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_tests.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBEND2END_TESTS_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libend2end_tests.a
-endif
-
-
-
-
-endif
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LIBEND2END_TESTS_OBJS:.o=.dep)
-endif
-endif
-
-
-LIBEND2END_NOSEC_TESTS_SRC = \
-    test/core/end2end/end2end_nosec_tests.cc \
-    test/core/end2end/end2end_test_utils.cc \
-    test/core/end2end/tests/authority_not_supported.cc \
-    test/core/end2end/tests/bad_hostname.cc \
-    test/core/end2end/tests/bad_ping.cc \
-    test/core/end2end/tests/binary_metadata.cc \
-    test/core/end2end/tests/cancel_after_accept.cc \
-    test/core/end2end/tests/cancel_after_client_done.cc \
-    test/core/end2end/tests/cancel_after_invoke.cc \
-    test/core/end2end/tests/cancel_after_round_trip.cc \
-    test/core/end2end/tests/cancel_before_invoke.cc \
-    test/core/end2end/tests/cancel_in_a_vacuum.cc \
-    test/core/end2end/tests/cancel_with_status.cc \
-    test/core/end2end/tests/compressed_payload.cc \
-    test/core/end2end/tests/connectivity.cc \
-    test/core/end2end/tests/default_host.cc \
-    test/core/end2end/tests/disappearing_server.cc \
-    test/core/end2end/tests/empty_batch.cc \
-    test/core/end2end/tests/filter_call_init_fails.cc \
-    test/core/end2end/tests/filter_causes_close.cc \
-    test/core/end2end/tests/filter_latency.cc \
-    test/core/end2end/tests/filter_status_code.cc \
-    test/core/end2end/tests/graceful_server_shutdown.cc \
-    test/core/end2end/tests/high_initial_seqno.cc \
-    test/core/end2end/tests/hpack_size.cc \
-    test/core/end2end/tests/idempotent_request.cc \
-    test/core/end2end/tests/invoke_large_request.cc \
-    test/core/end2end/tests/keepalive_timeout.cc \
-    test/core/end2end/tests/large_metadata.cc \
-    test/core/end2end/tests/load_reporting_hook.cc \
-    test/core/end2end/tests/max_concurrent_streams.cc \
-    test/core/end2end/tests/max_connection_age.cc \
-    test/core/end2end/tests/max_connection_idle.cc \
-    test/core/end2end/tests/max_message_length.cc \
-    test/core/end2end/tests/negative_deadline.cc \
-    test/core/end2end/tests/network_status_change.cc \
-    test/core/end2end/tests/no_logging.cc \
-    test/core/end2end/tests/no_op.cc \
-    test/core/end2end/tests/payload.cc \
-    test/core/end2end/tests/ping.cc \
-    test/core/end2end/tests/ping_pong_streaming.cc \
-    test/core/end2end/tests/proxy_auth.cc \
-    test/core/end2end/tests/registered_call.cc \
-    test/core/end2end/tests/request_with_flags.cc \
-    test/core/end2end/tests/request_with_payload.cc \
-    test/core/end2end/tests/resource_quota_server.cc \
-    test/core/end2end/tests/server_finishes_request.cc \
-    test/core/end2end/tests/shutdown_finishes_calls.cc \
-    test/core/end2end/tests/shutdown_finishes_tags.cc \
-    test/core/end2end/tests/simple_cacheable_request.cc \
-    test/core/end2end/tests/simple_delayed_request.cc \
-    test/core/end2end/tests/simple_metadata.cc \
-    test/core/end2end/tests/simple_request.cc \
-    test/core/end2end/tests/stream_compression_compressed_payload.cc \
-    test/core/end2end/tests/stream_compression_payload.cc \
-    test/core/end2end/tests/stream_compression_ping_pong_streaming.cc \
-    test/core/end2end/tests/streaming_error_response.cc \
-    test/core/end2end/tests/trailing_metadata.cc \
-    test/core/end2end/tests/workaround_cronet_compression.cc \
-    test/core/end2end/tests/write_buffering.cc \
-    test/core/end2end/tests/write_buffering_at_end.cc \
-
-PUBLIC_HEADERS_C += \
-
-LIBEND2END_NOSEC_TESTS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBEND2END_NOSEC_TESTS_SRC))))
-
-
-$(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a: $(ZLIB_DEP) $(CARES_DEP)  $(LIBEND2END_NOSEC_TESTS_OBJS) 
-	$(E) "[AR]      Creating $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
-	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBEND2END_NOSEC_TESTS_OBJS) 
-ifeq ($(SYSTEM),Darwin)
-	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a
-endif
-
-
-
-
-ifneq ($(NO_DEPS),true)
--include $(LIBEND2END_NOSEC_TESTS_OBJS:.o=.dep)
-endif
-
-
-
-# All of the test targets, and protoc plugins
-
-
-ALARM_TEST_SRC = \
-    test/core/surface/alarm_test.cc \
-
-ALARM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALARM_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/alarm_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/alarm_test: $(ALARM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ALARM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/alarm_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/alarm_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_alarm_test: $(ALARM_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ALARM_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ALGORITHM_TEST_SRC = \
-    test/core/compression/algorithm_test.cc \
-
-ALGORITHM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALGORITHM_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/algorithm_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/algorithm_test: $(ALGORITHM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ALGORITHM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/algorithm_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/compression/algorithm_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_algorithm_test: $(ALGORITHM_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ALGORITHM_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ALLOC_TEST_SRC = \
-    test/core/gpr/alloc_test.cc \
-
-ALLOC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALLOC_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/alloc_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/alloc_test: $(ALLOC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ALLOC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/alloc_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/alloc_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_alloc_test: $(ALLOC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ALLOC_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ALPN_TEST_SRC = \
-    test/core/transport/chttp2/alpn_test.cc \
-
-ALPN_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALPN_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/alpn_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/alpn_test: $(ALPN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ALPN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/alpn_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/alpn_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_alpn_test: $(ALPN_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ALPN_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-API_FUZZER_SRC = \
-    test/core/end2end/fuzzers/api_fuzzer.cc \
-
-API_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(API_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/api_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/api_fuzzer: $(API_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(API_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/api_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/api_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_api_fuzzer: $(API_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(API_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-ARENA_TEST_SRC = \
-    test/core/gpr/arena_test.cc \
-
-ARENA_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ARENA_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/arena_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/arena_test: $(ARENA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ARENA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/arena_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/arena_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_arena_test: $(ARENA_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ARENA_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BAD_SERVER_RESPONSE_TEST_SRC = \
-    test/core/end2end/bad_server_response_test.cc \
-
-BAD_SERVER_RESPONSE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BAD_SERVER_RESPONSE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bad_server_response_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/bad_server_response_test: $(BAD_SERVER_RESPONSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BAD_SERVER_RESPONSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bad_server_response_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/bad_server_response_test.o:  $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bad_server_response_test: $(BAD_SERVER_RESPONSE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BAD_SERVER_RESPONSE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BIN_DECODER_TEST_SRC = \
-    test/core/transport/chttp2/bin_decoder_test.cc \
-
-BIN_DECODER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BIN_DECODER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bin_decoder_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/bin_decoder_test: $(BIN_DECODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BIN_DECODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bin_decoder_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/bin_decoder_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_bin_decoder_test: $(BIN_DECODER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BIN_DECODER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BIN_ENCODER_TEST_SRC = \
-    test/core/transport/chttp2/bin_encoder_test.cc \
-
-BIN_ENCODER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BIN_ENCODER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bin_encoder_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/bin_encoder_test: $(BIN_ENCODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BIN_ENCODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bin_encoder_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/bin_encoder_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_bin_encoder_test: $(BIN_ENCODER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BIN_ENCODER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BYTE_STREAM_TEST_SRC = \
-    test/core/transport/byte_stream_test.cc \
-
-BYTE_STREAM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BYTE_STREAM_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/byte_stream_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/byte_stream_test: $(BYTE_STREAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BYTE_STREAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/byte_stream_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/byte_stream_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_byte_stream_test: $(BYTE_STREAM_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BYTE_STREAM_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHANNEL_CREATE_TEST_SRC = \
-    test/core/surface/channel_create_test.cc \
-
-CHANNEL_CREATE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHANNEL_CREATE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/channel_create_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/channel_create_test: $(CHANNEL_CREATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CHANNEL_CREATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/channel_create_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/channel_create_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_channel_create_test: $(CHANNEL_CREATE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHANNEL_CREATE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHECK_EPOLLEXCLUSIVE_SRC = \
-    test/build/check_epollexclusive.c \
-
-CHECK_EPOLLEXCLUSIVE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHECK_EPOLLEXCLUSIVE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/check_epollexclusive: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/check_epollexclusive: $(CHECK_EPOLLEXCLUSIVE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CHECK_EPOLLEXCLUSIVE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/check_epollexclusive
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/build/check_epollexclusive.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_check_epollexclusive: $(CHECK_EPOLLEXCLUSIVE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHECK_EPOLLEXCLUSIVE_OBJS:.o=.dep)
-endif
-endif
-
-
-CHTTP2_HPACK_ENCODER_TEST_SRC = \
-    test/core/transport/chttp2/hpack_encoder_test.cc \
-
-CHTTP2_HPACK_ENCODER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHTTP2_HPACK_ENCODER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test: $(CHTTP2_HPACK_ENCODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CHTTP2_HPACK_ENCODER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/chttp2_hpack_encoder_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/hpack_encoder_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_chttp2_hpack_encoder_test: $(CHTTP2_HPACK_ENCODER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHTTP2_HPACK_ENCODER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHTTP2_STREAM_MAP_TEST_SRC = \
-    test/core/transport/chttp2/stream_map_test.cc \
-
-CHTTP2_STREAM_MAP_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHTTP2_STREAM_MAP_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/chttp2_stream_map_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/chttp2_stream_map_test: $(CHTTP2_STREAM_MAP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CHTTP2_STREAM_MAP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/chttp2_stream_map_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/stream_map_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_chttp2_stream_map_test: $(CHTTP2_STREAM_MAP_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHTTP2_STREAM_MAP_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHTTP2_VARINT_TEST_SRC = \
-    test/core/transport/chttp2/varint_test.cc \
-
-CHTTP2_VARINT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHTTP2_VARINT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/chttp2_varint_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/chttp2_varint_test: $(CHTTP2_VARINT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CHTTP2_VARINT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/chttp2_varint_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/varint_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_chttp2_varint_test: $(CHTTP2_VARINT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHTTP2_VARINT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CLIENT_FUZZER_SRC = \
-    test/core/end2end/fuzzers/client_fuzzer.cc \
-
-CLIENT_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/client_fuzzer: $(CLIENT_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLIENT_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/client_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/client_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_fuzzer: $(CLIENT_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-COMBINER_TEST_SRC = \
-    test/core/iomgr/combiner_test.cc \
-
-COMBINER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(COMBINER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/combiner_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/combiner_test: $(COMBINER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(COMBINER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/combiner_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/combiner_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_combiner_test: $(COMBINER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(COMBINER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-COMPRESSION_TEST_SRC = \
-    test/core/compression/compression_test.cc \
-
-COMPRESSION_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(COMPRESSION_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/compression_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/compression_test: $(COMPRESSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(COMPRESSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/compression_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/compression/compression_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_compression_test: $(COMPRESSION_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(COMPRESSION_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CONCURRENT_CONNECTIVITY_TEST_SRC = \
-    test/core/surface/concurrent_connectivity_test.cc \
-
-CONCURRENT_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CONCURRENT_CONNECTIVITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/concurrent_connectivity_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/concurrent_connectivity_test: $(CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CONCURRENT_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/concurrent_connectivity_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/concurrent_connectivity_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_concurrent_connectivity_test: $(CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CONCURRENT_CONNECTIVITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CONNECTION_REFUSED_TEST_SRC = \
-    test/core/end2end/connection_refused_test.cc \
-
-CONNECTION_REFUSED_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CONNECTION_REFUSED_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/connection_refused_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/connection_refused_test: $(CONNECTION_REFUSED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CONNECTION_REFUSED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/connection_refused_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/connection_refused_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_connection_refused_test: $(CONNECTION_REFUSED_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CONNECTION_REFUSED_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-DNS_RESOLVER_CONNECTIVITY_TEST_SRC = \
-    test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc \
-
-DNS_RESOLVER_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_CONNECTIVITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test: $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/dns_resolver_connectivity_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_dns_resolver_connectivity_test: $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(DNS_RESOLVER_CONNECTIVITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-DNS_RESOLVER_TEST_SRC = \
-    test/core/client_channel/resolvers/dns_resolver_test.cc \
-
-DNS_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DNS_RESOLVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/dns_resolver_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/dns_resolver_test: $(DNS_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(DNS_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/dns_resolver_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/dns_resolver_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_dns_resolver_test: $(DNS_RESOLVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(DNS_RESOLVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-DUALSTACK_SOCKET_TEST_SRC = \
-    test/core/end2end/dualstack_socket_test.cc \
-
-DUALSTACK_SOCKET_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DUALSTACK_SOCKET_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/dualstack_socket_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/dualstack_socket_test: $(DUALSTACK_SOCKET_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(DUALSTACK_SOCKET_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/dualstack_socket_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/dualstack_socket_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_dualstack_socket_test: $(DUALSTACK_SOCKET_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(DUALSTACK_SOCKET_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ENDPOINT_PAIR_TEST_SRC = \
-    test/core/iomgr/endpoint_pair_test.cc \
-
-ENDPOINT_PAIR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ENDPOINT_PAIR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/endpoint_pair_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/endpoint_pair_test: $(ENDPOINT_PAIR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ENDPOINT_PAIR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/endpoint_pair_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_pair_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_endpoint_pair_test: $(ENDPOINT_PAIR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ENDPOINT_PAIR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ERROR_TEST_SRC = \
-    test/core/iomgr/error_test.cc \
-
-ERROR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ERROR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/error_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/error_test: $(ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/error_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/error_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_error_test: $(ERROR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ERROR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-EV_EPOLLSIG_LINUX_TEST_SRC = \
-    test/core/iomgr/ev_epollsig_linux_test.cc \
-
-EV_EPOLLSIG_LINUX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(EV_EPOLLSIG_LINUX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ev_epollsig_linux_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/ev_epollsig_linux_test: $(EV_EPOLLSIG_LINUX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(EV_EPOLLSIG_LINUX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/ev_epollsig_linux_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/ev_epollsig_linux_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_ev_epollsig_linux_test: $(EV_EPOLLSIG_LINUX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(EV_EPOLLSIG_LINUX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FAKE_RESOLVER_TEST_SRC = \
-    test/core/client_channel/resolvers/fake_resolver_test.cc \
-
-FAKE_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FAKE_RESOLVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fake_resolver_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fake_resolver_test: $(FAKE_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FAKE_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fake_resolver_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/fake_resolver_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fake_resolver_test: $(FAKE_RESOLVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FAKE_RESOLVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FAKE_TRANSPORT_SECURITY_TEST_SRC = \
-    test/core/tsi/fake_transport_security_test.cc \
-    test/core/tsi/transport_security_test_lib.cc \
-
-FAKE_TRANSPORT_SECURITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FAKE_TRANSPORT_SECURITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fake_transport_security_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fake_transport_security_test: $(FAKE_TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FAKE_TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fake_transport_security_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/tsi/fake_transport_security_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-$(OBJDIR)/$(CONFIG)/test/core/tsi/transport_security_test_lib.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_fake_transport_security_test: $(FAKE_TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FAKE_TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FD_CONSERVATION_POSIX_TEST_SRC = \
-    test/core/iomgr/fd_conservation_posix_test.cc \
-
-FD_CONSERVATION_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FD_CONSERVATION_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fd_conservation_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fd_conservation_posix_test: $(FD_CONSERVATION_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FD_CONSERVATION_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fd_conservation_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/fd_conservation_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fd_conservation_posix_test: $(FD_CONSERVATION_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FD_CONSERVATION_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FD_POSIX_TEST_SRC = \
-    test/core/iomgr/fd_posix_test.cc \
-
-FD_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FD_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fd_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fd_posix_test: $(FD_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FD_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fd_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/fd_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fd_posix_test: $(FD_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FD_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FLING_CLIENT_SRC = \
-    test/core/fling/client.cc \
-
-FLING_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FLING_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fling_client: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fling_client: $(FLING_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FLING_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fling_client
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/fling/client.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fling_client: $(FLING_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FLING_CLIENT_OBJS:.o=.dep)
-endif
-endif
-
-
-FLING_SERVER_SRC = \
-    test/core/fling/server.cc \
-
-FLING_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FLING_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fling_server: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fling_server: $(FLING_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FLING_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fling_server
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/fling/server.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fling_server: $(FLING_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FLING_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-FLING_STREAM_TEST_SRC = \
-    test/core/fling/fling_stream_test.cc \
-
-FLING_STREAM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FLING_STREAM_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fling_stream_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fling_stream_test: $(FLING_STREAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FLING_STREAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fling_stream_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/fling/fling_stream_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fling_stream_test: $(FLING_STREAM_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FLING_STREAM_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FLING_TEST_SRC = \
-    test/core/fling/fling_test.cc \
-
-FLING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FLING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/fling_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/fling_test: $(FLING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(FLING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/fling_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/fling/fling_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_fling_test: $(FLING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FLING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GOAWAY_SERVER_TEST_SRC = \
-    test/core/end2end/goaway_server_test.cc \
-
-GOAWAY_SERVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GOAWAY_SERVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/goaway_server_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/goaway_server_test: $(GOAWAY_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GOAWAY_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/goaway_server_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/goaway_server_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_goaway_server_test: $(GOAWAY_SERVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GOAWAY_SERVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_AVL_TEST_SRC = \
-    test/core/gpr/avl_test.cc \
-
-GPR_AVL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_AVL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_avl_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_avl_test: $(GPR_AVL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_AVL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_avl_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/avl_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_avl_test: $(GPR_AVL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_AVL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_CMDLINE_TEST_SRC = \
-    test/core/gpr/cmdline_test.cc \
-
-GPR_CMDLINE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_CMDLINE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_cmdline_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_cmdline_test: $(GPR_CMDLINE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_CMDLINE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_cmdline_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/cmdline_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_cmdline_test: $(GPR_CMDLINE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_CMDLINE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_CPU_TEST_SRC = \
-    test/core/gpr/cpu_test.cc \
-
-GPR_CPU_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_CPU_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_cpu_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_cpu_test: $(GPR_CPU_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_CPU_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_cpu_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/cpu_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_cpu_test: $(GPR_CPU_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_CPU_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_ENV_TEST_SRC = \
-    test/core/gpr/env_test.cc \
-
-GPR_ENV_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_ENV_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_env_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_env_test: $(GPR_ENV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_ENV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_env_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/env_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_env_test: $(GPR_ENV_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_ENV_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_HOST_PORT_TEST_SRC = \
-    test/core/gpr/host_port_test.cc \
-
-GPR_HOST_PORT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_HOST_PORT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_host_port_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_host_port_test: $(GPR_HOST_PORT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_HOST_PORT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_host_port_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/host_port_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_host_port_test: $(GPR_HOST_PORT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_HOST_PORT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_LOG_TEST_SRC = \
-    test/core/gpr/log_test.cc \
-
-GPR_LOG_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_LOG_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_log_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_log_test: $(GPR_LOG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_LOG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_log_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/log_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_log_test: $(GPR_LOG_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_LOG_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_MANUAL_CONSTRUCTOR_TEST_SRC = \
-    test/core/gpr++/manual_constructor_test.cc \
-
-GPR_MANUAL_CONSTRUCTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_MANUAL_CONSTRUCTOR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_manual_constructor_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_manual_constructor_test: $(GPR_MANUAL_CONSTRUCTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_MANUAL_CONSTRUCTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/manual_constructor_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_manual_constructor_test: $(GPR_MANUAL_CONSTRUCTOR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_MANUAL_CONSTRUCTOR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_MPSCQ_TEST_SRC = \
-    test/core/gpr/mpscq_test.cc \
-
-GPR_MPSCQ_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_MPSCQ_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_mpscq_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_mpscq_test: $(GPR_MPSCQ_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_MPSCQ_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_mpscq_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/mpscq_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_mpscq_test: $(GPR_MPSCQ_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_MPSCQ_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_SPINLOCK_TEST_SRC = \
-    test/core/gpr/spinlock_test.cc \
-
-GPR_SPINLOCK_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_SPINLOCK_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_spinlock_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_spinlock_test: $(GPR_SPINLOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_SPINLOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_spinlock_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/spinlock_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_spinlock_test: $(GPR_SPINLOCK_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_SPINLOCK_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_STRING_TEST_SRC = \
-    test/core/gpr/string_test.cc \
-
-GPR_STRING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_STRING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_string_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_string_test: $(GPR_STRING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_STRING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_string_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/string_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_string_test: $(GPR_STRING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_STRING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_SYNC_TEST_SRC = \
-    test/core/gpr/sync_test.cc \
-
-GPR_SYNC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_SYNC_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_sync_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_sync_test: $(GPR_SYNC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_SYNC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_sync_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/sync_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_sync_test: $(GPR_SYNC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_SYNC_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_THD_TEST_SRC = \
-    test/core/gpr/thd_test.cc \
-
-GPR_THD_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_THD_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_thd_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_thd_test: $(GPR_THD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_THD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_thd_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/thd_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_thd_test: $(GPR_THD_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_THD_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_TIME_TEST_SRC = \
-    test/core/gpr/time_test.cc \
-
-GPR_TIME_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_TIME_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_time_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_time_test: $(GPR_TIME_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_TIME_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_time_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/time_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_time_test: $(GPR_TIME_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_TIME_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_TLS_TEST_SRC = \
-    test/core/gpr/tls_test.cc \
-
-GPR_TLS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_TLS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_tls_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_tls_test: $(GPR_TLS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_TLS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_tls_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/tls_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_tls_test: $(GPR_TLS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_TLS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GPR_USEFUL_TEST_SRC = \
-    test/core/gpr/useful_test.cc \
-
-GPR_USEFUL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_USEFUL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gpr_useful_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gpr_useful_test: $(GPR_USEFUL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GPR_USEFUL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_useful_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/useful_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_gpr_useful_test: $(GPR_USEFUL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GPR_USEFUL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_AUTH_CONTEXT_TEST_SRC = \
-    test/core/security/auth_context_test.cc \
-
-GRPC_AUTH_CONTEXT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_AUTH_CONTEXT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_auth_context_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_auth_context_test: $(GRPC_AUTH_CONTEXT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_AUTH_CONTEXT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_auth_context_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/auth_context_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_auth_context_test: $(GRPC_AUTH_CONTEXT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_AUTH_CONTEXT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_B64_TEST_SRC = \
-    test/core/slice/b64_test.cc \
-
-GRPC_B64_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_B64_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_b64_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_b64_test: $(GRPC_B64_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_B64_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_b64_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/b64_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_b64_test: $(GRPC_B64_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_B64_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_BYTE_BUFFER_READER_TEST_SRC = \
-    test/core/surface/byte_buffer_reader_test.cc \
-
-GRPC_BYTE_BUFFER_READER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_BYTE_BUFFER_READER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test: $(GRPC_BYTE_BUFFER_READER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_BYTE_BUFFER_READER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_byte_buffer_reader_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/byte_buffer_reader_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_byte_buffer_reader_test: $(GRPC_BYTE_BUFFER_READER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_BYTE_BUFFER_READER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CHANNEL_ARGS_TEST_SRC = \
-    test/core/channel/channel_args_test.cc \
-
-GRPC_CHANNEL_ARGS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CHANNEL_ARGS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_channel_args_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_channel_args_test: $(GRPC_CHANNEL_ARGS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_CHANNEL_ARGS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_channel_args_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/channel/channel_args_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_channel_args_test: $(GRPC_CHANNEL_ARGS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CHANNEL_ARGS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CHANNEL_STACK_BUILDER_TEST_SRC = \
-    test/core/channel/channel_stack_builder_test.cc \
-
-GRPC_CHANNEL_STACK_BUILDER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CHANNEL_STACK_BUILDER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test: $(GRPC_CHANNEL_STACK_BUILDER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_CHANNEL_STACK_BUILDER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_channel_stack_builder_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/channel/channel_stack_builder_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_channel_stack_builder_test: $(GRPC_CHANNEL_STACK_BUILDER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CHANNEL_STACK_BUILDER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CHANNEL_STACK_TEST_SRC = \
-    test/core/channel/channel_stack_test.cc \
-
-GRPC_CHANNEL_STACK_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CHANNEL_STACK_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_channel_stack_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_channel_stack_test: $(GRPC_CHANNEL_STACK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_CHANNEL_STACK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_channel_stack_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/channel/channel_stack_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_channel_stack_test: $(GRPC_CHANNEL_STACK_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CHANNEL_STACK_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_COMPLETION_QUEUE_TEST_SRC = \
-    test/core/surface/completion_queue_test.cc \
-
-GRPC_COMPLETION_QUEUE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_COMPLETION_QUEUE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_completion_queue_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_completion_queue_test: $(GRPC_COMPLETION_QUEUE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_COMPLETION_QUEUE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_completion_queue_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/completion_queue_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_completion_queue_test: $(GRPC_COMPLETION_QUEUE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_COMPLETION_QUEUE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_COMPLETION_QUEUE_THREADING_TEST_SRC = \
-    test/core/surface/completion_queue_threading_test.cc \
-
-GRPC_COMPLETION_QUEUE_THREADING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_COMPLETION_QUEUE_THREADING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test: $(GRPC_COMPLETION_QUEUE_THREADING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_COMPLETION_QUEUE_THREADING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/completion_queue_threading_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_completion_queue_threading_test: $(GRPC_COMPLETION_QUEUE_THREADING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_COMPLETION_QUEUE_THREADING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CREATE_JWT_SRC = \
-    test/core/security/create_jwt.cc \
-
-GRPC_CREATE_JWT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CREATE_JWT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_create_jwt: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_create_jwt: $(GRPC_CREATE_JWT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_CREATE_JWT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_create_jwt
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/create_jwt.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_create_jwt: $(GRPC_CREATE_JWT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CREATE_JWT_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CREDENTIALS_TEST_SRC = \
-    test/core/security/credentials_test.cc \
-
-GRPC_CREDENTIALS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CREDENTIALS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_credentials_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_credentials_test: $(GRPC_CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_credentials_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/credentials_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_credentials_test: $(GRPC_CREDENTIALS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CREDENTIALS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_FETCH_OAUTH2_SRC = \
-    test/core/security/fetch_oauth2.cc \
-
-GRPC_FETCH_OAUTH2_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_FETCH_OAUTH2_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_fetch_oauth2: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_fetch_oauth2: $(GRPC_FETCH_OAUTH2_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_FETCH_OAUTH2_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/fetch_oauth2.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_fetch_oauth2: $(GRPC_FETCH_OAUTH2_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_FETCH_OAUTH2_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_INVALID_CHANNEL_ARGS_TEST_SRC = \
-    test/core/surface/invalid_channel_args_test.cc \
-
-GRPC_INVALID_CHANNEL_ARGS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_INVALID_CHANNEL_ARGS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test: $(GRPC_INVALID_CHANNEL_ARGS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_INVALID_CHANNEL_ARGS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_invalid_channel_args_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/invalid_channel_args_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_invalid_channel_args_test: $(GRPC_INVALID_CHANNEL_ARGS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_INVALID_CHANNEL_ARGS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_JSON_TOKEN_TEST_SRC = \
-    test/core/security/json_token_test.cc \
-
-GRPC_JSON_TOKEN_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_JSON_TOKEN_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_json_token_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_json_token_test: $(GRPC_JSON_TOKEN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_JSON_TOKEN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_json_token_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/json_token_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_json_token_test: $(GRPC_JSON_TOKEN_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_JSON_TOKEN_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_JWT_VERIFIER_TEST_SRC = \
-    test/core/security/jwt_verifier_test.cc \
-
-GRPC_JWT_VERIFIER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_JWT_VERIFIER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test: $(GRPC_JWT_VERIFIER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_JWT_VERIFIER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/jwt_verifier_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_jwt_verifier_test: $(GRPC_JWT_VERIFIER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_JWT_VERIFIER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_SRC = \
-    test/core/security/print_google_default_creds_token.cc \
-
-GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token: $(GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/print_google_default_creds_token.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_print_google_default_creds_token: $(GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_PRINT_GOOGLE_DEFAULT_CREDS_TOKEN_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_SECURITY_CONNECTOR_TEST_SRC = \
-    test/core/security/security_connector_test.cc \
-
-GRPC_SECURITY_CONNECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_SECURITY_CONNECTOR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_security_connector_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_security_connector_test: $(GRPC_SECURITY_CONNECTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_SECURITY_CONNECTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_security_connector_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/security_connector_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_security_connector_test: $(GRPC_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_SECURITY_CONNECTOR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_SSL_CREDENTIALS_TEST_SRC = \
-    test/core/security/ssl_credentials_test.cc \
-
-GRPC_SSL_CREDENTIALS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_SSL_CREDENTIALS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test: $(GRPC_SSL_CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_SSL_CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/ssl_credentials_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_ssl_credentials_test: $(GRPC_SSL_CREDENTIALS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_SSL_CREDENTIALS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_VERIFY_JWT_SRC = \
-    test/core/security/verify_jwt.cc \
-
-GRPC_VERIFY_JWT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_VERIFY_JWT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_verify_jwt: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/grpc_verify_jwt: $(GRPC_VERIFY_JWT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GRPC_VERIFY_JWT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_verify_jwt
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/verify_jwt.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_verify_jwt: $(GRPC_VERIFY_JWT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_VERIFY_JWT_OBJS:.o=.dep)
-endif
-endif
-
-
-HANDSHAKE_CLIENT_SRC = \
-    test/core/handshake/client_ssl.cc \
-
-HANDSHAKE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/handshake_client: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/handshake_client: $(HANDSHAKE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/handshake_client
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/handshake/client_ssl.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_handshake_client: $(HANDSHAKE_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HANDSHAKE_CLIENT_OBJS:.o=.dep)
-endif
-endif
-
-
-HANDSHAKE_SERVER_SRC = \
-    test/core/handshake/server_ssl.cc \
-    test/core/handshake/server_ssl_common.cc \
-
-HANDSHAKE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/handshake_server: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/handshake_server: $(HANDSHAKE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/handshake_server
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/handshake/server_ssl.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/handshake/server_ssl_common.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_handshake_server: $(HANDSHAKE_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HANDSHAKE_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_SRC = \
-    test/core/handshake/readahead_handshaker_server_ssl.cc \
-    test/core/handshake/server_ssl_common.cc \
-
-HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker: $(HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/handshake/readahead_handshaker_server_ssl.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/handshake/server_ssl_common.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_handshake_server_with_readahead_handshaker: $(HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HANDSHAKE_SERVER_WITH_READAHEAD_HANDSHAKER_OBJS:.o=.dep)
-endif
-endif
-
-
-HISTOGRAM_TEST_SRC = \
-    test/core/util/histogram_test.cc \
-
-HISTOGRAM_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HISTOGRAM_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/histogram_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/histogram_test: $(HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HISTOGRAM_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/histogram_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/util/histogram_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_histogram_test: $(HISTOGRAM_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HISTOGRAM_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HPACK_PARSER_FUZZER_TEST_SRC = \
-    test/core/transport/chttp2/hpack_parser_fuzzer_test.cc \
-
-HPACK_PARSER_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HPACK_PARSER_FUZZER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test: $(HPACK_PARSER_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(HPACK_PARSER_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/hpack_parser_fuzzer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_hpack_parser_fuzzer_test: $(HPACK_PARSER_FUZZER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HPACK_PARSER_FUZZER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HPACK_PARSER_TEST_SRC = \
-    test/core/transport/chttp2/hpack_parser_test.cc \
-
-HPACK_PARSER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HPACK_PARSER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/hpack_parser_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/hpack_parser_test: $(HPACK_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HPACK_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/hpack_parser_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/hpack_parser_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_hpack_parser_test: $(HPACK_PARSER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HPACK_PARSER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HPACK_TABLE_TEST_SRC = \
-    test/core/transport/chttp2/hpack_table_test.cc \
-
-HPACK_TABLE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HPACK_TABLE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/hpack_table_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/hpack_table_test: $(HPACK_TABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HPACK_TABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/hpack_table_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/hpack_table_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_hpack_table_test: $(HPACK_TABLE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HPACK_TABLE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTP_PARSER_TEST_SRC = \
-    test/core/http/parser_test.cc \
-
-HTTP_PARSER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTP_PARSER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http_parser_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/http_parser_test: $(HTTP_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTP_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/http_parser_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/parser_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_http_parser_test: $(HTTP_PARSER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTP_PARSER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTP_REQUEST_FUZZER_TEST_SRC = \
-    test/core/http/request_fuzzer.cc \
-
-HTTP_REQUEST_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTP_REQUEST_FUZZER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http_request_fuzzer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/http_request_fuzzer_test: $(HTTP_REQUEST_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(HTTP_REQUEST_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/http_request_fuzzer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/request_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_http_request_fuzzer_test: $(HTTP_REQUEST_FUZZER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTP_REQUEST_FUZZER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTP_RESPONSE_FUZZER_TEST_SRC = \
-    test/core/http/response_fuzzer.cc \
-
-HTTP_RESPONSE_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTP_RESPONSE_FUZZER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http_response_fuzzer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/http_response_fuzzer_test: $(HTTP_RESPONSE_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(HTTP_RESPONSE_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/http_response_fuzzer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/response_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_http_response_fuzzer_test: $(HTTP_RESPONSE_FUZZER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTP_RESPONSE_FUZZER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTPCLI_FORMAT_REQUEST_TEST_SRC = \
-    test/core/http/format_request_test.cc \
-
-HTTPCLI_FORMAT_REQUEST_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTPCLI_FORMAT_REQUEST_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/httpcli_format_request_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/httpcli_format_request_test: $(HTTPCLI_FORMAT_REQUEST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTPCLI_FORMAT_REQUEST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/httpcli_format_request_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/format_request_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_httpcli_format_request_test: $(HTTPCLI_FORMAT_REQUEST_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTPCLI_FORMAT_REQUEST_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTPCLI_TEST_SRC = \
-    test/core/http/httpcli_test.cc \
-
-HTTPCLI_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTPCLI_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/httpcli_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/httpcli_test: $(HTTPCLI_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTPCLI_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/httpcli_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/httpcli_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_httpcli_test: $(HTTPCLI_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTPCLI_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTPSCLI_TEST_SRC = \
-    test/core/http/httpscli_test.cc \
-
-HTTPSCLI_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTPSCLI_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/httpscli_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/httpscli_test: $(HTTPSCLI_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTPSCLI_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/httpscli_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/httpscli_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_httpscli_test: $(HTTPSCLI_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTPSCLI_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-INIT_TEST_SRC = \
-    test/core/surface/init_test.cc \
-
-INIT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INIT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/init_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/init_test: $(INIT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(INIT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/init_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/init_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_init_test: $(INIT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INIT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-INVALID_CALL_ARGUMENT_TEST_SRC = \
-    test/core/end2end/invalid_call_argument_test.cc \
-
-INVALID_CALL_ARGUMENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INVALID_CALL_ARGUMENT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/invalid_call_argument_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/invalid_call_argument_test: $(INVALID_CALL_ARGUMENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(INVALID_CALL_ARGUMENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/invalid_call_argument_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/invalid_call_argument_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_invalid_call_argument_test: $(INVALID_CALL_ARGUMENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INVALID_CALL_ARGUMENT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_FUZZER_TEST_SRC = \
-    test/core/json/fuzzer.cc \
-
-JSON_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_FUZZER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_fuzzer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_fuzzer_test: $(JSON_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(JSON_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/json_fuzzer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_fuzzer_test: $(JSON_FUZZER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_FUZZER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_REWRITE_SRC = \
-    test/core/json/json_rewrite.cc \
-
-JSON_REWRITE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_REWRITE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_rewrite: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_rewrite: $(JSON_REWRITE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(JSON_REWRITE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_rewrite
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/json_rewrite.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_rewrite: $(JSON_REWRITE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_REWRITE_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_REWRITE_TEST_SRC = \
-    test/core/json/json_rewrite_test.cc \
-
-JSON_REWRITE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_REWRITE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_rewrite_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_rewrite_test: $(JSON_REWRITE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(JSON_REWRITE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_rewrite_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/json_rewrite_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_rewrite_test: $(JSON_REWRITE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_REWRITE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_STREAM_ERROR_TEST_SRC = \
-    test/core/json/json_stream_error_test.cc \
-
-JSON_STREAM_ERROR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_STREAM_ERROR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_stream_error_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_stream_error_test: $(JSON_STREAM_ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(JSON_STREAM_ERROR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_stream_error_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/json_stream_error_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_stream_error_test: $(JSON_STREAM_ERROR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_STREAM_ERROR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_TEST_SRC = \
-    test/core/json/json_test.cc \
-
-JSON_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_test: $(JSON_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(JSON_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/json_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_test: $(JSON_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-LAME_CLIENT_TEST_SRC = \
-    test/core/surface/lame_client_test.cc \
-
-LAME_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LAME_CLIENT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/lame_client_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/lame_client_test: $(LAME_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(LAME_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/lame_client_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/lame_client_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_lame_client_test: $(LAME_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LAME_CLIENT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-LB_POLICIES_TEST_SRC = \
-    test/core/client_channel/lb_policies_test.cc \
-
-LB_POLICIES_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LB_POLICIES_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/lb_policies_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/lb_policies_test: $(LB_POLICIES_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(LB_POLICIES_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/lb_policies_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/lb_policies_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_lb_policies_test: $(LB_POLICIES_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LB_POLICIES_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-LOAD_FILE_TEST_SRC = \
-    test/core/iomgr/load_file_test.cc \
-
-LOAD_FILE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LOAD_FILE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/load_file_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/load_file_test: $(LOAD_FILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(LOAD_FILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/load_file_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/load_file_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_load_file_test: $(LOAD_FILE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LOAD_FILE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-LOW_LEVEL_PING_PONG_BENCHMARK_SRC = \
-    test/core/network_benchmarks/low_level_ping_pong.cc \
-
-LOW_LEVEL_PING_PONG_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LOW_LEVEL_PING_PONG_BENCHMARK_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark: $(LOW_LEVEL_PING_PONG_BENCHMARK_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(LOW_LEVEL_PING_PONG_BENCHMARK_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/network_benchmarks/low_level_ping_pong.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_low_level_ping_pong_benchmark: $(LOW_LEVEL_PING_PONG_BENCHMARK_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(LOW_LEVEL_PING_PONG_BENCHMARK_OBJS:.o=.dep)
-endif
-endif
-
-
-MEMORY_PROFILE_CLIENT_SRC = \
-    test/core/memory_usage/client.cc \
-
-MEMORY_PROFILE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/memory_profile_client: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/memory_profile_client: $(MEMORY_PROFILE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_profile_client
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/memory_usage/client.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_memory_profile_client: $(MEMORY_PROFILE_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MEMORY_PROFILE_CLIENT_OBJS:.o=.dep)
-endif
-endif
-
-
-MEMORY_PROFILE_SERVER_SRC = \
-    test/core/memory_usage/server.cc \
-
-MEMORY_PROFILE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/memory_profile_server: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/memory_profile_server: $(MEMORY_PROFILE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_profile_server
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/memory_usage/server.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_memory_profile_server: $(MEMORY_PROFILE_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MEMORY_PROFILE_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-MEMORY_PROFILE_TEST_SRC = \
-    test/core/memory_usage/memory_usage_test.cc \
-
-MEMORY_PROFILE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/memory_profile_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/memory_profile_test: $(MEMORY_PROFILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/memory_profile_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/memory_usage/memory_usage_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_memory_profile_test: $(MEMORY_PROFILE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MEMORY_PROFILE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-MESSAGE_COMPRESS_TEST_SRC = \
-    test/core/compression/message_compress_test.cc \
-
-MESSAGE_COMPRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MESSAGE_COMPRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/message_compress_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/message_compress_test: $(MESSAGE_COMPRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MESSAGE_COMPRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/message_compress_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/compression/message_compress_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_message_compress_test: $(MESSAGE_COMPRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MESSAGE_COMPRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-MINIMAL_STACK_IS_MINIMAL_TEST_SRC = \
-    test/core/channel/minimal_stack_is_minimal_test.cc \
-
-MINIMAL_STACK_IS_MINIMAL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MINIMAL_STACK_IS_MINIMAL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test: $(MINIMAL_STACK_IS_MINIMAL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MINIMAL_STACK_IS_MINIMAL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/channel/minimal_stack_is_minimal_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_minimal_stack_is_minimal_test: $(MINIMAL_STACK_IS_MINIMAL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MINIMAL_STACK_IS_MINIMAL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-MULTIPLE_SERVER_QUEUES_TEST_SRC = \
-    test/core/end2end/multiple_server_queues_test.cc \
-
-MULTIPLE_SERVER_QUEUES_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MULTIPLE_SERVER_QUEUES_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/multiple_server_queues_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/multiple_server_queues_test: $(MULTIPLE_SERVER_QUEUES_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MULTIPLE_SERVER_QUEUES_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/multiple_server_queues_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/multiple_server_queues_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_multiple_server_queues_test: $(MULTIPLE_SERVER_QUEUES_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MULTIPLE_SERVER_QUEUES_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-MURMUR_HASH_TEST_SRC = \
-    test/core/gpr/murmur_hash_test.cc \
-
-MURMUR_HASH_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MURMUR_HASH_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/murmur_hash_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/murmur_hash_test: $(MURMUR_HASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(MURMUR_HASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/murmur_hash_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr/murmur_hash_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_murmur_hash_test: $(MURMUR_HASH_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MURMUR_HASH_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-NANOPB_FUZZER_RESPONSE_TEST_SRC = \
-    test/core/nanopb/fuzzer_response.cc \
-
-NANOPB_FUZZER_RESPONSE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NANOPB_FUZZER_RESPONSE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test: $(NANOPB_FUZZER_RESPONSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(NANOPB_FUZZER_RESPONSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/nanopb/fuzzer_response.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_nanopb_fuzzer_response_test: $(NANOPB_FUZZER_RESPONSE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NANOPB_FUZZER_RESPONSE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-NANOPB_FUZZER_SERVERLIST_TEST_SRC = \
-    test/core/nanopb/fuzzer_serverlist.cc \
-
-NANOPB_FUZZER_SERVERLIST_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NANOPB_FUZZER_SERVERLIST_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test: $(NANOPB_FUZZER_SERVERLIST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(NANOPB_FUZZER_SERVERLIST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/nanopb/fuzzer_serverlist.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_nanopb_fuzzer_serverlist_test: $(NANOPB_FUZZER_SERVERLIST_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NANOPB_FUZZER_SERVERLIST_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-NO_SERVER_TEST_SRC = \
-    test/core/end2end/no_server_test.cc \
-
-NO_SERVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NO_SERVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/no_server_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/no_server_test: $(NO_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(NO_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/no_server_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/no_server_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_no_server_test: $(NO_SERVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NO_SERVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_SRC = \
-    test/core/surface/num_external_connectivity_watchers_test.cc \
-
-NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test: $(NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/num_external_connectivity_watchers_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/num_external_connectivity_watchers_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_num_external_connectivity_watchers_test: $(NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NUM_EXTERNAL_CONNECTIVITY_WATCHERS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-PARSE_ADDRESS_TEST_SRC = \
-    test/core/client_channel/parse_address_test.cc \
-
-PARSE_ADDRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PARSE_ADDRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/parse_address_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/parse_address_test: $(PARSE_ADDRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(PARSE_ADDRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/parse_address_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/parse_address_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_parse_address_test: $(PARSE_ADDRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PARSE_ADDRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-PERCENT_DECODE_FUZZER_SRC = \
-    test/core/slice/percent_decode_fuzzer.cc \
-
-PERCENT_DECODE_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PERCENT_DECODE_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/percent_decode_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/percent_decode_fuzzer: $(PERCENT_DECODE_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(PERCENT_DECODE_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/percent_decode_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/percent_decode_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_percent_decode_fuzzer: $(PERCENT_DECODE_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PERCENT_DECODE_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-PERCENT_ENCODE_FUZZER_SRC = \
-    test/core/slice/percent_encode_fuzzer.cc \
-
-PERCENT_ENCODE_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PERCENT_ENCODE_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/percent_encode_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/percent_encode_fuzzer: $(PERCENT_ENCODE_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(PERCENT_ENCODE_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/percent_encode_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/percent_encode_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_percent_encode_fuzzer: $(PERCENT_ENCODE_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PERCENT_ENCODE_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-PERCENT_ENCODING_TEST_SRC = \
-    test/core/slice/percent_encoding_test.cc \
-
-PERCENT_ENCODING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PERCENT_ENCODING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/percent_encoding_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/percent_encoding_test: $(PERCENT_ENCODING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(PERCENT_ENCODING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/percent_encoding_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/percent_encoding_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_percent_encoding_test: $(PERCENT_ENCODING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PERCENT_ENCODING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-POLLSET_SET_TEST_SRC = \
-    test/core/iomgr/pollset_set_test.cc \
-
-POLLSET_SET_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(POLLSET_SET_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/pollset_set_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/pollset_set_test: $(POLLSET_SET_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(POLLSET_SET_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/pollset_set_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/pollset_set_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_pollset_set_test: $(POLLSET_SET_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(POLLSET_SET_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOLVE_ADDRESS_POSIX_TEST_SRC = \
-    test/core/iomgr/resolve_address_posix_test.cc \
-
-RESOLVE_ADDRESS_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVE_ADDRESS_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolve_address_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/resolve_address_posix_test: $(RESOLVE_ADDRESS_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(RESOLVE_ADDRESS_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/resolve_address_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/resolve_address_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_resolve_address_posix_test: $(RESOLVE_ADDRESS_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVE_ADDRESS_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOLVE_ADDRESS_TEST_SRC = \
-    test/core/iomgr/resolve_address_test.cc \
-
-RESOLVE_ADDRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVE_ADDRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolve_address_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/resolve_address_test: $(RESOLVE_ADDRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(RESOLVE_ADDRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/resolve_address_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/resolve_address_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_resolve_address_test: $(RESOLVE_ADDRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVE_ADDRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOURCE_QUOTA_TEST_SRC = \
-    test/core/iomgr/resource_quota_test.cc \
-
-RESOURCE_QUOTA_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOURCE_QUOTA_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resource_quota_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/resource_quota_test: $(RESOURCE_QUOTA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(RESOURCE_QUOTA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/resource_quota_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/resource_quota_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_resource_quota_test: $(RESOURCE_QUOTA_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOURCE_QUOTA_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SECURE_CHANNEL_CREATE_TEST_SRC = \
-    test/core/surface/secure_channel_create_test.cc \
-
-SECURE_CHANNEL_CREATE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SECURE_CHANNEL_CREATE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/secure_channel_create_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/secure_channel_create_test: $(SECURE_CHANNEL_CREATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SECURE_CHANNEL_CREATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/secure_channel_create_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/secure_channel_create_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_secure_channel_create_test: $(SECURE_CHANNEL_CREATE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SECURE_CHANNEL_CREATE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SECURE_ENDPOINT_TEST_SRC = \
-    test/core/security/secure_endpoint_test.cc \
-
-SECURE_ENDPOINT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SECURE_ENDPOINT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/secure_endpoint_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/secure_endpoint_test: $(SECURE_ENDPOINT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SECURE_ENDPOINT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/secure_endpoint_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/secure_endpoint_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_secure_endpoint_test: $(SECURE_ENDPOINT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SECURE_ENDPOINT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SEQUENTIAL_CONNECTIVITY_TEST_SRC = \
-    test/core/surface/sequential_connectivity_test.cc \
-
-SEQUENTIAL_CONNECTIVITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SEQUENTIAL_CONNECTIVITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/sequential_connectivity_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/sequential_connectivity_test: $(SEQUENTIAL_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SEQUENTIAL_CONNECTIVITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/sequential_connectivity_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/sequential_connectivity_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_sequential_connectivity_test: $(SEQUENTIAL_CONNECTIVITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SEQUENTIAL_CONNECTIVITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_CHTTP2_TEST_SRC = \
-    test/core/surface/server_chttp2_test.cc \
-
-SERVER_CHTTP2_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_CHTTP2_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_chttp2_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/server_chttp2_test: $(SERVER_CHTTP2_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SERVER_CHTTP2_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/server_chttp2_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/server_chttp2_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_chttp2_test: $(SERVER_CHTTP2_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_CHTTP2_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_FUZZER_SRC = \
-    test/core/end2end/fuzzers/server_fuzzer.cc \
-
-SERVER_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/server_fuzzer: $(SERVER_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/server_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_fuzzer: $(SERVER_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_TEST_SRC = \
-    test/core/surface/server_test.cc \
-
-SERVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/server_test: $(SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/server_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/server_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_test: $(SERVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SLICE_BUFFER_TEST_SRC = \
-    test/core/slice/slice_buffer_test.cc \
-
-SLICE_BUFFER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SLICE_BUFFER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/slice_buffer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/slice_buffer_test: $(SLICE_BUFFER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SLICE_BUFFER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/slice_buffer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/slice_buffer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_slice_buffer_test: $(SLICE_BUFFER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SLICE_BUFFER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SLICE_HASH_TABLE_TEST_SRC = \
-    test/core/slice/slice_hash_table_test.cc \
-
-SLICE_HASH_TABLE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SLICE_HASH_TABLE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/slice_hash_table_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/slice_hash_table_test: $(SLICE_HASH_TABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SLICE_HASH_TABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/slice_hash_table_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/slice_hash_table_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_slice_hash_table_test: $(SLICE_HASH_TABLE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SLICE_HASH_TABLE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SLICE_STRING_HELPERS_TEST_SRC = \
-    test/core/slice/slice_string_helpers_test.cc \
-
-SLICE_STRING_HELPERS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SLICE_STRING_HELPERS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/slice_string_helpers_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/slice_string_helpers_test: $(SLICE_STRING_HELPERS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SLICE_STRING_HELPERS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/slice_string_helpers_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/slice_string_helpers_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_slice_string_helpers_test: $(SLICE_STRING_HELPERS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SLICE_STRING_HELPERS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SLICE_TEST_SRC = \
-    test/core/slice/slice_test.cc \
-
-SLICE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SLICE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/slice_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/slice_test: $(SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/slice_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/slice_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_slice_test: $(SLICE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SLICE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SOCKADDR_RESOLVER_TEST_SRC = \
-    test/core/client_channel/resolvers/sockaddr_resolver_test.cc \
-
-SOCKADDR_RESOLVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SOCKADDR_RESOLVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/sockaddr_resolver_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/sockaddr_resolver_test: $(SOCKADDR_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SOCKADDR_RESOLVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/sockaddr_resolver_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/resolvers/sockaddr_resolver_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_sockaddr_resolver_test: $(SOCKADDR_RESOLVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SOCKADDR_RESOLVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SOCKADDR_UTILS_TEST_SRC = \
-    test/core/iomgr/sockaddr_utils_test.cc \
-
-SOCKADDR_UTILS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SOCKADDR_UTILS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/sockaddr_utils_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/sockaddr_utils_test: $(SOCKADDR_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SOCKADDR_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/sockaddr_utils_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/sockaddr_utils_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_sockaddr_utils_test: $(SOCKADDR_UTILS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SOCKADDR_UTILS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SOCKET_UTILS_TEST_SRC = \
-    test/core/iomgr/socket_utils_test.cc \
-
-SOCKET_UTILS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SOCKET_UTILS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/socket_utils_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/socket_utils_test: $(SOCKET_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SOCKET_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/socket_utils_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/socket_utils_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_socket_utils_test: $(SOCKET_UTILS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SOCKET_UTILS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SSL_SERVER_FUZZER_SRC = \
-    test/core/security/ssl_server_fuzzer.cc \
-
-SSL_SERVER_FUZZER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SSL_SERVER_FUZZER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ssl_server_fuzzer: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/ssl_server_fuzzer: $(SSL_SERVER_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SSL_SERVER_FUZZER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/ssl_server_fuzzer
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/ssl_server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_ssl_server_fuzzer: $(SSL_SERVER_FUZZER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SSL_SERVER_FUZZER_OBJS:.o=.dep)
-endif
-endif
-
-
-SSL_TRANSPORT_SECURITY_TEST_SRC = \
-    test/core/tsi/ssl_transport_security_test.cc \
-    test/core/tsi/transport_security_test_lib.cc \
-
-SSL_TRANSPORT_SECURITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SSL_TRANSPORT_SECURITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ssl_transport_security_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/ssl_transport_security_test: $(SSL_TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SSL_TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/ssl_transport_security_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/tsi/ssl_transport_security_test.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-$(OBJDIR)/$(CONFIG)/test/core/tsi/transport_security_test_lib.o:  $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_ssl_transport_security_test: $(SSL_TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SSL_TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STATUS_CONVERSION_TEST_SRC = \
-    test/core/transport/status_conversion_test.cc \
-
-STATUS_CONVERSION_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STATUS_CONVERSION_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/status_conversion_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/status_conversion_test: $(STATUS_CONVERSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(STATUS_CONVERSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/status_conversion_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/status_conversion_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_status_conversion_test: $(STATUS_CONVERSION_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STATUS_CONVERSION_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STREAM_COMPRESSION_TEST_SRC = \
-    test/core/compression/stream_compression_test.cc \
-
-STREAM_COMPRESSION_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STREAM_COMPRESSION_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/stream_compression_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/stream_compression_test: $(STREAM_COMPRESSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(STREAM_COMPRESSION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/stream_compression_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/compression/stream_compression_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_stream_compression_test: $(STREAM_COMPRESSION_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STREAM_COMPRESSION_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STREAM_OWNED_SLICE_TEST_SRC = \
-    test/core/transport/stream_owned_slice_test.cc \
-
-STREAM_OWNED_SLICE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STREAM_OWNED_SLICE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/stream_owned_slice_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/stream_owned_slice_test: $(STREAM_OWNED_SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(STREAM_OWNED_SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/stream_owned_slice_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/stream_owned_slice_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_stream_owned_slice_test: $(STREAM_OWNED_SLICE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STREAM_OWNED_SLICE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TCP_CLIENT_POSIX_TEST_SRC = \
-    test/core/iomgr/tcp_client_posix_test.cc \
-
-TCP_CLIENT_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TCP_CLIENT_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/tcp_client_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/tcp_client_posix_test: $(TCP_CLIENT_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TCP_CLIENT_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/tcp_client_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/tcp_client_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_tcp_client_posix_test: $(TCP_CLIENT_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TCP_CLIENT_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TCP_CLIENT_UV_TEST_SRC = \
-    test/core/iomgr/tcp_client_uv_test.cc \
-
-TCP_CLIENT_UV_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TCP_CLIENT_UV_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/tcp_client_uv_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/tcp_client_uv_test: $(TCP_CLIENT_UV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TCP_CLIENT_UV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/tcp_client_uv_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/tcp_client_uv_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_tcp_client_uv_test: $(TCP_CLIENT_UV_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TCP_CLIENT_UV_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TCP_POSIX_TEST_SRC = \
-    test/core/iomgr/tcp_posix_test.cc \
-
-TCP_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TCP_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/tcp_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/tcp_posix_test: $(TCP_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TCP_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/tcp_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/tcp_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_tcp_posix_test: $(TCP_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TCP_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TCP_SERVER_POSIX_TEST_SRC = \
-    test/core/iomgr/tcp_server_posix_test.cc \
-
-TCP_SERVER_POSIX_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TCP_SERVER_POSIX_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/tcp_server_posix_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/tcp_server_posix_test: $(TCP_SERVER_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TCP_SERVER_POSIX_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/tcp_server_posix_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/tcp_server_posix_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_tcp_server_posix_test: $(TCP_SERVER_POSIX_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TCP_SERVER_POSIX_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TCP_SERVER_UV_TEST_SRC = \
-    test/core/iomgr/tcp_server_uv_test.cc \
-
-TCP_SERVER_UV_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TCP_SERVER_UV_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/tcp_server_uv_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/tcp_server_uv_test: $(TCP_SERVER_UV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TCP_SERVER_UV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/tcp_server_uv_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/tcp_server_uv_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_tcp_server_uv_test: $(TCP_SERVER_UV_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TCP_SERVER_UV_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TIME_AVERAGED_STATS_TEST_SRC = \
-    test/core/iomgr/time_averaged_stats_test.cc \
-
-TIME_AVERAGED_STATS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TIME_AVERAGED_STATS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/time_averaged_stats_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/time_averaged_stats_test: $(TIME_AVERAGED_STATS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TIME_AVERAGED_STATS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/time_averaged_stats_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/time_averaged_stats_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_time_averaged_stats_test: $(TIME_AVERAGED_STATS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TIME_AVERAGED_STATS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TIMEOUT_ENCODING_TEST_SRC = \
-    test/core/transport/timeout_encoding_test.cc \
-
-TIMEOUT_ENCODING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TIMEOUT_ENCODING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/timeout_encoding_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/timeout_encoding_test: $(TIMEOUT_ENCODING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TIMEOUT_ENCODING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/timeout_encoding_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/timeout_encoding_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_timeout_encoding_test: $(TIMEOUT_ENCODING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TIMEOUT_ENCODING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TIMER_HEAP_TEST_SRC = \
-    test/core/iomgr/timer_heap_test.cc \
-
-TIMER_HEAP_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TIMER_HEAP_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/timer_heap_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/timer_heap_test: $(TIMER_HEAP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TIMER_HEAP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/timer_heap_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/timer_heap_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_timer_heap_test: $(TIMER_HEAP_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TIMER_HEAP_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TIMER_LIST_TEST_SRC = \
-    test/core/iomgr/timer_list_test.cc \
-
-TIMER_LIST_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TIMER_LIST_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/timer_list_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/timer_list_test: $(TIMER_LIST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TIMER_LIST_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/timer_list_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/timer_list_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_timer_list_test: $(TIMER_LIST_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TIMER_LIST_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TRANSPORT_CONNECTIVITY_STATE_TEST_SRC = \
-    test/core/transport/connectivity_state_test.cc \
-
-TRANSPORT_CONNECTIVITY_STATE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TRANSPORT_CONNECTIVITY_STATE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/transport_connectivity_state_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/transport_connectivity_state_test: $(TRANSPORT_CONNECTIVITY_STATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TRANSPORT_CONNECTIVITY_STATE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/transport_connectivity_state_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/connectivity_state_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_transport_connectivity_state_test: $(TRANSPORT_CONNECTIVITY_STATE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TRANSPORT_CONNECTIVITY_STATE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TRANSPORT_METADATA_TEST_SRC = \
-    test/core/transport/metadata_test.cc \
-
-TRANSPORT_METADATA_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TRANSPORT_METADATA_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/transport_metadata_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/transport_metadata_test: $(TRANSPORT_METADATA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TRANSPORT_METADATA_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/transport_metadata_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/metadata_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_transport_metadata_test: $(TRANSPORT_METADATA_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TRANSPORT_METADATA_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TRANSPORT_SECURITY_TEST_SRC = \
-    test/core/tsi/transport_security_test.cc \
-
-TRANSPORT_SECURITY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TRANSPORT_SECURITY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/transport_security_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/transport_security_test: $(TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(TRANSPORT_SECURITY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/transport_security_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/tsi/transport_security_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_transport_security_test: $(TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TRANSPORT_SECURITY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-UDP_SERVER_TEST_SRC = \
-    test/core/iomgr/udp_server_test.cc \
-
-UDP_SERVER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(UDP_SERVER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/udp_server_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/udp_server_test: $(UDP_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(UDP_SERVER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/udp_server_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/udp_server_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_udp_server_test: $(UDP_SERVER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(UDP_SERVER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-URI_FUZZER_TEST_SRC = \
-    test/core/client_channel/uri_fuzzer_test.cc \
-
-URI_FUZZER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/uri_fuzzer_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/uri_fuzzer_test: $(URI_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(URI_FUZZER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -lFuzzer -o $(BINDIR)/$(CONFIG)/uri_fuzzer_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_fuzzer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_uri_fuzzer_test: $(URI_FUZZER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(URI_FUZZER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-URI_PARSER_TEST_SRC = \
-    test/core/client_channel/uri_parser_test.cc \
-
-URI_PARSER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_PARSER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/uri_parser_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/uri_parser_test: $(URI_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(URI_PARSER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/uri_parser_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_parser_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_uri_parser_test: $(URI_PARSER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(URI_PARSER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-WAKEUP_FD_CV_TEST_SRC = \
-    test/core/iomgr/wakeup_fd_cv_test.cc \
-
-WAKEUP_FD_CV_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(WAKEUP_FD_CV_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/wakeup_fd_cv_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/wakeup_fd_cv_test: $(WAKEUP_FD_CV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(WAKEUP_FD_CV_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/wakeup_fd_cv_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/wakeup_fd_cv_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_wakeup_fd_cv_test: $(WAKEUP_FD_CV_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(WAKEUP_FD_CV_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ALARM_CPP_TEST_SRC = \
-    test/cpp/common/alarm_cpp_test.cc \
-
-ALARM_CPP_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ALARM_CPP_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/alarm_cpp_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/alarm_cpp_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/alarm_cpp_test: $(PROTOBUF_DEP) $(ALARM_CPP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(ALARM_CPP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/alarm_cpp_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/common/alarm_cpp_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_alarm_cpp_test: $(ALARM_CPP_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ALARM_CPP_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ASYNC_END2END_TEST_SRC = \
-    test/cpp/end2end/async_end2end_test.cc \
-
-ASYNC_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ASYNC_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/async_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/async_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/async_end2end_test: $(PROTOBUF_DEP) $(ASYNC_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(ASYNC_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/async_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/async_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_async_end2end_test: $(ASYNC_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ASYNC_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-AUTH_PROPERTY_ITERATOR_TEST_SRC = \
-    test/cpp/common/auth_property_iterator_test.cc \
-
-AUTH_PROPERTY_ITERATOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(AUTH_PROPERTY_ITERATOR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/auth_property_iterator_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/auth_property_iterator_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/auth_property_iterator_test: $(PROTOBUF_DEP) $(AUTH_PROPERTY_ITERATOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(AUTH_PROPERTY_ITERATOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/auth_property_iterator_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/common/auth_property_iterator_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_auth_property_iterator_test: $(AUTH_PROPERTY_ITERATOR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(AUTH_PROPERTY_ITERATOR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BACKOFF_TEST_SRC = \
-    test/core/backoff/backoff_test.cc \
-
-BACKOFF_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BACKOFF_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/backoff_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/backoff_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/backoff_test: $(PROTOBUF_DEP) $(BACKOFF_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BACKOFF_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/backoff_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/backoff/backoff_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_backoff_test: $(BACKOFF_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BACKOFF_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BDP_ESTIMATOR_TEST_SRC = \
-    test/core/transport/bdp_estimator_test.cc \
-
-BDP_ESTIMATOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BDP_ESTIMATOR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bdp_estimator_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bdp_estimator_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bdp_estimator_test: $(PROTOBUF_DEP) $(BDP_ESTIMATOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BDP_ESTIMATOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bdp_estimator_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/bdp_estimator_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bdp_estimator_test: $(BDP_ESTIMATOR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BDP_ESTIMATOR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_ARENA_SRC = \
-    test/cpp/microbenchmarks/bm_arena.cc \
-
-BM_ARENA_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_ARENA_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_arena: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_arena: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_arena: $(PROTOBUF_DEP) $(BM_ARENA_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_ARENA_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_arena
-
-endif
-
-endif
-
-$(BM_ARENA_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_arena.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_arena: $(BM_ARENA_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_ARENA_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CALL_CREATE_SRC = \
-    test/cpp/microbenchmarks/bm_call_create.cc \
-
-BM_CALL_CREATE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CALL_CREATE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_call_create: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_call_create: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_call_create: $(PROTOBUF_DEP) $(BM_CALL_CREATE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CALL_CREATE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_call_create
-
-endif
-
-endif
-
-$(BM_CALL_CREATE_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_call_create.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_call_create: $(BM_CALL_CREATE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CALL_CREATE_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CHTTP2_HPACK_SRC = \
-    test/cpp/microbenchmarks/bm_chttp2_hpack.cc \
-
-BM_CHTTP2_HPACK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CHTTP2_HPACK_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_hpack: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_hpack: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_hpack: $(PROTOBUF_DEP) $(BM_CHTTP2_HPACK_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CHTTP2_HPACK_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_chttp2_hpack
-
-endif
-
-endif
-
-$(BM_CHTTP2_HPACK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_chttp2_hpack.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_chttp2_hpack: $(BM_CHTTP2_HPACK_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CHTTP2_HPACK_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CHTTP2_TRANSPORT_SRC = \
-    test/cpp/microbenchmarks/bm_chttp2_transport.cc \
-
-BM_CHTTP2_TRANSPORT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CHTTP2_TRANSPORT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_transport: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_transport: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_chttp2_transport: $(PROTOBUF_DEP) $(BM_CHTTP2_TRANSPORT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CHTTP2_TRANSPORT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_chttp2_transport
-
-endif
-
-endif
-
-$(BM_CHTTP2_TRANSPORT_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_chttp2_transport.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_chttp2_transport: $(BM_CHTTP2_TRANSPORT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CHTTP2_TRANSPORT_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CLOSURE_SRC = \
-    test/cpp/microbenchmarks/bm_closure.cc \
-
-BM_CLOSURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CLOSURE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_closure: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_closure: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_closure: $(PROTOBUF_DEP) $(BM_CLOSURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CLOSURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_closure
-
-endif
-
-endif
-
-$(BM_CLOSURE_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_closure.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_closure: $(BM_CLOSURE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CLOSURE_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CQ_SRC = \
-    test/cpp/microbenchmarks/bm_cq.cc \
-
-BM_CQ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CQ_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_cq: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_cq: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_cq: $(PROTOBUF_DEP) $(BM_CQ_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CQ_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_cq
-
-endif
-
-endif
-
-$(BM_CQ_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_cq.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_cq: $(BM_CQ_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CQ_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_CQ_MULTIPLE_THREADS_SRC = \
-    test/cpp/microbenchmarks/bm_cq_multiple_threads.cc \
-
-BM_CQ_MULTIPLE_THREADS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_CQ_MULTIPLE_THREADS_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_cq_multiple_threads: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_cq_multiple_threads: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_cq_multiple_threads: $(PROTOBUF_DEP) $(BM_CQ_MULTIPLE_THREADS_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_CQ_MULTIPLE_THREADS_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_cq_multiple_threads
-
-endif
-
-endif
-
-$(BM_CQ_MULTIPLE_THREADS_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_cq_multiple_threads.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_cq_multiple_threads: $(BM_CQ_MULTIPLE_THREADS_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_CQ_MULTIPLE_THREADS_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_ERROR_SRC = \
-    test/cpp/microbenchmarks/bm_error.cc \
-
-BM_ERROR_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_ERROR_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_error: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_error: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_error: $(PROTOBUF_DEP) $(BM_ERROR_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_ERROR_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_error
-
-endif
-
-endif
-
-$(BM_ERROR_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_error.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_error: $(BM_ERROR_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_ERROR_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_FULLSTACK_STREAMING_PING_PONG_SRC = \
-    test/cpp/microbenchmarks/bm_fullstack_streaming_ping_pong.cc \
-
-BM_FULLSTACK_STREAMING_PING_PONG_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_FULLSTACK_STREAMING_PING_PONG_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong: $(PROTOBUF_DEP) $(BM_FULLSTACK_STREAMING_PING_PONG_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_FULLSTACK_STREAMING_PING_PONG_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_ping_pong
-
-endif
-
-endif
-
-$(BM_FULLSTACK_STREAMING_PING_PONG_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_fullstack_streaming_ping_pong.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_fullstack_streaming_ping_pong: $(BM_FULLSTACK_STREAMING_PING_PONG_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_FULLSTACK_STREAMING_PING_PONG_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_FULLSTACK_STREAMING_PUMP_SRC = \
-    test/cpp/microbenchmarks/bm_fullstack_streaming_pump.cc \
-
-BM_FULLSTACK_STREAMING_PUMP_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_FULLSTACK_STREAMING_PUMP_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump: $(PROTOBUF_DEP) $(BM_FULLSTACK_STREAMING_PUMP_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_FULLSTACK_STREAMING_PUMP_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_fullstack_streaming_pump
-
-endif
-
-endif
-
-$(BM_FULLSTACK_STREAMING_PUMP_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_fullstack_streaming_pump.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_fullstack_streaming_pump: $(BM_FULLSTACK_STREAMING_PUMP_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_FULLSTACK_STREAMING_PUMP_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_FULLSTACK_TRICKLE_SRC = \
-    test/cpp/microbenchmarks/bm_fullstack_trickle.cc \
-
-BM_FULLSTACK_TRICKLE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_FULLSTACK_TRICKLE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_trickle: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_trickle: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_trickle: $(PROTOBUF_DEP) $(BM_FULLSTACK_TRICKLE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_FULLSTACK_TRICKLE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_fullstack_trickle
-
-endif
-
-endif
-
-$(BM_FULLSTACK_TRICKLE_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_fullstack_trickle.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_bm_fullstack_trickle: $(BM_FULLSTACK_TRICKLE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_FULLSTACK_TRICKLE_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_FULLSTACK_UNARY_PING_PONG_SRC = \
-    test/cpp/microbenchmarks/bm_fullstack_unary_ping_pong.cc \
-
-BM_FULLSTACK_UNARY_PING_PONG_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_FULLSTACK_UNARY_PING_PONG_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong: $(PROTOBUF_DEP) $(BM_FULLSTACK_UNARY_PING_PONG_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_FULLSTACK_UNARY_PING_PONG_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_fullstack_unary_ping_pong
-
-endif
-
-endif
-
-$(BM_FULLSTACK_UNARY_PING_PONG_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_fullstack_unary_ping_pong.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_fullstack_unary_ping_pong: $(BM_FULLSTACK_UNARY_PING_PONG_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_FULLSTACK_UNARY_PING_PONG_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_METADATA_SRC = \
-    test/cpp/microbenchmarks/bm_metadata.cc \
-
-BM_METADATA_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_METADATA_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_metadata: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_metadata: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_metadata: $(PROTOBUF_DEP) $(BM_METADATA_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_METADATA_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_metadata
-
-endif
-
-endif
-
-$(BM_METADATA_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_metadata.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_metadata: $(BM_METADATA_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_METADATA_OBJS:.o=.dep)
-endif
-endif
-
-
-BM_POLLSET_SRC = \
-    test/cpp/microbenchmarks/bm_pollset.cc \
-
-BM_POLLSET_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BM_POLLSET_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bm_pollset: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/bm_pollset: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/bm_pollset: $(PROTOBUF_DEP) $(BM_POLLSET_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(BM_POLLSET_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/bm_pollset
-
-endif
-
-endif
-
-$(BM_POLLSET_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/bm_pollset.o:  $(LIBDIR)/$(CONFIG)/libgrpc_benchmark.a $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bm_pollset: $(BM_POLLSET_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BM_POLLSET_OBJS:.o=.dep)
-endif
-endif
-
-
-CHANNEL_ARGUMENTS_TEST_SRC = \
-    test/cpp/common/channel_arguments_test.cc \
-
-CHANNEL_ARGUMENTS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHANNEL_ARGUMENTS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/channel_arguments_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/channel_arguments_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/channel_arguments_test: $(PROTOBUF_DEP) $(CHANNEL_ARGUMENTS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_ARGUMENTS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/channel_arguments_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/common/channel_arguments_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_channel_arguments_test: $(CHANNEL_ARGUMENTS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHANNEL_ARGUMENTS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHANNEL_FILTER_TEST_SRC = \
-    test/cpp/common/channel_filter_test.cc \
-
-CHANNEL_FILTER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHANNEL_FILTER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/channel_filter_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/channel_filter_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/channel_filter_test: $(PROTOBUF_DEP) $(CHANNEL_FILTER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_FILTER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/channel_filter_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/common/channel_filter_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_channel_filter_test: $(CHANNEL_FILTER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHANNEL_FILTER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CHTTP2_SETTINGS_TIMEOUT_TEST_SRC = \
-    test/core/transport/chttp2/settings_timeout_test.cc \
-
-CHTTP2_SETTINGS_TIMEOUT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHTTP2_SETTINGS_TIMEOUT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test: $(PROTOBUF_DEP) $(CHTTP2_SETTINGS_TIMEOUT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CHTTP2_SETTINGS_TIMEOUT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/settings_timeout_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_chttp2_settings_timeout_test: $(CHTTP2_SETTINGS_TIMEOUT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CHTTP2_SETTINGS_TIMEOUT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CLI_CALL_TEST_SRC = \
-    test/cpp/util/cli_call_test.cc \
-
-CLI_CALL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLI_CALL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/cli_call_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/cli_call_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/cli_call_test: $(PROTOBUF_DEP) $(CLI_CALL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLI_CALL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/cli_call_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_cli_call_test: $(CLI_CALL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLI_CALL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CLIENT_CHANNEL_STRESS_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc \
-    test/cpp/client/client_channel_stress_test.cc \
-
-CLIENT_CHANNEL_STRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_CHANNEL_STRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_channel_stress_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/client_channel_stress_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/client_channel_stress_test: $(PROTOBUF_DEP) $(CLIENT_CHANNEL_STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLIENT_CHANNEL_STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/client_channel_stress_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/lb/v1/load_balancer.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/client/client_channel_stress_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_channel_stress_test: $(CLIENT_CHANNEL_STRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_CHANNEL_STRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/client/client_channel_stress_test.o: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc
-
-
-CLIENT_CRASH_TEST_SRC = \
-    test/cpp/end2end/client_crash_test.cc \
-
-CLIENT_CRASH_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_CRASH_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_crash_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/client_crash_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/client_crash_test: $(PROTOBUF_DEP) $(CLIENT_CRASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLIENT_CRASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/client_crash_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/client_crash_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_crash_test: $(CLIENT_CRASH_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_CRASH_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CLIENT_CRASH_TEST_SERVER_SRC = \
-    test/cpp/end2end/client_crash_test_server.cc \
-
-CLIENT_CRASH_TEST_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_CRASH_TEST_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_crash_test_server: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/client_crash_test_server: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/client_crash_test_server: $(PROTOBUF_DEP) $(CLIENT_CRASH_TEST_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLIENT_CRASH_TEST_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/client_crash_test_server
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/client_crash_test_server.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_crash_test_server: $(CLIENT_CRASH_TEST_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_CRASH_TEST_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-CLIENT_LB_END2END_TEST_SRC = \
-    test/cpp/end2end/client_lb_end2end_test.cc \
-
-CLIENT_LB_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_LB_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_lb_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/client_lb_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/client_lb_end2end_test: $(PROTOBUF_DEP) $(CLIENT_LB_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CLIENT_LB_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/client_lb_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/client_lb_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_lb_end2end_test: $(CLIENT_LB_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_LB_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CODEGEN_TEST_FULL_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc \
-    test/cpp/codegen/codegen_test_full.cc \
-
-CODEGEN_TEST_FULL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CODEGEN_TEST_FULL_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/codegen_test_full: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/codegen_test_full: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/codegen_test_full: $(PROTOBUF_DEP) $(CODEGEN_TEST_FULL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CODEGEN_TEST_FULL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/codegen_test_full
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/control.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/payloads.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/services.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/stats.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_full.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_codegen_test_full: $(CODEGEN_TEST_FULL_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CODEGEN_TEST_FULL_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_full.o: $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
-
-
-CODEGEN_TEST_MINIMAL_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc \
-    test/cpp/codegen/codegen_test_minimal.cc \
-    src/cpp/codegen/codegen_init.cc \
-
-CODEGEN_TEST_MINIMAL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CODEGEN_TEST_MINIMAL_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/codegen_test_minimal: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/codegen_test_minimal: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/codegen_test_minimal: $(PROTOBUF_DEP) $(CODEGEN_TEST_MINIMAL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CODEGEN_TEST_MINIMAL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/codegen_test_minimal
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/control.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/payloads.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/services.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/stats.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_minimal.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_codegen_test_minimal: $(CODEGEN_TEST_MINIMAL_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CODEGEN_TEST_MINIMAL_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/codegen_test_minimal.o: $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/services.pb.cc $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
-
-
-CREDENTIALS_TEST_SRC = \
-    test/cpp/client/credentials_test.cc \
-
-CREDENTIALS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CREDENTIALS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/credentials_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/credentials_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/credentials_test: $(PROTOBUF_DEP) $(CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CREDENTIALS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/credentials_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/client/credentials_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_credentials_test: $(CREDENTIALS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CREDENTIALS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CXX_BYTE_BUFFER_TEST_SRC = \
-    test/cpp/util/byte_buffer_test.cc \
-
-CXX_BYTE_BUFFER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CXX_BYTE_BUFFER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/cxx_byte_buffer_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/cxx_byte_buffer_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/cxx_byte_buffer_test: $(PROTOBUF_DEP) $(CXX_BYTE_BUFFER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CXX_BYTE_BUFFER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/cxx_byte_buffer_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/byte_buffer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_cxx_byte_buffer_test: $(CXX_BYTE_BUFFER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CXX_BYTE_BUFFER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CXX_SLICE_TEST_SRC = \
-    test/cpp/util/slice_test.cc \
-
-CXX_SLICE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CXX_SLICE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/cxx_slice_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/cxx_slice_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/cxx_slice_test: $(PROTOBUF_DEP) $(CXX_SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CXX_SLICE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/cxx_slice_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/slice_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_cxx_slice_test: $(CXX_SLICE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CXX_SLICE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CXX_STRING_REF_TEST_SRC = \
-    test/cpp/util/string_ref_test.cc \
-
-CXX_STRING_REF_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CXX_STRING_REF_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/cxx_string_ref_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/cxx_string_ref_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/cxx_string_ref_test: $(PROTOBUF_DEP) $(CXX_STRING_REF_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CXX_STRING_REF_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/cxx_string_ref_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/string_ref_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_cxx_string_ref_test: $(CXX_STRING_REF_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CXX_STRING_REF_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-CXX_TIME_TEST_SRC = \
-    test/cpp/util/time_test.cc \
-
-CXX_TIME_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CXX_TIME_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/cxx_time_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/cxx_time_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/cxx_time_test: $(PROTOBUF_DEP) $(CXX_TIME_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CXX_TIME_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/cxx_time_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/time_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_cxx_time_test: $(CXX_TIME_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CXX_TIME_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-END2END_TEST_SRC = \
-    test/cpp/end2end/end2end_test.cc \
-
-END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/end2end_test: $(PROTOBUF_DEP) $(END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_end2end_test: $(END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ERROR_DETAILS_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    test/cpp/util/error_details_test.cc \
-
-ERROR_DETAILS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ERROR_DETAILS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/error_details_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/error_details_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/error_details_test: $(PROTOBUF_DEP) $(ERROR_DETAILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(ERROR_DETAILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/error_details_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo_messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/error_details_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_error_details.a $(LIBDIR)/$(CONFIG)/libgrpc++.a
-
-deps_error_details_test: $(ERROR_DETAILS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ERROR_DETAILS_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/util/error_details_test.o: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-
-
-EXCEPTION_TEST_SRC = \
-    test/cpp/end2end/exception_test.cc \
-
-EXCEPTION_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(EXCEPTION_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/exception_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/exception_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/exception_test: $(PROTOBUF_DEP) $(EXCEPTION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(EXCEPTION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/exception_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/exception_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_exception_test: $(EXCEPTION_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(EXCEPTION_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-FILTER_END2END_TEST_SRC = \
-    test/cpp/end2end/filter_end2end_test.cc \
-
-FILTER_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(FILTER_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/filter_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/filter_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/filter_end2end_test: $(PROTOBUF_DEP) $(FILTER_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(FILTER_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/filter_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/filter_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_filter_end2end_test: $(FILTER_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(FILTER_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GENERIC_END2END_TEST_SRC = \
-    test/cpp/end2end/generic_end2end_test.cc \
-
-GENERIC_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GENERIC_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/generic_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/generic_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/generic_end2end_test: $(PROTOBUF_DEP) $(GENERIC_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GENERIC_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/generic_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/generic_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_generic_end2end_test: $(GENERIC_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GENERIC_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-GOLDEN_FILE_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc \
-    test/cpp/codegen/golden_file_test.cc \
-
-GOLDEN_FILE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GOLDEN_FILE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/golden_file_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/golden_file_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/golden_file_test: $(PROTOBUF_DEP) $(GOLDEN_FILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GOLDEN_FILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/golden_file_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/compiler_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/golden_file_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_golden_file_test: $(GOLDEN_FILE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GOLDEN_FILE_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/golden_file_test.o: $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc
-
-
-GRPC_CLI_SRC = \
-    test/cpp/util/grpc_cli.cc \
-
-GRPC_CLI_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CLI_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_cli: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_cli: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_cli: $(PROTOBUF_DEP) $(GRPC_CLI_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GRPC_CLI_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpc_cli
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/grpc_cli.o:  $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_grpc_cli: $(GRPC_CLI_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CLI_OBJS:.o=.dep)
-endif
-endif
-
-
-GRPC_CPP_PLUGIN_SRC = \
-    src/compiler/cpp_plugin.cc \
-
-GRPC_CPP_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CPP_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_cpp_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_cpp_plugin: $(PROTOBUF_DEP) $(GRPC_CPP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_CPP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_cpp_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/cpp_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_cpp_plugin: $(GRPC_CPP_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CPP_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_CSHARP_PLUGIN_SRC = \
-    src/compiler/csharp_plugin.cc \
-
-GRPC_CSHARP_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_CSHARP_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_csharp_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_csharp_plugin: $(PROTOBUF_DEP) $(GRPC_CSHARP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_CSHARP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_csharp_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/csharp_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_csharp_plugin: $(GRPC_CSHARP_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_CSHARP_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_NODE_PLUGIN_SRC = \
-    src/compiler/node_plugin.cc \
-
-GRPC_NODE_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_NODE_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_node_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_node_plugin: $(PROTOBUF_DEP) $(GRPC_NODE_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_NODE_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_node_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/node_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_node_plugin: $(GRPC_NODE_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_NODE_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_OBJECTIVE_C_PLUGIN_SRC = \
-    src/compiler/objective_c_plugin.cc \
-
-GRPC_OBJECTIVE_C_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_OBJECTIVE_C_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_objective_c_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_objective_c_plugin: $(PROTOBUF_DEP) $(GRPC_OBJECTIVE_C_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_OBJECTIVE_C_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/objective_c_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_objective_c_plugin: $(GRPC_OBJECTIVE_C_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_OBJECTIVE_C_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_PHP_PLUGIN_SRC = \
-    src/compiler/php_plugin.cc \
-
-GRPC_PHP_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_PHP_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_php_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_php_plugin: $(PROTOBUF_DEP) $(GRPC_PHP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_PHP_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_php_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/php_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_php_plugin: $(GRPC_PHP_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_PHP_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_PYTHON_PLUGIN_SRC = \
-    src/compiler/python_plugin.cc \
-
-GRPC_PYTHON_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_PYTHON_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_python_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_python_plugin: $(PROTOBUF_DEP) $(GRPC_PYTHON_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_PYTHON_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_python_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/python_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_python_plugin: $(GRPC_PYTHON_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_PYTHON_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_RUBY_PLUGIN_SRC = \
-    src/compiler/ruby_plugin.cc \
-
-GRPC_RUBY_PLUGIN_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_RUBY_PLUGIN_SRC))))
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_ruby_plugin: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_ruby_plugin: $(PROTOBUF_DEP) $(GRPC_RUBY_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-	$(E) "[HOSTLD]  Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(HOST_LDXX) $(HOST_LDFLAGS) $(GRPC_RUBY_PLUGIN_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(HOST_LDLIBSXX) $(HOST_LDLIBS_PROTOC) $(HOST_LDLIBS) $(HOST_LDLIBS_PROTOC) -o $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/compiler/ruby_plugin.o:  $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
-
-deps_grpc_ruby_plugin: $(GRPC_RUBY_PLUGIN_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(GRPC_RUBY_PLUGIN_OBJS:.o=.dep)
-endif
-
-
-GRPC_TOOL_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    test/cpp/util/grpc_tool_test.cc \
-
-GRPC_TOOL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_TOOL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpc_tool_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpc_tool_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpc_tool_test: $(PROTOBUF_DEP) $(GRPC_TOOL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GRPC_TOOL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpc_tool_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo.o:  $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo_messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/grpc_tool_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_cli_libs.a $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpc_tool_test: $(GRPC_TOOL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPC_TOOL_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/util/grpc_tool_test.o: $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-
-
-GRPCLB_API_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc \
-    test/cpp/grpclb/grpclb_api_test.cc \
-
-GRPCLB_API_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_API_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpclb_api_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpclb_api_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpclb_api_test: $(PROTOBUF_DEP) $(GRPCLB_API_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GRPCLB_API_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpclb_api_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/lb/v1/load_balancer.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_grpclb_api_test: $(GRPCLB_API_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPCLB_API_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc
-
-
-GRPCLB_END2END_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc \
-    test/cpp/end2end/grpclb_end2end_test.cc \
-
-GRPCLB_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpclb_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpclb_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpclb_end2end_test: $(PROTOBUF_DEP) $(GRPCLB_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GRPCLB_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpclb_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/lb/v1/load_balancer.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/grpclb_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpclb_end2end_test: $(GRPCLB_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPCLB_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/grpclb_end2end_test.o: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc
-
-
-GRPCLB_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc \
-    test/cpp/grpclb/grpclb_test.cc \
-
-GRPCLB_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/grpclb_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/grpclb_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/grpclb_test: $(PROTOBUF_DEP) $(GRPCLB_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(GRPCLB_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpclb_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/lb/v1/load_balancer.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_grpclb_test: $(GRPCLB_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GRPCLB_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_test.o: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc
-
-
-H2_SSL_CERT_TEST_SRC = \
-    test/core/end2end/h2_ssl_cert_test.cc \
-
-H2_SSL_CERT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SSL_CERT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_ssl_cert_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/h2_ssl_cert_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/h2_ssl_cert_test: $(PROTOBUF_DEP) $(H2_SSL_CERT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(H2_SSL_CERT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/h2_ssl_cert_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/h2_ssl_cert_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_ssl_cert_test: $(H2_SSL_CERT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SSL_CERT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-HEALTH_SERVICE_END2END_TEST_SRC = \
-    test/cpp/end2end/health_service_end2end_test.cc \
-
-HEALTH_SERVICE_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HEALTH_SERVICE_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/health_service_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/health_service_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/health_service_end2end_test: $(PROTOBUF_DEP) $(HEALTH_SERVICE_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(HEALTH_SERVICE_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/health_service_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/health_service_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_health_service_end2end_test: $(HEALTH_SERVICE_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HEALTH_SERVICE_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http2_client: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/http2_client: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/http2_client:  $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libhttp2_client_main.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/http2_client
-
-endif
-
-endif
-
-
-
-
-HYBRID_END2END_TEST_SRC = \
-    test/cpp/end2end/hybrid_end2end_test.cc \
-
-HYBRID_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HYBRID_END2END_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/hybrid_end2end_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/hybrid_end2end_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/hybrid_end2end_test: $(PROTOBUF_DEP) $(HYBRID_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(HYBRID_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/hybrid_end2end_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/hybrid_end2end_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_hybrid_end2end_test: $(HYBRID_END2END_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HYBRID_END2END_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-INLINED_VECTOR_TEST_SRC = \
-    test/core/gpr++/inlined_vector_test.cc \
-
-INLINED_VECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INLINED_VECTOR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/inlined_vector_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/inlined_vector_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/inlined_vector_test: $(PROTOBUF_DEP) $(INLINED_VECTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(INLINED_VECTOR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/inlined_vector_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/inlined_vector_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_inlined_vector_test: $(INLINED_VECTOR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INLINED_VECTOR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-INPROC_SYNC_UNARY_PING_PONG_TEST_SRC = \
-    test/cpp/qps/inproc_sync_unary_ping_pong_test.cc \
-
-INPROC_SYNC_UNARY_PING_PONG_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INPROC_SYNC_UNARY_PING_PONG_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test: $(PROTOBUF_DEP) $(INPROC_SYNC_UNARY_PING_PONG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(INPROC_SYNC_UNARY_PING_PONG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/inproc_sync_unary_ping_pong_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/inproc_sync_unary_ping_pong_test.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_inproc_sync_unary_ping_pong_test: $(INPROC_SYNC_UNARY_PING_PONG_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INPROC_SYNC_UNARY_PING_PONG_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/interop_client: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/interop_client: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/interop_client:  $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libinterop_client_main.a $(LIBDIR)/$(CONFIG)/libinterop_client_helper.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/interop_client
-
-endif
-
-endif
-
-
-
-
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/interop_server: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/interop_server: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/interop_server:  $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libinterop_server_main.a $(LIBDIR)/$(CONFIG)/libinterop_server_helper.a $(LIBDIR)/$(CONFIG)/libinterop_server_lib.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/interop_server
-
-endif
-
-endif
-
-
-
-
-INTEROP_TEST_SRC = \
-    test/cpp/interop/interop_test.cc \
-
-INTEROP_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INTEROP_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/interop_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/interop_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/interop_test: $(PROTOBUF_DEP) $(INTEROP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(INTEROP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/interop_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_interop_test: $(INTEROP_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INTEROP_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_RUN_LOCALHOST_SRC = \
-    test/cpp/qps/json_run_localhost.cc \
-
-JSON_RUN_LOCALHOST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_RUN_LOCALHOST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_run_localhost: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/json_run_localhost: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/json_run_localhost: $(PROTOBUF_DEP) $(JSON_RUN_LOCALHOST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(JSON_RUN_LOCALHOST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/json_run_localhost
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/json_run_localhost.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_json_run_localhost: $(JSON_RUN_LOCALHOST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_RUN_LOCALHOST_OBJS:.o=.dep)
-endif
-endif
-
-
-MEMORY_TEST_SRC = \
-    test/core/gpr++/memory_test.cc \
-
-MEMORY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/memory_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/memory_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/memory_test: $(PROTOBUF_DEP) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(MEMORY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/memory_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/memory_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_memory_test: $(MEMORY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MEMORY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-METRICS_CLIENT_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc \
-    test/cpp/interop/metrics_client.cc \
-
-METRICS_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(METRICS_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/metrics_client: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/metrics_client: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/metrics_client: $(PROTOBUF_DEP) $(METRICS_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(METRICS_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/metrics_client
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/metrics.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/metrics_client.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_metrics_client: $(METRICS_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(METRICS_CLIENT_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/metrics_client.o: $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc
-
-
-MOCK_TEST_SRC = \
-    test/cpp/end2end/mock_test.cc \
-
-MOCK_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MOCK_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/mock_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/mock_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/mock_test: $(PROTOBUF_DEP) $(MOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(MOCK_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/mock_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/mock_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_mock_test: $(MOCK_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(MOCK_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-NOOP-BENCHMARK_SRC = \
-    test/cpp/microbenchmarks/noop-benchmark.cc \
-
-NOOP-BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NOOP-BENCHMARK_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/noop-benchmark: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/noop-benchmark: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/noop-benchmark: $(PROTOBUF_DEP) $(NOOP-BENCHMARK_OBJS) $(LIBDIR)/$(CONFIG)/libbenchmark.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(NOOP-BENCHMARK_OBJS) $(LIBDIR)/$(CONFIG)/libbenchmark.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/noop-benchmark
-
-endif
-
-endif
-
-$(NOOP-BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
-$(OBJDIR)/$(CONFIG)/test/cpp/microbenchmarks/noop-benchmark.o:  $(LIBDIR)/$(CONFIG)/libbenchmark.a
-
-deps_noop-benchmark: $(NOOP-BENCHMARK_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NOOP-BENCHMARK_OBJS:.o=.dep)
-endif
-endif
-
-
-ORPHANABLE_TEST_SRC = \
-    test/core/gpr++/orphanable_test.cc \
-
-ORPHANABLE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ORPHANABLE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/orphanable_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/orphanable_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/orphanable_test: $(PROTOBUF_DEP) $(ORPHANABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(ORPHANABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/orphanable_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/orphanable_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_orphanable_test: $(ORPHANABLE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(ORPHANABLE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-PROTO_SERVER_REFLECTION_TEST_SRC = \
-    test/cpp/end2end/proto_server_reflection_test.cc \
-
-PROTO_SERVER_REFLECTION_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PROTO_SERVER_REFLECTION_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/proto_server_reflection_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/proto_server_reflection_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/proto_server_reflection_test: $(PROTOBUF_DEP) $(PROTO_SERVER_REFLECTION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(PROTO_SERVER_REFLECTION_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/proto_server_reflection_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/proto_server_reflection_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_proto_reflection_desc_db.a $(LIBDIR)/$(CONFIG)/libgrpc++_reflection.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_proto_server_reflection_test: $(PROTO_SERVER_REFLECTION_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PROTO_SERVER_REFLECTION_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-PROTO_UTILS_TEST_SRC = \
-    test/cpp/codegen/proto_utils_test.cc \
-
-PROTO_UTILS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PROTO_UTILS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/proto_utils_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/proto_utils_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/proto_utils_test: $(PROTOBUF_DEP) $(PROTO_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(PROTO_UTILS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/proto_utils_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/codegen/proto_utils_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_proto_utils_test: $(PROTO_UTILS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PROTO_UTILS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-QPS_INTERARRIVAL_TEST_SRC = \
-    test/cpp/qps/qps_interarrival_test.cc \
-
-QPS_INTERARRIVAL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_INTERARRIVAL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/qps_interarrival_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/qps_interarrival_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/qps_interarrival_test: $(PROTOBUF_DEP) $(QPS_INTERARRIVAL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(QPS_INTERARRIVAL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/qps_interarrival_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_interarrival_test.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_qps_interarrival_test: $(QPS_INTERARRIVAL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(QPS_INTERARRIVAL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-QPS_JSON_DRIVER_SRC = \
-    test/cpp/qps/qps_json_driver.cc \
-
-QPS_JSON_DRIVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_JSON_DRIVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/qps_json_driver: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/qps_json_driver: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/qps_json_driver: $(PROTOBUF_DEP) $(QPS_JSON_DRIVER_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(QPS_JSON_DRIVER_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/qps_json_driver
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_json_driver.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_qps_json_driver: $(QPS_JSON_DRIVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(QPS_JSON_DRIVER_OBJS:.o=.dep)
-endif
-endif
-
-
-QPS_OPENLOOP_TEST_SRC = \
-    test/cpp/qps/qps_openloop_test.cc \
-
-QPS_OPENLOOP_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_OPENLOOP_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/qps_openloop_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/qps_openloop_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/qps_openloop_test: $(PROTOBUF_DEP) $(QPS_OPENLOOP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(QPS_OPENLOOP_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/qps_openloop_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_openloop_test.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_qps_openloop_test: $(QPS_OPENLOOP_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(QPS_OPENLOOP_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-QPS_WORKER_SRC = \
-    test/cpp/qps/worker.cc \
-
-QPS_WORKER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(QPS_WORKER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/qps_worker: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/qps_worker: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/qps_worker: $(PROTOBUF_DEP) $(QPS_WORKER_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(QPS_WORKER_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/qps_worker
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/worker.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_qps_worker: $(QPS_WORKER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(QPS_WORKER_OBJS:.o=.dep)
-endif
-endif
-
-
-RECONNECT_INTEROP_CLIENT_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/reconnect_interop_client.cc \
-
-RECONNECT_INTEROP_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RECONNECT_INTEROP_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_client: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_client: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_client: $(PROTOBUF_DEP) $(RECONNECT_INTEROP_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RECONNECT_INTEROP_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/reconnect_interop_client
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_client.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_reconnect_interop_client: $(RECONNECT_INTEROP_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RECONNECT_INTEROP_CLIENT_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-RECONNECT_INTEROP_SERVER_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/reconnect_interop_server.cc \
-
-RECONNECT_INTEROP_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RECONNECT_INTEROP_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_server: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_server: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/reconnect_interop_server: $(PROTOBUF_DEP) $(RECONNECT_INTEROP_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RECONNECT_INTEROP_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/reconnect_interop_server
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o:  $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o:  $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o:  $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_server.o:  $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_reconnect_interop_server: $(RECONNECT_INTEROP_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RECONNECT_INTEROP_SERVER_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-REF_COUNTED_PTR_TEST_SRC = \
-    test/core/gpr++/ref_counted_ptr_test.cc \
-
-REF_COUNTED_PTR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_PTR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/ref_counted_ptr_test: $(PROTOBUF_DEP) $(REF_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(REF_COUNTED_PTR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/ref_counted_ptr_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/ref_counted_ptr_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_ref_counted_ptr_test: $(REF_COUNTED_PTR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(REF_COUNTED_PTR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-REF_COUNTED_TEST_SRC = \
-    test/core/gpr++/ref_counted_test.cc \
-
-REF_COUNTED_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ref_counted_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/ref_counted_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/ref_counted_test: $(PROTOBUF_DEP) $(REF_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(REF_COUNTED_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/ref_counted_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/gpr++/ref_counted_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_ref_counted_test: $(REF_COUNTED_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(REF_COUNTED_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SECURE_AUTH_CONTEXT_TEST_SRC = \
-    test/cpp/common/secure_auth_context_test.cc \
-
-SECURE_AUTH_CONTEXT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SECURE_AUTH_CONTEXT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/secure_auth_context_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/secure_auth_context_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/secure_auth_context_test: $(PROTOBUF_DEP) $(SECURE_AUTH_CONTEXT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SECURE_AUTH_CONTEXT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/secure_auth_context_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/common/secure_auth_context_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_secure_auth_context_test: $(SECURE_AUTH_CONTEXT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SECURE_AUTH_CONTEXT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SECURE_SYNC_UNARY_PING_PONG_TEST_SRC = \
-    test/cpp/qps/secure_sync_unary_ping_pong_test.cc \
-
-SECURE_SYNC_UNARY_PING_PONG_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SECURE_SYNC_UNARY_PING_PONG_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test: $(PROTOBUF_DEP) $(SECURE_SYNC_UNARY_PING_PONG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SECURE_SYNC_UNARY_PING_PONG_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/secure_sync_unary_ping_pong_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/secure_sync_unary_ping_pong_test.o:  $(LIBDIR)/$(CONFIG)/libqps.a $(LIBDIR)/$(CONFIG)/libgrpc++_core_stats.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_secure_sync_unary_ping_pong_test: $(SECURE_SYNC_UNARY_PING_PONG_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SECURE_SYNC_UNARY_PING_PONG_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_BUILDER_PLUGIN_TEST_SRC = \
-    test/cpp/end2end/server_builder_plugin_test.cc \
-
-SERVER_BUILDER_PLUGIN_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_BUILDER_PLUGIN_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_builder_plugin_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_builder_plugin_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_builder_plugin_test: $(PROTOBUF_DEP) $(SERVER_BUILDER_PLUGIN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_BUILDER_PLUGIN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_builder_plugin_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/server_builder_plugin_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_builder_plugin_test: $(SERVER_BUILDER_PLUGIN_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_BUILDER_PLUGIN_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_BUILDER_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
-    test/cpp/server/server_builder_test.cc \
-
-SERVER_BUILDER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_BUILDER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_builder_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_builder_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_builder_test: $(PROTOBUF_DEP) $(SERVER_BUILDER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_BUILDER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_builder_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo_messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/server/server_builder_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_builder_test: $(SERVER_BUILDER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_BUILDER_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/server/server_builder_test.o: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc
-
-
-SERVER_CONTEXT_TEST_SPOUSE_TEST_SRC = \
-    test/cpp/test/server_context_test_spouse_test.cc \
-
-SERVER_CONTEXT_TEST_SPOUSE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_CONTEXT_TEST_SPOUSE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_context_test_spouse_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_context_test_spouse_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_context_test_spouse_test: $(PROTOBUF_DEP) $(SERVER_CONTEXT_TEST_SPOUSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_CONTEXT_TEST_SPOUSE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_context_test_spouse_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/test/server_context_test_spouse_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_context_test_spouse_test: $(SERVER_CONTEXT_TEST_SPOUSE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_CONTEXT_TEST_SPOUSE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_CRASH_TEST_SRC = \
-    test/cpp/end2end/server_crash_test.cc \
-
-SERVER_CRASH_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_CRASH_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_crash_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_crash_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_crash_test: $(PROTOBUF_DEP) $(SERVER_CRASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_CRASH_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_crash_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/server_crash_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_crash_test: $(SERVER_CRASH_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_CRASH_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_CRASH_TEST_CLIENT_SRC = \
-    test/cpp/end2end/server_crash_test_client.cc \
-
-SERVER_CRASH_TEST_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_CRASH_TEST_CLIENT_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_crash_test_client: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_crash_test_client: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_crash_test_client: $(PROTOBUF_DEP) $(SERVER_CRASH_TEST_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_CRASH_TEST_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_crash_test_client
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/server_crash_test_client.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_crash_test_client: $(SERVER_CRASH_TEST_CLIENT_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_CRASH_TEST_CLIENT_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_REQUEST_CALL_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
-    test/cpp/server/server_request_call_test.cc \
-
-SERVER_REQUEST_CALL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_REQUEST_CALL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_request_call_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/server_request_call_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/server_request_call_test: $(PROTOBUF_DEP) $(SERVER_REQUEST_CALL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SERVER_REQUEST_CALL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_request_call_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo_messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/echo.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/server/server_request_call_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_request_call_test: $(SERVER_REQUEST_CALL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_REQUEST_CALL_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/server/server_request_call_test.o: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc
-
-
-SHUTDOWN_TEST_SRC = \
-    test/cpp/end2end/shutdown_test.cc \
-
-SHUTDOWN_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SHUTDOWN_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/shutdown_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/shutdown_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/shutdown_test: $(PROTOBUF_DEP) $(SHUTDOWN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(SHUTDOWN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/shutdown_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/shutdown_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_shutdown_test: $(SHUTDOWN_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SHUTDOWN_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STATS_TEST_SRC = \
-    test/core/debug/stats_test.cc \
-
-STATS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STATS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/stats_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/stats_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/stats_test: $(PROTOBUF_DEP) $(STATS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(STATS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/stats_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/debug/stats_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_stats_test: $(STATS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STATS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STATUS_TEST_SRC = \
-    test/cpp/util/status_test.cc \
-
-STATUS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STATUS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/status_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/status_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/status_test: $(PROTOBUF_DEP) $(STATUS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(STATUS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/status_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/status_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_status_test: $(STATUS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STATUS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STREAMING_THROUGHPUT_TEST_SRC = \
-    test/cpp/end2end/streaming_throughput_test.cc \
-
-STREAMING_THROUGHPUT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STREAMING_THROUGHPUT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/streaming_throughput_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/streaming_throughput_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/streaming_throughput_test: $(PROTOBUF_DEP) $(STREAMING_THROUGHPUT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(STREAMING_THROUGHPUT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/streaming_throughput_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/streaming_throughput_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_streaming_throughput_test: $(STREAMING_THROUGHPUT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STREAMING_THROUGHPUT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-STRESS_TEST_SRC = \
-    $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc \
-    $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
-    test/cpp/interop/interop_client.cc \
-    test/cpp/interop/stress_interop_client.cc \
-    test/cpp/interop/stress_test.cc \
-    test/cpp/util/metrics_server.cc \
-
-STRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/stress_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/stress_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/stress_test: $(PROTOBUF_DEP) $(STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/stress_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/metrics.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_interop_client.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/metrics_server.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_stress_test: $(STRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(STRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_test.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/metrics_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
-
-
-THREAD_MANAGER_TEST_SRC = \
-    test/cpp/thread_manager/thread_manager_test.cc \
-
-THREAD_MANAGER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(THREAD_MANAGER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/thread_manager_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/thread_manager_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/thread_manager_test: $(PROTOBUF_DEP) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(THREAD_MANAGER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/thread_manager_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/thread_manager/thread_manager_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_thread_manager_test: $(THREAD_MANAGER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(THREAD_MANAGER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-THREAD_STRESS_TEST_SRC = \
-    test/cpp/end2end/thread_stress_test.cc \
-
-THREAD_STRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(THREAD_STRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/thread_stress_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/thread_stress_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/thread_stress_test: $(PROTOBUF_DEP) $(THREAD_STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(THREAD_STRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/thread_stress_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/end2end/thread_stress_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_thread_stress_test: $(THREAD_STRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(THREAD_STRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-TRANSPORT_PID_CONTROLLER_TEST_SRC = \
-    test/core/transport/pid_controller_test.cc \
-
-TRANSPORT_PID_CONTROLLER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(TRANSPORT_PID_CONTROLLER_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/transport_pid_controller_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/transport_pid_controller_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/transport_pid_controller_test: $(PROTOBUF_DEP) $(TRANSPORT_PID_CONTROLLER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(TRANSPORT_PID_CONTROLLER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/transport_pid_controller_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/pid_controller_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_transport_pid_controller_test: $(TRANSPORT_PID_CONTROLLER_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(TRANSPORT_PID_CONTROLLER_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-WRITES_PER_RPC_TEST_SRC = \
-    test/cpp/performance/writes_per_rpc_test.cc \
-
-WRITES_PER_RPC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(WRITES_PER_RPC_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/writes_per_rpc_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/writes_per_rpc_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/writes_per_rpc_test: $(PROTOBUF_DEP) $(WRITES_PER_RPC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(WRITES_PER_RPC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/writes_per_rpc_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/performance/writes_per_rpc_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_writes_per_rpc_test: $(WRITES_PER_RPC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(WRITES_PER_RPC_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-PUBLIC_HEADERS_MUST_BE_C89_SRC = \
-    test/core/surface/public_headers_must_be_c89.c \
-
-PUBLIC_HEADERS_MUST_BE_C89_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PUBLIC_HEADERS_MUST_BE_C89_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/public_headers_must_be_c89: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/public_headers_must_be_c89: $(PUBLIC_HEADERS_MUST_BE_C89_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(PUBLIC_HEADERS_MUST_BE_C89_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/public_headers_must_be_c89
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/surface/public_headers_must_be_c89.o:  $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a
-$(OBJDIR)/$(CONFIG)/test/core/surface/public_headers_must_be_c89.o : test/core/surface/public_headers_must_be_c89.c
-	$(E) "[C]       Compiling $<"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(CC) $(CPPFLAGS) $(CFLAGS) -std=c89 -pedantic -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $<
-
-deps_public_headers_must_be_c89: $(PUBLIC_HEADERS_MUST_BE_C89_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PUBLIC_HEADERS_MUST_BE_C89_OBJS:.o=.dep)
-endif
-endif
-
-
-GEN_HPACK_TABLES_SRC = \
-    tools/codegen/core/gen_hpack_tables.cc \
-
-GEN_HPACK_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_HPACK_TABLES_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gen_hpack_tables: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GEN_HPACK_TABLES_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_hpack_tables
-
-endif
-
-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_hpack_tables.o:  $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a
-
-deps_gen_hpack_tables: $(GEN_HPACK_TABLES_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GEN_HPACK_TABLES_OBJS:.o=.dep)
-endif
-endif
-
-
-GEN_LEGAL_METADATA_CHARACTERS_SRC = \
-    tools/codegen/core/gen_legal_metadata_characters.cc \
-
-GEN_LEGAL_METADATA_CHARACTERS_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_LEGAL_METADATA_CHARACTERS_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters
-
-endif
-
-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: 
-
-deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep)
-endif
-endif
-
-
-GEN_PERCENT_ENCODING_TABLES_SRC = \
-    tools/codegen/core/gen_percent_encoding_tables.cc \
-
-GEN_PERCENT_ENCODING_TABLES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GEN_PERCENT_ENCODING_TABLES_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS)
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(GEN_PERCENT_ENCODING_TABLES_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_percent_encoding_tables
-
-endif
-
-$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_percent_encoding_tables.o: 
-
-deps_gen_percent_encoding_tables: $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(GEN_PERCENT_ENCODING_TABLES_OBJS:.o=.dep)
-endif
-endif
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_AES_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_AES_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_AES_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_aes_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_aes_test:  $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_aes_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_aes_test
-
-endif
-
-$(BORINGSSL_AES_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_AES_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ASN1_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ASN1_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ASN1_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_asn1_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_asn1_test:  $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_asn1_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_asn1_test
-
-endif
-
-$(BORINGSSL_ASN1_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ASN1_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_BASE64_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_BASE64_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_BASE64_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_base64_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_base64_test:  $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_base64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_base64_test
-
-endif
-
-$(BORINGSSL_BASE64_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_BASE64_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_BIO_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_BIO_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_BIO_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_bio_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_bio_test:  $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_bio_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_bio_test
-
-endif
-
-$(BORINGSSL_BIO_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_BIO_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_BN_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_BN_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_BN_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_bn_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_bn_test:  $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_bn_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_bn_test
-
-endif
-
-$(BORINGSSL_BN_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_BN_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_BYTESTRING_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_BYTESTRING_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_BYTESTRING_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_bytestring_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_bytestring_test:  $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_bytestring_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_bytestring_test
-
-endif
-
-$(BORINGSSL_BYTESTRING_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_BYTESTRING_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_AEAD_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_AEAD_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_AEAD_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_aead_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_aead_test:  $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_aead_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_aead_test
-
-endif
-
-$(BORINGSSL_AEAD_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_AEAD_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_CIPHER_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_CIPHER_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_CIPHER_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_cipher_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_cipher_test:  $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_cipher_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_cipher_test
-
-endif
-
-$(BORINGSSL_CIPHER_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_CIPHER_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_CMAC_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_CMAC_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_CMAC_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_cmac_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_cmac_test:  $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_cmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_cmac_test
-
-endif
-
-$(BORINGSSL_CMAC_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_CMAC_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_CONSTANT_TIME_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_CONSTANT_TIME_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_CONSTANT_TIME_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_constant_time_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_constant_time_test:  $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_constant_time_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_constant_time_test
-
-endif
-
-$(BORINGSSL_CONSTANT_TIME_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_CONSTANT_TIME_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ED25519_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ED25519_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ED25519_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_ed25519_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_ed25519_test:  $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_ed25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_ed25519_test
-
-endif
-
-$(BORINGSSL_ED25519_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ED25519_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_SPAKE25519_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_SPAKE25519_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_SPAKE25519_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_spake25519_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_spake25519_test:  $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_spake25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_spake25519_test
-
-endif
-
-$(BORINGSSL_SPAKE25519_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_SPAKE25519_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_X25519_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_X25519_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_X25519_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_x25519_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_x25519_test:  $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_x25519_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_x25519_test
-
-endif
-
-$(BORINGSSL_X25519_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_X25519_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_DIGEST_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_DIGEST_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_DIGEST_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_digest_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_digest_test:  $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_digest_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_digest_test
-
-endif
-
-$(BORINGSSL_DIGEST_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_DIGEST_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_EXAMPLE_MUL_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_EXAMPLE_MUL_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_EXAMPLE_MUL_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_example_mul: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_example_mul:  $(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_example_mul_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_example_mul
-
-endif
-
-$(BORINGSSL_EXAMPLE_MUL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_EXAMPLE_MUL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_P256-X86_64_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_P256-X86_64_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_P256-X86_64_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_p256-x86_64_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_p256-x86_64_test:  $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_p256-x86_64_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_p256-x86_64_test
-
-endif
-
-$(BORINGSSL_P256-X86_64_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_P256-X86_64_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ECDH_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ECDH_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ECDH_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdh_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdh_test:  $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_ecdh_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_ecdh_test
-
-endif
-
-$(BORINGSSL_ECDH_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ECDH_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ECDSA_SIGN_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ECDSA_SIGN_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ECDSA_SIGN_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_sign_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_sign_test:  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_sign_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_ecdsa_sign_test
-
-endif
-
-$(BORINGSSL_ECDSA_SIGN_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ECDSA_SIGN_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ECDSA_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ECDSA_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ECDSA_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_test:  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_ecdsa_test
-
-endif
-
-$(BORINGSSL_ECDSA_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ECDSA_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_ECDSA_VERIFY_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_ECDSA_VERIFY_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_ECDSA_VERIFY_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_verify_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_ecdsa_verify_test:  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_ecdsa_verify_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_ecdsa_verify_test
-
-endif
-
-$(BORINGSSL_ECDSA_VERIFY_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_ECDSA_VERIFY_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_EVP_EXTRA_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_EVP_EXTRA_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_EVP_EXTRA_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_evp_extra_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_evp_extra_test:  $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_evp_extra_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_evp_extra_test
-
-endif
-
-$(BORINGSSL_EVP_EXTRA_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_EVP_EXTRA_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_EVP_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_EVP_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_EVP_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_evp_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_evp_test:  $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_evp_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_evp_test
-
-endif
-
-$(BORINGSSL_EVP_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_EVP_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_PBKDF_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_PBKDF_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_PBKDF_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_pbkdf_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_pbkdf_test:  $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_pbkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_pbkdf_test
-
-endif
-
-$(BORINGSSL_PBKDF_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_PBKDF_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_HKDF_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_HKDF_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_HKDF_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_hkdf_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_hkdf_test:  $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_hkdf_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_hkdf_test
-
-endif
-
-$(BORINGSSL_HKDF_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_HKDF_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_HMAC_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_HMAC_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_HMAC_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_hmac_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_hmac_test:  $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_hmac_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_hmac_test
-
-endif
-
-$(BORINGSSL_HMAC_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_HMAC_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_LHASH_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_LHASH_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_LHASH_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_lhash_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_lhash_test:  $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_lhash_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_lhash_test
-
-endif
-
-$(BORINGSSL_LHASH_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_LHASH_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_GCM_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_GCM_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_GCM_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_gcm_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_gcm_test:  $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_gcm_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_gcm_test
-
-endif
-
-$(BORINGSSL_GCM_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_GCM_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_OBJ_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_OBJ_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_OBJ_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_obj_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_obj_test:  $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_obj_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_obj_test
-
-endif
-
-$(BORINGSSL_OBJ_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_OBJ_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_PKCS12_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_PKCS12_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_PKCS12_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs12_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs12_test:  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs12_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_pkcs12_test
-
-endif
-
-$(BORINGSSL_PKCS12_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_PKCS12_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_PKCS8_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_PKCS8_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_PKCS8_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs8_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs8_test:  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs8_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_pkcs8_test
-
-endif
-
-$(BORINGSSL_PKCS8_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_PKCS8_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_POLY1305_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_POLY1305_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_POLY1305_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_poly1305_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_poly1305_test:  $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_poly1305_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_poly1305_test
-
-endif
-
-$(BORINGSSL_POLY1305_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_POLY1305_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_POOL_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_POOL_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_POOL_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_pool_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_pool_test:  $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_pool_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_pool_test
-
-endif
-
-$(BORINGSSL_POOL_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_POOL_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_REFCOUNT_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_REFCOUNT_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_REFCOUNT_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_refcount_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_refcount_test:  $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_refcount_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_refcount_test
-
-endif
-
-$(BORINGSSL_REFCOUNT_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_REFCOUNT_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_THREAD_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_THREAD_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_THREAD_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_thread_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_thread_test:  $(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_thread_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_thread_test
-
-endif
-
-$(BORINGSSL_THREAD_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_THREAD_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_PKCS7_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_PKCS7_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_PKCS7_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs7_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_pkcs7_test:  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_pkcs7_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_pkcs7_test
-
-endif
-
-$(BORINGSSL_PKCS7_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_PKCS7_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_X509_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_X509_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_X509_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_x509_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_x509_test:  $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_x509_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_x509_test
-
-endif
-
-$(BORINGSSL_X509_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_X509_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_TAB_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_TAB_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_TAB_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_tab_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_tab_test:  $(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_tab_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_tab_test
-
-endif
-
-$(BORINGSSL_TAB_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_TAB_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-
-# boringssl needs an override to ensure that it does not include
-# system openssl headers regardless of other configuration
-# we do so here with a target specific variable assignment
-$(BORINGSSL_V3NAME_TEST_OBJS): CFLAGS := -Ithird_party/boringssl/include $(CFLAGS) -Wno-sign-conversion -Wno-conversion -Wno-unused-value $(NO_W_EXTRA_SEMI)
-$(BORINGSSL_V3NAME_TEST_OBJS): CXXFLAGS := -Ithird_party/boringssl/include $(CXXFLAGS)
-$(BORINGSSL_V3NAME_TEST_OBJS): CPPFLAGS += -DOPENSSL_NO_ASM -D_GNU_SOURCE
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/boringssl_v3name_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/boringssl_v3name_test:  $(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS)  $(LIBDIR)/$(CONFIG)/libboringssl_v3name_test_lib.a $(LIBDIR)/$(CONFIG)/libboringssl_test_util.a $(LIBDIR)/$(CONFIG)/libboringssl.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/boringssl_v3name_test
-
-endif
-
-$(BORINGSSL_V3NAME_TEST_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
-$(BORINGSSL_V3NAME_TEST_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare $(NO_W_EXTRA_SEMI)
-
-
-
-BADREQ_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/badreq.cc \
-
-BADREQ_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BADREQ_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/badreq_bad_client_test: $(BADREQ_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BADREQ_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/badreq_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/badreq.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_badreq_bad_client_test: $(BADREQ_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(BADREQ_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-CONNECTION_PREFIX_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/connection_prefix.cc \
-
-CONNECTION_PREFIX_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CONNECTION_PREFIX_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test: $(CONNECTION_PREFIX_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CONNECTION_PREFIX_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/connection_prefix_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/connection_prefix.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_connection_prefix_bad_client_test: $(CONNECTION_PREFIX_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(CONNECTION_PREFIX_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-DUPLICATE_HEADER_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/duplicate_header.cc \
-
-DUPLICATE_HEADER_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(DUPLICATE_HEADER_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/duplicate_header_bad_client_test: $(DUPLICATE_HEADER_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(DUPLICATE_HEADER_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/duplicate_header_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/duplicate_header.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_duplicate_header_bad_client_test: $(DUPLICATE_HEADER_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(DUPLICATE_HEADER_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/head_of_line_blocking.cc \
-
-HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/head_of_line_blocking_bad_client_test: $(HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/head_of_line_blocking_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/head_of_line_blocking.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_head_of_line_blocking_bad_client_test: $(HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(HEAD_OF_LINE_BLOCKING_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-HEADERS_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/headers.cc \
-
-HEADERS_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HEADERS_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/headers_bad_client_test: $(HEADERS_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HEADERS_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/headers_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/headers.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_headers_bad_client_test: $(HEADERS_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(HEADERS_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/initial_settings_frame.cc \
-
-INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test: $(INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/initial_settings_frame_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/initial_settings_frame.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_initial_settings_frame_bad_client_test: $(INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(INITIAL_SETTINGS_FRAME_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/server_registered_method.cc \
-
-SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/server_registered_method_bad_client_test: $(SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/server_registered_method_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/server_registered_method.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_registered_method_bad_client_test: $(SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(SERVER_REGISTERED_METHOD_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-SIMPLE_REQUEST_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/simple_request.cc \
-
-SIMPLE_REQUEST_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SIMPLE_REQUEST_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/simple_request_bad_client_test: $(SIMPLE_REQUEST_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SIMPLE_REQUEST_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/simple_request_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/simple_request.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_simple_request_bad_client_test: $(SIMPLE_REQUEST_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(SIMPLE_REQUEST_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-UNKNOWN_FRAME_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/unknown_frame.cc \
-
-UNKNOWN_FRAME_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(UNKNOWN_FRAME_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test: $(UNKNOWN_FRAME_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(UNKNOWN_FRAME_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/unknown_frame.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_unknown_frame_bad_client_test: $(UNKNOWN_FRAME_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(UNKNOWN_FRAME_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-WINDOW_OVERFLOW_BAD_CLIENT_TEST_SRC = \
-    test/core/bad_client/tests/window_overflow.cc \
-
-WINDOW_OVERFLOW_BAD_CLIENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(WINDOW_OVERFLOW_BAD_CLIENT_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/window_overflow_bad_client_test: $(WINDOW_OVERFLOW_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(WINDOW_OVERFLOW_BAD_CLIENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_client/tests/window_overflow.o:  $(LIBDIR)/$(CONFIG)/libbad_client_test.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_window_overflow_bad_client_test: $(WINDOW_OVERFLOW_BAD_CLIENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(WINDOW_OVERFLOW_BAD_CLIENT_TEST_OBJS:.o=.dep)
-endif
-
-
-BAD_SSL_CERT_SERVER_SRC = \
-    test/core/bad_ssl/servers/cert.cc \
-
-BAD_SSL_CERT_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BAD_SSL_CERT_SERVER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bad_ssl_cert_server: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/bad_ssl_cert_server: $(BAD_SSL_CERT_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BAD_SSL_CERT_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bad_ssl_cert_server
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_ssl/servers/cert.o:  $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bad_ssl_cert_server: $(BAD_SSL_CERT_SERVER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BAD_SSL_CERT_SERVER_OBJS:.o=.dep)
-endif
-endif
-
-
-BAD_SSL_CERT_TEST_SRC = \
-    test/core/bad_ssl/bad_ssl_test.cc \
-
-BAD_SSL_CERT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BAD_SSL_CERT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/bad_ssl_cert_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/bad_ssl_cert_test: $(BAD_SSL_CERT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(BAD_SSL_CERT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bad_ssl_cert_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/bad_ssl/bad_ssl_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_bad_ssl_cert_test: $(BAD_SSL_CERT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(BAD_SSL_CERT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_CENSUS_TEST_SRC = \
-    test/core/end2end/fixtures/h2_census.cc \
-
-H2_CENSUS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_CENSUS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_census_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_census_test: $(H2_CENSUS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_CENSUS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_census_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_census.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_census_test: $(H2_CENSUS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_CENSUS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_COMPRESS_TEST_SRC = \
-    test/core/end2end/fixtures/h2_compress.cc \
-
-H2_COMPRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_COMPRESS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_compress_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_compress_test: $(H2_COMPRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_COMPRESS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_compress_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_compress.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_compress_test: $(H2_COMPRESS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_COMPRESS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FAKESEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_fakesec.cc \
-
-H2_FAKESEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FAKESEC_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_fakesec_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_fakesec_test: $(H2_FAKESEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FAKESEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_fakesec_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_fakesec.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_fakesec_test: $(H2_FAKESEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FAKESEC_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FD_TEST_SRC = \
-    test/core/end2end/fixtures/h2_fd.cc \
-
-H2_FD_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FD_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_fd_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_fd_test: $(H2_FD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_fd_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_fd.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_fd_test: $(H2_FD_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FD_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FULL_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full.cc \
-
-H2_FULL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_full_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_full_test: $(H2_FULL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_full_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full_test: $(H2_FULL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FULL+PIPE_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+pipe.cc \
-
-H2_FULL+PIPE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+PIPE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_full+pipe_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_full+pipe_test: $(H2_FULL+PIPE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+PIPE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_full+pipe_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+pipe.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+pipe_test: $(H2_FULL+PIPE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+PIPE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FULL+TRACE_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+trace.cc \
-
-H2_FULL+TRACE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+TRACE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_full+trace_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_full+trace_test: $(H2_FULL+TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_full+trace_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+trace.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+trace_test: $(H2_FULL+TRACE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+TRACE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_FULL+WORKAROUNDS_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+workarounds.cc \
-
-H2_FULL+WORKAROUNDS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+WORKAROUNDS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_full+workarounds_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_full+workarounds_test: $(H2_FULL+WORKAROUNDS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+WORKAROUNDS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_full+workarounds_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+workarounds.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+workarounds_test: $(H2_FULL+WORKAROUNDS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+WORKAROUNDS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_HTTP_PROXY_TEST_SRC = \
-    test/core/end2end/fixtures/h2_http_proxy.cc \
-
-H2_HTTP_PROXY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_HTTP_PROXY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_http_proxy_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_http_proxy_test: $(H2_HTTP_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_HTTP_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_http_proxy_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_http_proxy.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_http_proxy_test: $(H2_HTTP_PROXY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_HTTP_PROXY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_LOAD_REPORTING_TEST_SRC = \
-    test/core/end2end/fixtures/h2_load_reporting.cc \
-
-H2_LOAD_REPORTING_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_LOAD_REPORTING_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_load_reporting_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_load_reporting_test: $(H2_LOAD_REPORTING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_LOAD_REPORTING_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_load_reporting_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_load_reporting.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_load_reporting_test: $(H2_LOAD_REPORTING_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_LOAD_REPORTING_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_OAUTH2_TEST_SRC = \
-    test/core/end2end/fixtures/h2_oauth2.cc \
-
-H2_OAUTH2_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_OAUTH2_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_oauth2_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_oauth2_test: $(H2_OAUTH2_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_OAUTH2_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_oauth2_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_oauth2.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_oauth2_test: $(H2_OAUTH2_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_OAUTH2_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_PROXY_TEST_SRC = \
-    test/core/end2end/fixtures/h2_proxy.cc \
-
-H2_PROXY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_PROXY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_proxy_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_proxy_test: $(H2_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_proxy_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_proxy.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_proxy_test: $(H2_PROXY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_PROXY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_SOCKPAIR_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair.cc \
-
-H2_SOCKPAIR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_test: $(H2_SOCKPAIR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_sockpair_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair_test: $(H2_SOCKPAIR_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_SOCKPAIR+TRACE_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair+trace.cc \
-
-H2_SOCKPAIR+TRACE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR+TRACE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_sockpair+trace_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair+trace_test: $(H2_SOCKPAIR+TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR+TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_sockpair+trace_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair+trace.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair+trace_test: $(H2_SOCKPAIR+TRACE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR+TRACE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_SOCKPAIR_1BYTE_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair_1byte.cc \
-
-H2_SOCKPAIR_1BYTE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR_1BYTE_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test: $(H2_SOCKPAIR_1BYTE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR_1BYTE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair_1byte.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair_1byte_test: $(H2_SOCKPAIR_1BYTE_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR_1BYTE_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_SSL_TEST_SRC = \
-    test/core/end2end/fixtures/h2_ssl.cc \
-
-H2_SSL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SSL_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_ssl_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_ssl_test: $(H2_SSL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SSL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_ssl_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_ssl.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_ssl_test: $(H2_SSL_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SSL_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_SSL_PROXY_TEST_SRC = \
-    test/core/end2end/fixtures/h2_ssl_proxy.cc \
-
-H2_SSL_PROXY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SSL_PROXY_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_ssl_proxy_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_ssl_proxy_test: $(H2_SSL_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SSL_PROXY_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_ssl_proxy_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_ssl_proxy.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_ssl_proxy_test: $(H2_SSL_PROXY_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_SSL_PROXY_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_UDS_TEST_SRC = \
-    test/core/end2end/fixtures/h2_uds.cc \
-
-H2_UDS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_UDS_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/h2_uds_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/h2_uds_test: $(H2_UDS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_UDS_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/h2_uds_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_uds.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_uds_test: $(H2_UDS_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(H2_UDS_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-INPROC_TEST_SRC = \
-    test/core/end2end/fixtures/inproc.cc \
-
-INPROC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INPROC_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/inproc_test: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/inproc_test: $(INPROC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(INPROC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/inproc_test
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/inproc.o:  $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_inproc_test: $(INPROC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(INPROC_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-H2_CENSUS_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_census.cc \
-
-H2_CENSUS_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_CENSUS_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_census_nosec_test: $(H2_CENSUS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_CENSUS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_census_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_census.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_census_nosec_test: $(H2_CENSUS_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_CENSUS_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_COMPRESS_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_compress.cc \
-
-H2_COMPRESS_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_COMPRESS_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_compress_nosec_test: $(H2_COMPRESS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_COMPRESS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_compress_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_compress.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_compress_nosec_test: $(H2_COMPRESS_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_COMPRESS_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_FD_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_fd.cc \
-
-H2_FD_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FD_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_fd_nosec_test: $(H2_FD_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FD_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_fd_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_fd.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_fd_nosec_test: $(H2_FD_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_FD_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_FULL_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full.cc \
-
-H2_FULL_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_full_nosec_test: $(H2_FULL_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_full_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full_nosec_test: $(H2_FULL_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_FULL+PIPE_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+pipe.cc \
-
-H2_FULL+PIPE_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+PIPE_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_full+pipe_nosec_test: $(H2_FULL+PIPE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+PIPE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_full+pipe_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+pipe.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+pipe_nosec_test: $(H2_FULL+PIPE_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+PIPE_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_FULL+TRACE_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+trace.cc \
-
-H2_FULL+TRACE_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+TRACE_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_full+trace_nosec_test: $(H2_FULL+TRACE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+TRACE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_full+trace_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+trace.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+trace_nosec_test: $(H2_FULL+TRACE_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+TRACE_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_FULL+WORKAROUNDS_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_full+workarounds.cc \
-
-H2_FULL+WORKAROUNDS_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_FULL+WORKAROUNDS_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_full+workarounds_nosec_test: $(H2_FULL+WORKAROUNDS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_FULL+WORKAROUNDS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_full+workarounds_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_full+workarounds.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_full+workarounds_nosec_test: $(H2_FULL+WORKAROUNDS_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_FULL+WORKAROUNDS_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_HTTP_PROXY_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_http_proxy.cc \
-
-H2_HTTP_PROXY_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_HTTP_PROXY_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_http_proxy_nosec_test: $(H2_HTTP_PROXY_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_HTTP_PROXY_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_http_proxy_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_http_proxy.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_http_proxy_nosec_test: $(H2_HTTP_PROXY_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_HTTP_PROXY_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_LOAD_REPORTING_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_load_reporting.cc \
-
-H2_LOAD_REPORTING_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_LOAD_REPORTING_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_load_reporting_nosec_test: $(H2_LOAD_REPORTING_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_LOAD_REPORTING_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_load_reporting_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_load_reporting.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_load_reporting_nosec_test: $(H2_LOAD_REPORTING_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_LOAD_REPORTING_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_PROXY_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_proxy.cc \
-
-H2_PROXY_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_PROXY_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_proxy_nosec_test: $(H2_PROXY_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_PROXY_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_proxy_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_proxy.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_proxy_nosec_test: $(H2_PROXY_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_PROXY_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_SOCKPAIR_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair.cc \
-
-H2_SOCKPAIR_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_nosec_test: $(H2_SOCKPAIR_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_sockpair_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair_nosec_test: $(H2_SOCKPAIR_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_SOCKPAIR+TRACE_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair+trace.cc \
-
-H2_SOCKPAIR+TRACE_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR+TRACE_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test: $(H2_SOCKPAIR+TRACE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR+TRACE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair+trace.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair+trace_nosec_test: $(H2_SOCKPAIR+TRACE_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR+TRACE_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_SOCKPAIR_1BYTE_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_sockpair_1byte.cc \
-
-H2_SOCKPAIR_1BYTE_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_SOCKPAIR_1BYTE_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test: $(H2_SOCKPAIR_1BYTE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_SOCKPAIR_1BYTE_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_sockpair_1byte.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_sockpair_1byte_nosec_test: $(H2_SOCKPAIR_1BYTE_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_SOCKPAIR_1BYTE_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-H2_UDS_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/h2_uds.cc \
-
-H2_UDS_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(H2_UDS_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/h2_uds_nosec_test: $(H2_UDS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(H2_UDS_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/h2_uds_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/h2_uds.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_h2_uds_nosec_test: $(H2_UDS_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(H2_UDS_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-INPROC_NOSEC_TEST_SRC = \
-    test/core/end2end/fixtures/inproc.cc \
-
-INPROC_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INPROC_NOSEC_TEST_SRC))))
-
-
-$(BINDIR)/$(CONFIG)/inproc_nosec_test: $(INPROC_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(INPROC_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/inproc_nosec_test
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/inproc.o:  $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_inproc_nosec_test: $(INPROC_NOSEC_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_DEPS),true)
--include $(INPROC_NOSEC_TEST_OBJS:.o=.dep)
-endif
-
-
-RESOLVER_COMPONENT_TEST_UNSECURE_SRC = \
-    test/cpp/naming/resolver_component_test.cc \
-
-RESOLVER_COMPONENT_TEST_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVER_COMPONENT_TEST_UNSECURE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolver_component_test_unsecure: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/resolver_component_test_unsecure: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/resolver_component_test_unsecure: $(PROTOBUF_DEP) $(RESOLVER_COMPONENT_TEST_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RESOLVER_COMPONENT_TEST_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/resolver_component_test_unsecure
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/naming/resolver_component_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_resolver_component_test_unsecure: $(RESOLVER_COMPONENT_TEST_UNSECURE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVER_COMPONENT_TEST_UNSECURE_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOLVER_COMPONENT_TEST_SRC = \
-    test/cpp/naming/resolver_component_test.cc \
-
-RESOLVER_COMPONENT_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVER_COMPONENT_TEST_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolver_component_test: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/resolver_component_test: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/resolver_component_test: $(PROTOBUF_DEP) $(RESOLVER_COMPONENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RESOLVER_COMPONENT_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/resolver_component_test
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/naming/resolver_component_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_resolver_component_test: $(RESOLVER_COMPONENT_TEST_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVER_COMPONENT_TEST_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_SRC = \
-    test/cpp/naming/resolver_component_tests_runner_invoker.cc \
-
-RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure: $(PROTOBUF_DEP) $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/naming/resolver_component_tests_runner_invoker.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_resolver_component_tests_runner_invoker_unsecure: $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_UNSECURE_OBJS:.o=.dep)
-endif
-endif
-
-
-RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_SRC = \
-    test/cpp/naming/resolver_component_tests_runner_invoker.cc \
-
-RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker: openssl_dep_error
-
-else
-
-
-
-
-ifeq ($(NO_PROTOBUF),true)
-
-# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker: protobuf_dep_error
-
-else
-
-$(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker: $(PROTOBUF_DEP) $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker
-
-endif
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/cpp/naming/resolver_component_tests_runner_invoker.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
-
-deps_resolver_component_tests_runner_invoker: $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(RESOLVER_COMPONENT_TESTS_RUNNER_INVOKER_OBJS:.o=.dep)
-endif
-endif
-
-
-API_FUZZER_ONE_ENTRY_SRC = \
-    test/core/end2end/fuzzers/api_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-API_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(API_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/api_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/api_fuzzer_one_entry: $(API_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(API_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/api_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/api_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_api_fuzzer_one_entry: $(API_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(API_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-CLIENT_FUZZER_ONE_ENTRY_SRC = \
-    test/core/end2end/fuzzers/client_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-CLIENT_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/client_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/client_fuzzer_one_entry: $(CLIENT_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(CLIENT_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/client_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/client_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_client_fuzzer_one_entry: $(CLIENT_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(CLIENT_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_SRC = \
-    test/core/transport/chttp2/hpack_parser_fuzzer_test.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry: $(HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/transport/chttp2/hpack_parser_fuzzer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_hpack_parser_fuzzer_test_one_entry: $(HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HPACK_PARSER_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_SRC = \
-    test/core/http/request_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http_request_fuzzer_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/http_request_fuzzer_test_one_entry: $(HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/http_request_fuzzer_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/request_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_http_request_fuzzer_test_one_entry: $(HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTP_REQUEST_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_SRC = \
-    test/core/http/response_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/http_response_fuzzer_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/http_response_fuzzer_test_one_entry: $(HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/http_response_fuzzer_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/http/response_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_http_response_fuzzer_test_one_entry: $(HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(HTTP_RESPONSE_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-JSON_FUZZER_TEST_ONE_ENTRY_SRC = \
-    test/core/json/fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-JSON_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(JSON_FUZZER_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/json_fuzzer_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/json_fuzzer_test_one_entry: $(JSON_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(JSON_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/json_fuzzer_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/json/fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_json_fuzzer_test_one_entry: $(JSON_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(JSON_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_SRC = \
-    test/core/nanopb/fuzzer_response.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test_one_entry: $(NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/nanopb_fuzzer_response_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/nanopb/fuzzer_response.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_nanopb_fuzzer_response_test_one_entry: $(NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NANOPB_FUZZER_RESPONSE_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_SRC = \
-    test/core/nanopb/fuzzer_serverlist.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test_one_entry: $(NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/nanopb_fuzzer_serverlist_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/nanopb/fuzzer_serverlist.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_nanopb_fuzzer_serverlist_test_one_entry: $(NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(NANOPB_FUZZER_SERVERLIST_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-PERCENT_DECODE_FUZZER_ONE_ENTRY_SRC = \
-    test/core/slice/percent_decode_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-PERCENT_DECODE_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PERCENT_DECODE_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/percent_decode_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/percent_decode_fuzzer_one_entry: $(PERCENT_DECODE_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(PERCENT_DECODE_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/percent_decode_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/percent_decode_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_percent_decode_fuzzer_one_entry: $(PERCENT_DECODE_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PERCENT_DECODE_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-PERCENT_ENCODE_FUZZER_ONE_ENTRY_SRC = \
-    test/core/slice/percent_encode_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-PERCENT_ENCODE_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(PERCENT_ENCODE_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/percent_encode_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/percent_encode_fuzzer_one_entry: $(PERCENT_ENCODE_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(PERCENT_ENCODE_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/percent_encode_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/slice/percent_encode_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_percent_encode_fuzzer_one_entry: $(PERCENT_ENCODE_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(PERCENT_ENCODE_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-SERVER_FUZZER_ONE_ENTRY_SRC = \
-    test/core/end2end/fuzzers/server_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-SERVER_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/server_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/server_fuzzer_one_entry: $(SERVER_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SERVER_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/server_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fuzzers/server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_server_fuzzer_one_entry: $(SERVER_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SERVER_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-SSL_SERVER_FUZZER_ONE_ENTRY_SRC = \
-    test/core/security/ssl_server_fuzzer.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-SSL_SERVER_FUZZER_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SSL_SERVER_FUZZER_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/ssl_server_fuzzer_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/ssl_server_fuzzer_one_entry: $(SSL_SERVER_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(SSL_SERVER_FUZZER_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/ssl_server_fuzzer_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/security/ssl_server_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_ssl_server_fuzzer_one_entry: $(SSL_SERVER_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(SSL_SERVER_FUZZER_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-URI_FUZZER_TEST_ONE_ENTRY_SRC = \
-    test/core/client_channel/uri_fuzzer_test.cc \
-    test/core/util/one_corpus_entry_fuzzer.cc \
-
-URI_FUZZER_TEST_ONE_ENTRY_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(URI_FUZZER_TEST_ONE_ENTRY_SRC))))
-ifeq ($(NO_SECURE),true)
-
-# You can't build secure targets if you don't have OpenSSL.
-
-$(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry: openssl_dep_error
-
-else
-
-
-
-$(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry: $(URI_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-	$(E) "[LD]      Linking $@"
-	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LD) $(LDFLAGS) $(URI_FUZZER_TEST_ONE_ENTRY_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/uri_fuzzer_test_one_entry
-
-endif
-
-$(OBJDIR)/$(CONFIG)/test/core/client_channel/uri_fuzzer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-$(OBJDIR)/$(CONFIG)/test/core/util/one_corpus_entry_fuzzer.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
-
-deps_uri_fuzzer_test_one_entry: $(URI_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-
-ifneq ($(NO_SECURE),true)
-ifneq ($(NO_DEPS),true)
--include $(URI_FUZZER_TEST_ONE_ENTRY_OBJS:.o=.dep)
-endif
-endif
-
-
-
-
-
-
-ifneq ($(OPENSSL_DEP),)
-# This is to ensure the embedded OpenSSL is built beforehand, properly
-# installing headers to their final destination on the drive. We need this
-# otherwise parallel compilation will fail if a source is compiled first.
-src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc: $(OPENSSL_DEP)
-src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc: $(OPENSSL_DEP)
-src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc: $(OPENSSL_DEP)
-src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc: $(OPENSSL_DEP)
-src/core/ext/transport/cronet/transport/cronet_api_dummy.cc: $(OPENSSL_DEP)
-src/core/ext/transport/cronet/transport/cronet_transport.cc: $(OPENSSL_DEP)
-src/core/lib/http/httpcli_security_connector.cc: $(OPENSSL_DEP)
-src/core/lib/security/context/security_context.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/composite/composite_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/credentials_metadata.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/fake/fake_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/google_default/credentials_generic.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/google_default/google_default_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/iam/iam_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/jwt/json_token.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/jwt/jwt_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/jwt/jwt_verifier.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/oauth2/oauth2_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/plugin/plugin_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/credentials/ssl/ssl_credentials.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/client_auth_filter.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/lb_targets_info.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/secure_endpoint.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/security_connector.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/security_handshaker.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/server_auth_filter.cc: $(OPENSSL_DEP)
-src/core/lib/security/transport/tsi_error.cc: $(OPENSSL_DEP)
-src/core/lib/security/util/json_util.cc: $(OPENSSL_DEP)
-src/core/lib/surface/init_secure.cc: $(OPENSSL_DEP)
-src/core/plugin_registry/grpc_cronet_plugin_registry.cc: $(OPENSSL_DEP)
-src/core/plugin_registry/grpc_plugin_registry.cc: $(OPENSSL_DEP)
-src/core/tsi/fake_transport_security.cc: $(OPENSSL_DEP)
-src/core/tsi/gts_transport_security.cc: $(OPENSSL_DEP)
-src/core/tsi/ssl_transport_security.cc: $(OPENSSL_DEP)
-src/core/tsi/transport_security.cc: $(OPENSSL_DEP)
-src/core/tsi/transport_security_adapter.cc: $(OPENSSL_DEP)
-src/core/tsi/transport_security_grpc.cc: $(OPENSSL_DEP)
-src/cpp/client/cronet_credentials.cc: $(OPENSSL_DEP)
-src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
-src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
-src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
-src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP)
-src/cpp/common/secure_create_auth_context.cc: $(OPENSSL_DEP)
-src/cpp/ext/proto_server_reflection.cc: $(OPENSSL_DEP)
-src/cpp/ext/proto_server_reflection_plugin.cc: $(OPENSSL_DEP)
-src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP)
-src/cpp/util/core_stats.cc: $(OPENSSL_DEP)
-src/cpp/util/error_details.cc: $(OPENSSL_DEP)
-src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP)
-test/core/bad_client/bad_client.cc: $(OPENSSL_DEP)
-test/core/bad_ssl/server_common.cc: $(OPENSSL_DEP)
-test/core/end2end/data/client_certs.cc: $(OPENSSL_DEP)
-test/core/end2end/data/server1_cert.cc: $(OPENSSL_DEP)
-test/core/end2end/data/server1_key.cc: $(OPENSSL_DEP)
-test/core/end2end/data/test_root_cert.cc: $(OPENSSL_DEP)
-test/core/end2end/end2end_tests.cc: $(OPENSSL_DEP)
-test/core/end2end/tests/call_creds.cc: $(OPENSSL_DEP)
-test/core/security/oauth2_utils.cc: $(OPENSSL_DEP)
-test/core/util/reconnect_server.cc: $(OPENSSL_DEP)
-test/core/util/test_tcp_server.cc: $(OPENSSL_DEP)
-test/cpp/end2end/test_service_impl.cc: $(OPENSSL_DEP)
-test/cpp/interop/client.cc: $(OPENSSL_DEP)
-test/cpp/interop/client_helper.cc: $(OPENSSL_DEP)
-test/cpp/interop/http2_client.cc: $(OPENSSL_DEP)
-test/cpp/interop/interop_client.cc: $(OPENSSL_DEP)
-test/cpp/interop/interop_server.cc: $(OPENSSL_DEP)
-test/cpp/interop/interop_server_bootstrap.cc: $(OPENSSL_DEP)
-test/cpp/interop/server_helper.cc: $(OPENSSL_DEP)
-test/cpp/microbenchmarks/helpers.cc: $(OPENSSL_DEP)
-test/cpp/qps/benchmark_config.cc: $(OPENSSL_DEP)
-test/cpp/qps/client_async.cc: $(OPENSSL_DEP)
-test/cpp/qps/client_sync.cc: $(OPENSSL_DEP)
-test/cpp/qps/driver.cc: $(OPENSSL_DEP)
-test/cpp/qps/parse_json.cc: $(OPENSSL_DEP)
-test/cpp/qps/qps_worker.cc: $(OPENSSL_DEP)
-test/cpp/qps/report.cc: $(OPENSSL_DEP)
-test/cpp/qps/server_async.cc: $(OPENSSL_DEP)
-test/cpp/qps/server_sync.cc: $(OPENSSL_DEP)
-test/cpp/qps/usage_timer.cc: $(OPENSSL_DEP)
-test/cpp/util/byte_buffer_proto_helper.cc: $(OPENSSL_DEP)
-test/cpp/util/cli_call.cc: $(OPENSSL_DEP)
-test/cpp/util/cli_credentials.cc: $(OPENSSL_DEP)
-test/cpp/util/create_test_channel.cc: $(OPENSSL_DEP)
-test/cpp/util/grpc_tool.cc: $(OPENSSL_DEP)
-test/cpp/util/proto_file_parser.cc: $(OPENSSL_DEP)
-test/cpp/util/proto_reflection_descriptor_database.cc: $(OPENSSL_DEP)
-test/cpp/util/service_describer.cc: $(OPENSSL_DEP)
-test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP)
-test/cpp/util/subprocess.cc: $(OPENSSL_DEP)
-test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP)
-test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP)
-endif
-
-.PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-headers install-headers_c install-headers_cxx install-shared install-shared_c install-shared_cxx install-static install-static_c install-static_cxx strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean
-
-.PHONY: printvars
-printvars:
-	@$(foreach V,$(sort $(.VARIABLES)),                 	  $(if $(filter-out environment% default automatic, 	  $(origin $V)),$(warning $V=$($V) ($(value $V)))))
diff --git a/3d_party/grpc/log_linux.cc b/3d_party/grpc/log_linux.cc
deleted file mode 100644
index 2225ae3e5..000000000
--- a/3d_party/grpc/log_linux.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_LINUX_LOG
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/syscall.h>
-#include <time.h>
-#include <unistd.h>
-
-/* static long gettid(void) { return syscall(__NR_gettid); } */
-
-void gpr_log(const char* file, int line, gpr_log_severity severity,
-             const char* format, ...) {
-  char* message = nullptr;
-  va_list args;
-  va_start(args, format);
-  if (vasprintf(&message, format, args) == -1) {
-    va_end(args);
-    return;
-  }
-  va_end(args);
-  gpr_log_message(file, line, severity, message);
-  /* message has been allocated by vasprintf above, and needs free */
-  free(message);
-}
-
-void gpr_default_log(gpr_log_func_args* args) {
-  const char* final_slash;
-  char* prefix;
-  const char* display_file;
-  char time_buffer[64];
-  time_t timer;
-  gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
-  struct tm tm;
-  static __thread long tid = 0;
-  if (tid == 0) tid = syscall(__NR_gettid);
-
-  timer = (time_t)now.tv_sec;
-  final_slash = strrchr(args->file, '/');
-  if (final_slash == nullptr)
-    display_file = args->file;
-  else
-    display_file = final_slash + 1;
-
-  if (!localtime_r(&timer, &tm)) {
-    strcpy(time_buffer, "error:localtime");
-  } else if (0 ==
-             strftime(time_buffer, sizeof(time_buffer), "%m%d %H:%M:%S", &tm)) {
-    strcpy(time_buffer, "error:strftime");
-  }
-
-  gpr_asprintf(&prefix, "%s%s.%09" PRId32 " %7ld %s:%d]",
-               gpr_log_severity_string(args->severity), time_buffer,
-               now.tv_nsec, tid, display_file, args->line);
-
-  fprintf(stderr, "%-60s %s\n", prefix, args->message);
-  gpr_free(prefix);
-}
-
-#endif /* GPR_LINUX_LOG */
diff --git a/3d_party/linux/confd-basic-7.3.linux.x86_64.zip b/3d_party/linux/confd-basic-7.3.linux.x86_64.zip
deleted file mode 100644
index 8c040f59a..000000000
Binary files a/3d_party/linux/confd-basic-7.3.linux.x86_64.zip and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libcrypto.so.1.0.0 b/3d_party/linux/ubuntu/lib/libcrypto.so.1.0.0
deleted file mode 100644
index 61082daef..000000000
Binary files a/3d_party/linux/ubuntu/lib/libcrypto.so.1.0.0 and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libncurses.so.5.9 b/3d_party/linux/ubuntu/lib/libncurses.so.5.9
deleted file mode 100644
index 7649af2ab..000000000
Binary files a/3d_party/linux/ubuntu/lib/libncurses.so.5.9 and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libnettle.so.6.4 b/3d_party/linux/ubuntu/lib/libnettle.so.6.4
deleted file mode 100644
index eff7352fc..000000000
Binary files a/3d_party/linux/ubuntu/lib/libnettle.so.6.4 and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libssh.so.4.5.0 b/3d_party/linux/ubuntu/lib/libssh.so.4.5.0
deleted file mode 100644
index 6c2293713..000000000
Binary files a/3d_party/linux/ubuntu/lib/libssh.so.4.5.0 and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libssh_threads.so.4.5.0 b/3d_party/linux/ubuntu/lib/libssh_threads.so.4.5.0
deleted file mode 100644
index e20607670..000000000
Binary files a/3d_party/linux/ubuntu/lib/libssh_threads.so.4.5.0 and /dev/null differ
diff --git a/3d_party/linux/ubuntu/lib/libtinfo.so.5.9 b/3d_party/linux/ubuntu/lib/libtinfo.so.5.9
deleted file mode 100644
index 90026dbdb..000000000
Binary files a/3d_party/linux/ubuntu/lib/libtinfo.so.5.9 and /dev/null differ
diff --git a/CHANGES.md b/CHANGES.md
index 80093bf9a..5625ba078 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,109 +1,14 @@
-### 2023-01-31 version 0.8.6.4
-
-#### New features and enhancements
-  * install_ydk.sh: Installation of Python and Go YDK packages should not require root access ([#1069](https://github.com/CiscoDevNet/ydk-gen/issues/1069))
-  * Expanded unit test cases to retrieve list elements
-
-#### Resolved GitHub issues
-  * CodecService fails to decode XML in python when referencing namespace prefix ([#1071](https://github.com/CiscoDevNet/ydk-gen/issues/1071))
-  * CiscoDevNet YDK C++ README needs Documentation & Support links updated ([#1077](https://github.com/CiscoDevNet/ydk-gen/issues/1077))
-  * Error in ydk-gen-master/test/dependencies_centos.sh version check ([#1078](https://github.com/CiscoDevNet/ydk-gen/issues/1078))
-  * not_eq is a c++ keyword ([#1080](https://github.com/CiscoDevNet/ydk-gen/issues/1080))
-  * libyang issue with arguments that are swapped ([#1081](https://github.com/CiscoDevNet/ydk-gen/issues/1081))
-
-### Resolved non-GitHub issues
-  * Fixed and tested C++ sample apps
-
-
-### 2022-07-31 version 0.8.6.3
-
-#### New features and enhancements
-  * Added automatic build of environment setup file .env by the installation script
-
-#### Resolved GitHub issues
-  * IndexError on decoding empty string value in JSON payload ([#1061](https://github.com/CiscoDevNet/ydk-gen/issues/1061))
-  * gNMI service installation on Centos 8.2 fails due to C++ compiler error
-([#1062](https://github.com/CiscoDevNet/ydk-gen/issues/1062))
-  * The installation script fails on fresh new CentOS 7 docker container ([#1064](https://github.com/CiscoDevNet/ydk-gen/issues/1064))
-  * ExecutorService fails on non-ietf RPC with Libyang error ([#1067](https://github.com/CiscoDevNet/ydk-gen/issues/1067))
-
-### Resolved non-GitHub issues
-  * Upgraded third party packages Sphinx (1.5.6) and wheel (0.37.1) due to documentation
-generation issues on Mac Big Sur
-  * Fixed installation script for the case, when virtual environment is not used
-
-#### Documentation improvements
-  * Fixed documentation issue [#1066](https://github.com/CiscoDevNet/ydk-gen/issues/1066)
-
-### 2022-03-31 version 0.8.6.2
-
-#### New features and enhancements
-  * Improved installation script to allow use of Python system installation
-  * Corrected few Codacy issues
-  * Added support for MacOS Big Sur
-
-#### Resolved GitHub issues
-  * Fixed Python 3.5 code compatibility issue for Ubuntu:xenial
-  * install_ydk.sh tries to create a new venv ([#1034](https://github.com/CiscoDevNet/ydk-gen/issues/1034))
-  * getting YCodecError when leaf value has string 'sftp://' ([#1056](https://github.com/CiscoDevNet/ydk-gen/issues/1056))
-  * vrf route-target leaf stitching(bool) fails as invalid ([#1059](https://github.com/CiscoDevNet/ydk-gen/issues/1059))
-  
-### Resolved non-GitHub issues
-  * Addressed segmentation fault error when required modules are not loaded.
-  * Patched catch.hpp for Linux distributions that do not define SIGSTKSZ
-
-#### Bundle improvements
-  * Cleaned up older profiles
-
-
-### 2021-09-30 version 0.8.6
-
-#### New features and enhancements
-  * Upgraded pyang version to 2.5.0
-  * Create go wrapper for NetconfSession and other path APIs ([#779](https://github.com/CiscoDevNet/ydk-gen/issues/779))
-  * Added SSL support for NetconfServiceProvider in Go
-  * Dropped Python2 support in the code
-
-#### Resolved GitHub issues
-  * Go function EntityEqual result depends on parameters order ([#1053](https://github.com/CiscoDevNet/ydk-gen/issues/1053))
-  * Failed to get "ietf-netconf" module with Executor Service and get-schema RPC ([#1047](https://github.com/CiscoDevNet/ydk-gen/issues/1047))
-  * The Executor Service fails to return module content back to user ([#1048](https://github.com/CiscoDevNet/ydk-gen/issues/1048))
-
-#### Bundle improvements
-  * Updated cisco-ios-xr bundle (profile cisco-ios-xr_6_7_3.json) to support Cisco IOS XR 6.7.3
-  * Updated openconfig bundle (profile openconfig_0_1_9.json) to support YANG models of revision "2020-05-06"
-  * Updated ietf bundle (profile ietf_0_1_6.json) to support YANG models of revision "2018-02-14"
-  * Added bundle profiles to support Cisco IOS XR 7.0.1 and 7.0.2
-
-
-### 2021-05-30 version 0.8.5.2
-
-#### Resolved GitHub issues
-  * Version numbers in bundle resolver to comply with PEP 440 ([#1007](https://github.com/CiscoDevNet/ydk-gen/issues/1007))
-  * The Executor Service fails to return module content to user ([#1035](https://github.com/CiscoDevNet/ydk-gen/issues/1035))
-  * Docker base image python error ([#1036](https://github.com/CiscoDevNet/ydk-gen/issues/1036))
-  * XmlSubtreeCodec fails encode leaf-list data ([#1045](https://github.com/CiscoDevNet/ydk-gen/issues/1045))
-  * C++ CodecService fails to encode non-top level entity to XML subtree ([#1049](https://github.com/CiscoDevNet/ydk-gen/issues/1049))
-
-#### Other resolved issues and enhancements
-  * Fixed few minor bugs in C++ code
-  * Added installation of flex and bison for CentOS platform
-  * Added scripts for local unit testing of YDK release
-  * Tested YDK on Windows 10 using Windows Subsystem for Linux and Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) virtual machines.
-  
-
-### 2020-09-30 version 0.8.5
+### 2020-07-30 version 0.8.5
 
 #### New features and enhancements
   * Develop utility function to clone Entity instance ([#967](https://github.com/CiscoDevNet/ydk-gen/issues/967))
   * Go CodecService fails to encode leaf-list data ([#968](https://github.com/CiscoDevNet/ydk-gen/issues/968))
   * Developed script install_ydk, which allows to install YDK from source in one CLI command
-  * Added support for CentOS/RHEL-8 and Ubuntu-20.04 (focal) ([#1019](https://github.com/CiscoDevNet/ydk-gen/issues/1019))
 
 #### Resolved GitHub issues
   * gNMI set RPC fails when JSON payload is formatted string
   * Enhance generator to indicate how a YANG modules was processed ([#894](https://github.com/CiscoDevNet/ydk-gen/issues/894))
-  * Restconf in YDK should support HTTPS (partially resolved) ([#917](https://github.com/CiscoDevNet/ydk-gen/issues/917))
+  * Restconf in YDK should support HTTPS (partialy resolved) ([#917](https://github.com/CiscoDevNet/ydk-gen/issues/917))
   * Go fails to process filters on enum and identity leaves and leaf-lists ([#969](https://github.com/CiscoDevNet/ydk-gen/issues/969))
   * YDK fails create bundle package when package name contains '.' ([#978](https://github.com/CiscoDevNet/ydk-gen/issues/978))
   * python bundle generator must escape 'async' as variable name ([#980](https://github.com/CiscoDevNet/ydk-gen/issues/980))
@@ -113,10 +18,6 @@ generation issues on Mac Big Sur
   * create_datanode in Path API returns incorrect object and sets incorrect value ([#1003](https://github.com/CiscoDevNet/ydk-gen/issues/1003))
   * create_datanode rejects absolute paths with a leading "/" as defined in RFC 7950 ([#1005](https://github.com/CiscoDevNet/ydk-gen/issues/1005))
   * Path API create_datanode rejects valid value ([#1006](https://github.com/CiscoDevNet/ydk-gen/issues/1006))
-  * data tag not recognized when attribute present ([#1021](https://github.com/CiscoDevNet/ydk-gen/issues/1021))
-  * c++ generated bundle class fails to compile in gcc when model contains leaf 'minor' ([#1024](https://github.com/CiscoDevNet/ydk-gen/issues/1024))
-  * ydk.path.codec.decode validates incorrect XML payload ([#1026](https://github.com/CiscoDevNet/ydk-gen/issues/1026))
-  * Python 3 TypeError while initializing CRUDService class ([#1032](https://github.com/CiscoDevNet/ydk-gen/issues/1032))
 
 #### Bundle improvements
   * Updated cisco-ios-xe bundle to support Cisco IOS XE 16.9.3 due to bug in Python generated code
@@ -459,7 +360,7 @@ The [backward incompatible](http://ydk.cisco.com/py/docs/backward_compatibility.
  * Add support for choosing either a per-device or a common cache for storing downloaded yang models ([#502](https://github.com/CiscoDevNet/ydk-gen/pull/502))
  * Introduced encoding/decoding subtree XML in `CodecService` and changed `CRUDService` to use XML subtree filtering to create filters for the `read` operation ([#489](https://github.com/CiscoDevNet/ydk-gen/pull/489))
  * Added support for non-standard RPCs as well in path API ([#498](https://github.com/CiscoDevNet/ydk-gen/pull/498))
- * Add ability to generate Linux and MacOS packages in cmake using [cpack](https://cmake.org/Wiki/CMake:Packaging_With_CPack) ([#466](https://github.com/CiscoDevNet/ydk-gen/pull/466))
+ * Add ability to generate Linux and Mac OSX packages in cmake using [cpack](https://cmake.org/Wiki/CMake:Packaging_With_CPack) ([#466](https://github.com/CiscoDevNet/ydk-gen/pull/466))
 
 #### ydk-gen
  * Updated [`cisco-ios-xr`](https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_2_2.json) to support Cisco IOS XR 6.2.2 release
@@ -533,7 +434,7 @@ The [backward incompatible](http://ydk.cisco.com/py/docs/backward_compatibility.
   * RestconfServiceProvider
   * OpenDaylightServiceProvider
 * Introduced support for netconf service ([#341](https://github.com/CiscoDevNet/ydk-gen/pull/341), [#352](https://github.com/CiscoDevNet/ydk-gen/pull/352))
-* Released ydk-cpp for MacOS platform (on [Homebrew](https://github.com/CiscoDevNet/homebrew-ydk)) and on Ubuntu platform (on [Lauchpad](https://launchpad.net/~ydk)) ([#362](https://github.com/CiscoDevNet/ydk-gen/pull/362), [#322](https://github.com/CiscoDevNet/ydk-gen/pull/322))
+* Released ydk-cpp for OSX platform (on [Homebrew](https://github.com/CiscoDevNet/homebrew-ydk)) and on Ubuntu platform (on [Lauchpad](https://launchpad.net/~ydk)) ([#362](https://github.com/CiscoDevNet/ydk-gen/pull/362), [#322](https://github.com/CiscoDevNet/ydk-gen/pull/322))
 * Added support for generated CRUD model tests based on bundles ([#354](https://github.com/CiscoDevNet/ydk-gen/pull/354))
 * Improved negative test cases and added support for netconf operations on leafs and leaf-lists ([#324](https://github.com/CiscoDevNet/ydk-gen/pull/324))
 
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index 9abef354b..bd1bde8eb 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -1,8 +1,7 @@
 **Contributing to YDK**
 
-* Please read and follow the [coding style guidelines](CODINGSTYLE.md).
-* Make sure you have run all the tests on your code changes and try to add sufficient test cases for your changes.
-  Enable Travis CI to be run on your fork by going to `https://travis-ci.org/<your-github-user-id>/ydk-gen`.
+* Please first read and follow the [coding style guidelines](CODINGSTYLE.md).
+* Make sure you have run all the tests on your code changes and try to add sufficient test cases for your changes. To do this, enable Travis CI to be run on your fork by going to `https://travis-ci.org/<your-github-user-id>/ydk-gen`.
 * Make your changes and push them to your fork.
-* Submit a pull request. Your changes will be code reviewed on github prior to being accepted.
+* Please submit a pull request. Your changes will be code reviewed on github prior to being accepted.
 * Per Section 5 of the Apache 2.0 License, contributions to this project are made under the Apache 2.0 License.
diff --git a/Copyright b/Copyright
index 0afe81ad9..f16959267 100644
--- a/Copyright
+++ b/Copyright
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/Dockerfile b/Dockerfile
index e6727ce31..3c48607a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,5 +23,3 @@ RUN export GOROOT=/usr/local/go && export PATH=$GOROOT/bin:$PATH
 RUN export GOPATH=/root/golang
 RUN python3 generate.py -i --core --go
 RUN python3 generate.py -i --service profiles/services/gnmi-0.4.0.json --go
-
-RUN ln -s /usr/bin/python3 /usr/bin/python
diff --git a/README.md b/README.md
index 7992c5dbe..34d702c54 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!---
 # *************************************************************
 #  YDK-YANG Development Kit
-#  Copyright 2016-2019 Cisco Systems. All rights reserved
+#  Copyright 2016 Cisco Systems. All rights reserved
 # *************************************************************
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -33,52 +33,54 @@
 
 ![ydk-logo-128](https://cloud.githubusercontent.com/assets/16885441/24175899/2010f51e-0e56-11e7-8fb7-30a9f70fbb86.png)
 
-YANG Development Kit
-====================
+YANG Development Kit (Generator)
+================================
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**
 
 - [Overview](#overview)
-- [Backward Compatibility](#backward-compatibility)
+- [Backward compatibility](#backward-compatibility)
 - [Docker](#docker)
-- [System Requirements](#system-requirements)
-- [Core Installation](#core-installation)
-  - [Installation script](#installation-script)
-  - [Building from source](#building-from-source)
-  - [Adding gNMI service](#adding-gnmi-service)
-- [Generate YDK Components](#generate-ydk-components)
+- [System requirements](#system-requirements)
+  - [Linux](#linux)
+  - [MacOSX](#mac-osx)
+  - [Windows](#windows)
+- [YDK Python Installation](#ydk-python-installation)
+  - [Setting up Python virtual environment](#setting-up-python-virtual-environment)
+  - [Clone ydk-gen and install the requirements](#clone-ydk-gen-and-install-the-requirements)
+- [Generate YDK components](#generate-ydk-components)
+  - [Generate and install the core](#generate-and-install-the-core)
   - [Build model bundle profile](#build-model-bundle-profile)
   - [Generate and install model bundle](#generate-and-install-model-bundle)
   - [Writing your first app](#writing-your-first-app)
-  - [Generating Documentation](#generating-documentation)
-  - [Generating an "Adhoc" YDK-Py Bundle](#generating-an-adhoc-ydk-py-bundle)
+  - [Documentation](#documentation)
+- [Generating an "Adhoc" YDK-Py Bundle](#generating-an-adhoc-ydk-py-bundle)
 - [Notes](#notes)
-  - [Python requirements](#python-requirements)
-  - [C++ requirements](#c-requirements)
+  - [Python Requirements](#python-requirements)
   - [Directory structure](#directory-structure)
   - [Troubleshooting](#troubleshooting)
 - [Running Unit Tests](#running-unit-tests)
   - [Python](#python)
   - [C++](#c)
   - [Go](#go)
-- [Documentation and Support](#documentation-and-support)
+- [Support](#support)
 - [Release Notes](#release-notes)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 # Overview
 
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The YDK allows generate YANG model API and provides services to apply generated API over various communication protocols.
+**YDK** is a developer tool that allows generate YANG model API's in multiple languages and provides services
+to apply generated API over multiple communication protocols.
+Currently supported languages are: Python, Go and C++.
 Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
-YDK provides CRUD and protocol specific services over above protocols.
-YDK also provides codec services to translate API models to/from XML and JSON encoded strings.
-
-The YDK is a multi-language software. Currently supported languages are Python, Go, and C++.
+YDK provides CRUD and protocol specific service over above protocols.
+YDK also provides Codec services to translate API models to/from XML and JSON encoded strings.
 
 Other tools and libraries are used to deliver `YDK` functionality:
+
 * YANG model analysis and code generation is implemented using APIs from the [pyang](https://github.com/mbj4668/pyang) library
 * Documentation is generated using [Sphinx](http://www.sphinx-doc.org/en/stable/)
 * Runtime YANG model analysis is done using [libyang](https://github.com/CESNET/libyang)
@@ -90,217 +92,300 @@ or add-on service package like gNMI Service, or a module bundle, consisting of p
 Each module bundle is generated using a bundle profile and the ydk-gen tool.
 Developers can either use pre-packaged generated bundles (e.g. [ydk-py](http://cs.co/ydk-py)),
 or define their own bundle, consisting of a set of YANG models, using a bundle profile
-(e.g. [`ietf_0_1_5.json`](profiles/bundles/ietf_0_1_5.json)).
+(e.g. [`ietf_0_1_1.json`](profiles/bundles/ietf_0_1_1.json)).
 This gives the developer an ability to customize scope of their bundle based on their requirements.
 
 
-# Backward Compatibility
+# Backward compatibility
 
-The YDK-0.8.6 core is backward compatible with all previously generated model bundles starting from release of YDK-0.7.3.
-However the YDK-0.8.6 generates different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling of YList objects.
+The YDK-0.8.5 core is backward compatible with all previously generated model bundles starting from release of YDK-0.7.3.
+However the YDK-0.8.5 generates different code and model API comparing to YDK-0.8.4.
+The YDK-0.8.5 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling YList objects.
 
-**NOTE.** Starting from release 0.8.6 the YDK does not support Python2 interpreter as it was deprecated.
 
 # Docker
 
 A [docker image](https://docs.docker.com/engine/reference/run/) is automatically built with the latest ydk-gen commit.
-This docker can be used to run ydk-gen without installing anything natively on your platform.
+This docker can be used to run ydk-gen without installing anything natively on your machine.
 
 To use the docker image, [install docker](https://docs.docker.com/install/) on your system and run the below command.
 See the [docker documentation](https://docs.docker.com/engine/reference/run/) for more details.
 
 ```
-docker run -it ydksolutions/ydk-gen:0.8.6.4
+docker run -it ydkdev/ydk-gen
 ```
 
-# System Requirements
+# System requirements
+
+Please follow the below instructions to install the system requirements before installing YDK-Py/YDK-Cpp/YDK-Go.
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x 
- - MacOS up to 11.6.2 (Big Sur)
+**Please note**. If you are using the latest ydk-gen master branch code, you may not be able to use prebuilt libraries and packages.
+In this case you need to build all the components [from source](#build-from-source) after installing the below requirements:
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check [this](https://www.windowscentral.com/install-windows-subsystem-linux-windows-10) for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+## Linux
 
-On supported platforms the YDK can be installed using [installation script](#installation-script).
-On other platforms the YDK should be installed manually [from source](#building-from-source).
-For both the methods the user must install `git` package prior to the installation procedure.
+### Ubuntu (Debian-based)
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+#### Install OS dependency packages
+
+```
+sudo apt-get install gdebi-core python3-dev libtool-bin
+sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
 
-# Core Installation
+# Upgrade compiler to gcc 5.*
+sudo apt-get install gcc-5 g++-5 -y > /dev/null
+sudo ln -sf /usr/bin/g++-5 /usr/bin/g++
+sudo ln -sf /usr/bin/gcc-5 /usr/bin/gcc
+```
 
-## Installation script
+#### Install libydk library
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
+You can install the latest `libydk` core library using prebuilt binaries for Xenial and Bionic distributions.
+The C++ code was compiled with default gcc compiler version for these distributions.
+For other Ubuntu distributions and/or gcc compiler versions it is recommended to build `libydk` library [from source](#build-from-source).
 
-If the script installs any YDK component, it also creates an environment activation file '.env' in the 'ydk-gen'
-directory, which can be used to activate YDK runtime environment identical to the installation environment.
-To activate YDK runtime environment simply run this command once in bash shell:
+##### Xenial (Ubuntu 16.04.4, gcc-5.5.0):
 
 ```
-cd ydk-gen
-source .env
+wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+sudo gdebi libydk-0.8.5-1.amd64.deb
 ```
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-For different location the PYTHON_VENV environment variable should be set to that location.
+##### Bionic (Ubuntu 18.04.1, gcc-7.4.0):
+
+```
+wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+sudo gdebi libydk-0.8.5-1.amd64.deb
+```
 
-**NOTE.** It is strongly recommended to use Python virtual environment on Centos/RHEL and Mac platforms.
+### CentOS-7 (Fedora-based)
 
-When installing YDK for Python or Go programming languages, the third party dependencies and C++ packages must be installed first.
-This step requires sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Python programming language and Python virtual environment:
+#### Install OS dependency packages
 
 ```
-git clone https://github.com/ygorelik/ydk-gen.git
-cd ydk-gen
-export YDKGEN_HOME=`pwd`  # optional
-export PYTHON_VENV=$HOME/ydk_vne  # optional
-./install_ydk.sh --cpp --core --venv   # This step requires sudo access!
-./install_ydk.sh --py --core --venv
+sudo yum install epel-release
+sudo yum install libssh-devel gcc-c++ python3-devel
 ```
 
-The script also allows installing individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this:
+if your gcc compiler version is below 4.8.1, install gcc-5 and g++-5
 
 ```
-./install_ydk.sh --help
-usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-Options and arguments:
-  --cpp                 install YDK for C++ programming language;
-                        requires sudo access for dependencies and libraries installation
-  --go                  install YDK for Go programming language
-  --py|--python         install YDK for Python programming language
-  --all                 install YDK for all available programming languages;
-                        requires sudo access for dependencies and libraries installation
-  -v|--venv             create python virtual environment
-  -c|--core             install YDK core package
-  -s|--service gnmi     install gNMI service package
-  -n|--no-deps          skip installation of dependencies;
-                        applicable only with --cpp and --all options
-  -h|--help             print this help message and exit
+sudo yum install centos-release-scl -y > /dev/null
+sudo yum install devtoolset-4-gcc* -y > /dev/null
+sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
+sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
+```
+
+#### Install libydk library
 
-Environment variables:
-YDKGEN_HOME         specifies location of ydk-gen git repository;
-                    if not set, $HOME/ydk-gen is assumed
-PYTHON_VENV         specifies location of python virtual environment;
-                    if not set, $HOME/venv is assumed
-GOROOT              specifies installation directory of go software;
-                    if not set, /usr/local/go is assumed
-GOPATH              specifies location of go source directory;
-                    if not set, $HOME/go is assumed
-C_INCLUDE_PATH      location of C include files;
-                    if not set, /usr/local/include is assumed
-CPLUS_INCLUDE_PATH  location of C++ include files;
-                    if not set, /usr/local/include is assumed
-CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                    if not set, default system library location is assumed
+The C++ code was compiled with default gcc compiler version, which is 4.8.5. For other gcc compiler versions it is recommended to build `libydk` library [from source](#build-from-source).
+
+```  
+sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 ```
 
-If user environment is different from the default one (different Python installation or different
-location of libraries) then building from source method should be used.
+## Mac OSX
 
-## Building from source
+It is recommended to install [homebrew](http://brew.sh) and Xcode command line tools on your system before installing YDK software.
 
-### Environment variables
+#### Install OS dependency packages
 
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the header files location must be specified explicitly (in below commands the default location is shown):
+```
+xcode-select --install
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+brew install pkg-config libssh xml2 curl pcre cmake libxml2 doxygen libgcrypt
+brew install python pybind11
+```
+
+#### Install libydk package
+
+The prebuilt `libydk` package was compiled in MacOS-10.11.6 with clang-8.0.0 compiler.
+For other C++ compilers it is recommended to build `libydk` [from source](#build-from-source).
 
 ```
-  export C_INCLUDE_PATH=/usr/local/include
-  export CPLUS_INCLUDE_PATH=/usr/local/include
+curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
 ```
 
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
+## Libssh installation
 
-### Installing third party dependencies
+Please note that libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required by YDK. Therefore, if after installation of libssh package you find that the `libssh_threads.a` library is missing,
+please downgrade the installation of libssh to version 0.7.6, or upgrade to 0.8.1 or higher.
 
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script. 
-The script will also install Python virtual environment in default or specified location, when '--venv' is specified.
+**Note for MacOS**
+Before installing `libssh` make sure the environment for `openssl` is setup:
 
 ```
-# Clone ydk-gen from GitHub
-git clone https://github.com/ygorelik/ydk-gen.git
-cd ydk-gen
+brew reinstall openssl
+export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
+```
+
+Download libssh-0.7.6 source code, compile it and install:
+
+```
+wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
+mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
+cmake ..
+sudo make install
+```
+
+## Windows
+
+From release ``0.6.0`` the YDK is not supported on Windows.
+
+## gNMI Requirements
 
-# Define optional environment variables and install dependencies
-export YDKGEN_HOME=`pwd`  
-export PYTHON_VENV=$HOME/ydk_venv
-./install_ydk.sh -v   # also builds Python virtual environment
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software
+must be installed prior to gNMI YDK component installation.
+
+### Install protobuf and protoc
+
+```
+wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+unzip protobuf-cpp-3.5.0.zip
+cd protobuf-3.5.0
+./configure
+make
+sudo make install
+sudo ldconfig
 ```
 
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
- 
-### Installing core components
+### Install gRPC
 
 ```
-# If created, activate YDK runtime environment
-source .env
+git clone -b v1.9.1 https://github.com/grpc/grpc
+cd grpc
+git submodule update --init
+make
+sudo make install
+sudo ldconfig
+cd -
+```
+
+### Install YDK gNMI library
 
-# Generate and install YDK core library
-python3 generate.py -is --core --cpp
+#### Ubuntu
 
-# For Python programming language add
-python3 generate.py -i --core --py
+##### Xenial (Ubuntu 16.04.4, gcc-5.5.0):
 
-# For Go programming language add
-python3 generate.py -i --core --go
+```
+wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 ```
 
-## Adding gNMI service
+##### Bionic (Ubuntu 18.04.1, gcc-7.4.0))
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package. 
+```
+wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+```
 
-### gNMI service installation
+#### CentOS
 
-Here is simple example how gNMI service package for Python virtual environment could be added:
+The `libydk_gnmi` package was compiled with gcc-4.8.5.
 
 ```
-cd ydk-gen
-./install_ydk.sh --cpp --service gnmi -v  # requires sudo access
-./install_ydk.sh --py --service gnmi -v
+sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
 ```
 
-### Runtime environment
+#### MacOS:
+
+The prebuilt `libydk_gnmi` package was compiled in MacOS-10.11.6 with clang-8.0.0 compiler.
+For other C++ compilers it is recommended to build `libydk` library [from source](#build-from-source)
+
+```
+curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
+```
 
-When YDK is installed using 'install_ydk.sh' script, the runtime environment is set by running 'source .env' in bash shell.
-The below information is applicable only when YDK is installed manually, which is not recommended.
+### Runtime environment
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
+There is an open issue with gRPC on Centos/Fedora, which requires an extra step before running any YDK gNMI application.
 See this issue on [GRPC GitHub](https://github.com/grpc/grpc/issues/10942#issuecomment-312565041) for details.
 As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
 
 ```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
 ```
 
-# Generate YDK components
+## Build from source
 
-All the YDK components/packages can be generated by using Python script `generate.py`. To get all of its options run:
+Install dependencies OS dependencies then generate and install YDK C++ libraries; you might need
+sudo access to install the libraries in default locations, which are `/usr/local/lib` and `/usr/local/include`.
 
 ```
+# Clone ydk-gen from GitHub
+git clone https://github.com/CiscoDevNet/ydk-gen.git -b 0.8.5
 cd ydk-gen
-source .env
-python3 generate.py --help
+pip install -r requirements.txt
+
+# Generate and install libydk library
+./generate -is --cpp --core
+
+# Generate and install libydk_gnmi library (optional)
+./generate -is --cpp --service profiles/services/gnmi-0.4.0.json
+```
+
+# YDK Python Installation
+
+## Setting up Python virtual environment
+
+We recommend that you run `ydk-gen` under Python virtual environment.
+
+### Create Python virtual environment
+
+To install Python virtual environment in your system, execute:
+
+#### Linux OS
+
+##### Python 3.5 and up
+
+```
+python3 -m venv /your/virtualenv/directory
+```
+
+##### Python 3.4 and below
+
+```
+pip install virtualenv
+virtualenv -p python2.7 /your/virtualenv/directory
+```
+
+#### MacOS
+
+```
+pip3 install virtualenv
+virtualenv -p python3 /your/virtualenv/directory
+```
+
+### Activate just created virtual environment
+
+```
+source /your/virtualenv/directory/bin/activate
+```
+
+### Exit virtual environment
+
+```
+deactivate
+```
+
+## Clone ydk-gen and install the requirements
+
+```
+git clone https://github.com/CiscoDevNet/ydk-gen.git
+cd ydk-gen
+pip install -r requirements.txt
+```
+
+## Generate YDK components
+All the YDK components/packages can be generated by using Python script `generate.py`.
+
+```
+./generate.py --help
 usage: generate.py [-h] [-l] [--core] [--service SERVICE] [--bundle BUNDLE]
                    [--adhoc-bundle-name ADHOC_BUNDLE_NAME]
                    [--adhoc-bundle ADHOC_BUNDLE [ADHOC_BUNDLE ...]]
@@ -335,42 +420,64 @@ optional arguments:
   -v, --verbose         Verbose mode
   -o, --one-class-per-module
                         Generate separate modules for each python class
-                        corresponding to YANG containers or lists.
+                        corresponding to yang containers or lists.
 ```
+The below steps specify how to use `generate.py` to generate YDK core, model bundle, and service packages. All these packages are available for Python, Go and C++ in corresponding github repositories: [ydk-py](https://github.com/CiscoDevNet/ydk-py),  [ydk-go](https://github.com/CiscoDevNet/ydk-go) and [ydk-cpp](https://github.com/CiscoDevNet/ydk-cpp).
+
+The script [create_ydk_sdk_for_github.sh](create_ydk_sdk_for_github.sh) can be used to generate the `ydk-py`, `ydk-cpp` and `ydk-go` repositories after having generated all the bundles and core packages using `generate.py`.
+
+## Generate and install the core
+
+Some model bundles have bin packaged and published in [Pypi](https://pypi.org) repository. These bundles can be installed with `pip` utility. For example, when executing `pip install ydk-models-cisco-ios-xr`, you will install the latest released in PyPi IOS XR device package.
 
-The below steps specify how to use `generate.py` to generate YDK core, model bundle, and service packages.
-In all the examples the script is executed from `ydk-gen` directory. 
-It is assumed that Python virtual environment is activated. 
-All the packages are available for Python, Go and C++ in corresponding github repositories: 
-[ydk-py](https://github.com/CiscoDevNet/ydk-py),  [ydk-go](https://github.com/CiscoDevNet/ydk-go) 
-and [ydk-cpp](https://github.com/CiscoDevNet/ydk-cpp).
+**Note:**
+There usually would have been changes on the master branch since the last [released version](https://github.com/CiscoDevNet/ydk-py/releases). To install the latest code at your own risk, you need to follow the below steps in the exact order.
 
-The script [create_ydk_sdk_for_github.sh](create_ydk_sdk_for_github.sh) can be used to generate the `ydk-py`, 
-`ydk-cpp` and `ydk-go` repositories after having generated all the bundles and core packages using `generate.py`.
+First generate and install `libydk`
+
+```
+./generate.py --libydk
+cd gen-api/cpp/ydk/build
+make
+[sudo] make install
+```
+
+To create the libydk binary package to use for later installation, run the below command
+
+```
+[sudo] make package
+```
+
+For Python:
+
+```
+./generate.py --python --core
+pip install gen-api/python/ydk/dist/ydk*.tar.gz
+```
+
+For Go:
+
+```
+export $GOPATH=/your-go-path-installation-directory
+./generate.py --go --core
+```
 
 ## Build model bundle profile
 
-The first step in using ydk-gen is either using one of the already built 
-[bundle profiles](https://github.com/ygorelik/ydk-gen/tree/master/profiles/bundles) or constructing your own 
-bundle profile, consisting of the YANG models you are interested to include into the bundle:
+The first step in using ydk-gen is either using one of the already built [bundle profiles](https://github.com/CiscoDevNet/ydk-gen/tree/master/profiles/bundles) or constructing your own bundle profile, consisting of the YANG models you are interested to include into the bundle:
 
-Construct a bundle profile file, such as [```ietf_0_1_5.json```](profiles/bundles/ietf_0_1_5.json)
-and specify its dependencies.
+Construct a bundle profile file, such as [```ietf_0_1_1.json```](profiles/bundles/ietf_0_1_1.json) and specify its dependencies.
 
-A sample bundle profile file is described below. The file is in a JSON format. The profile must define the `"name"`, 
-`"version"` and `"description"` of the bundle, and then the `"core_version"`, which refers to 
-[the version](https://github.com/CiscoDevNet/ydk-gen/releases) of the ydk core package that you want to use with this bundle.
-The `"name"` of the bundle will form part of the installation path of the bundle.
-All other attributes, like `"author"` and `"copyright"`, are optional and will not affect the bundle generation. 
+A sample bundle profile file is described below. The file is in a JSON format. Specify the `"name"` of your bundle, the `"version"` of the bundle and the `"core_version"`, which refers to [the version](https://github.com/CiscoDevNet/ydk-gen/releases) of the ydk core package you want to use with this bundle. The `"name"` of the bundle here is especially important as this will form part of the installation path of the bundle.
 
 ```
 {
     "name":"cisco-ios-xr",
     "version": "6.5.3",
-    "core_version": "0.8.6",
-    "author": "Cisco",
-    "copyright": "Cisco",
-    "description": "Cisco IOS-XR Native Models From Git",
+    "core_version": "0.8.5",
+    "Author": "Cisco",
+    "Copyright": "Cisco",
+    "Description": "Cisco IOS-XR Native Models From Git",
 ```
 
 The `"models"` section of the profile describes sources of YANG models. It could contain combination of elements:
@@ -424,109 +531,119 @@ Only directory examples are shown in this example.
 ## Generate and install model bundle
 
 Generate model bundle using a bundle profile and install it.
-YDK runtime environment must be activated prior to these procedures.
 
-### For Python
+For Python:
+
+```
+./generate.py --python --bundle profiles/bundles/<name-of-profile>.json
+[sudo] pip install gen-api/python/<name-of-bundle>-bundle/dist/ydk*.tar.gz
+```
 
-If applicable, the Python virtual environment must be activated prior to these procedures
+or using installation options:
 
 ```
-python3 generate.py --python --bundle profiles/bundles/<name-of-profile>.json -i
+./generate.py --bundle profiles/bundles/<name-of-profile>.json -i [-s]
 ```
 
-Check Python packages installed:
+Now, the `pip list | grep ydk` should show the `ydk` (referring to the core package) and `ydk-<name-of-bundle>` packages installed:
 
 ```
 pip list | grep ydk
-ydk (0.8.6.4)
+...
+
+ydk (0.8.5)
 ydk-models-<name-of-bundle> (0.5.1)
 ...
 ```
 
-### For Go
+For Go:
 
 ```
-python3 generate.py --go --bundle profiles/bundles/<name-of-profile>.json -i
+export $GOPATH=/your-go-path-installation-directory
+./generate.py --go --bundle profiles/bundles/<name-of-profile>.json -i
 ```
 
-### For C++
+For C++:
 
 ```
-python3 generate.py --cpp --bundle profiles/bundles/<name-of-profile>.json -is
+./generate.py --cpp --bundle profiles/bundles/<name-of-profile>.json
+cd gen-api/cpp/<name-of-bundle>-bundle/build
+make
+[sudo] make install
+```
+
+or using installation options:
+
+```
+./generate.py --cpp --bundle profiles/bundles/<name-of-profile>.json -i [-s]
 ```
 
 ## Writing your first app
 
 Now, you can start creating apps based on the models in your bundle.
-Assuming you have generated a python bundle, the models will be available for importing in your app under
+Assuming you generated a python bundle, the models will be available for importing in your app under
 `ydk.models.<name-of-your-bundle>`.
 For examples, see [ydk-py-samples](https://github.com/CiscoDevNet/ydk-py-samples#a-hello-world-app) and
 [C++ samples](sdk/cpp/samples).
 Also refer to the [documentation for python](http://ydk.cisco.com/py/docs/developer_guide.html),
 [Go](http://ydk.cisco.com/go/docs/developer_guide.html) and
-[C++](http://ydk.cisco.com/cpp/docs/developer_guide.html).
+[for C++](http://ydk.cisco.com/cpp/docs/developer_guide.html).
 
-## Generating Documentation
+## Documentation
 
-In order to generate YDK core and bundles documentation, the `--generate-doc` option of `generate.py` script is used, 
-while generating core package. Therefore the user should generate all the bundles without the `--generate-doc` 
-option prior to the documentation generation.
+When generating the YDK documentation for several bundles and the core, it is recommended to generate the bundles without the `--generate-doc` option.
+After generating all the bundles, the combined documentation for all the bundles and the core can be generated using the `--core --generate-doc` option.
 For example, the below sequence of commands will generate the documentation for the three python bundles and the python core
 (for C++, use `--cpp`; for Go, use `--go`).
 
+Note that the below process could take few hours due to the size of the `cisco_ios_xr` bundle.
+
 ```
-python3 generate.py --python --bundle profiles/bundles/ietf_0_1_1.json
-python3 generate.py --python --bundle profiles/bundles/openconfig_0_1_1.json
-python3 generate.py --python --bundle profiles/bundles/cisco_ios_xr_6_1_1.json
-python3 generate.py --python --core --generate-doc
+./generate.py --python --bundle profiles/bundles/ietf_0_1_1.json
+./generate.py --python --bundle profiles/bundles/openconfig_0_1_1.json
+./generate.py --python --bundle profiles/bundles/cisco_ios_xr_6_1_1.json
+./generate.py --python --core --generate-doc
 ```
 
-**Note.** The documentation generation for bundles can take few hours due to their size. If you have previously 
-generated documentation using the `--cached-output-dir --output-directory <dir>` option,
-the add-on documentation generation time can be reduced. Adding cisco-ios-xr documentation as an example:
+If you have previously generated documentation, using the `--cached-output-dir --output-directory <dir>` option can be used to reduce document generation time. Taking Python as an example:
 
 ```
 mkdir gen-api/cache
 mv gen-api/python gen-api/cache
 
-python3 generate.py --python --bundle profiles/bundles/cisco_ios_xr_6_6_3.json
-python3 generate.py --python --core --generate-doc --output-directory gen-api --cached-output-dir
+./generate.py --python --bundle profiles/bundles/ietf_0_1_5.json
+./generate.py --python --bundle profiles/bundles/openconfig_0_1_5.json
+./generate.py --python --bundle profiles/bundles/cisco_ios_xr_6_3_2.json
+./generate.py --python --core --generate-doc --output-directory gen-api --cached-output-dir -v
 ```
 
-## Generating an "Adhoc" YDK-Py Bundle
+Pre-generated documentation for [ydk-py](http://ydk.cisco.com/py/docs/) and [ydk-cpp](http://ydk.cisco.com/cpp/docs/) are available.
 
-When YANG models available on the hard drive, there is capability to generate small model bundles, which include
-just few models. It is called an "adhoc" bundle. Such a bundle generated without profile directly from command line.
-Here is simple example:
+# Generating an "Adhoc" YDK-Py Bundle
+
+The ability to generate an adhoc bundle directly from the command line and without creating a bundle file can be done something like this:
 
 ```
-python3 generate.py -i --adhoc-bundle-name test --adhoc-bundle \
+./generate.py --adhoc-bundle-name test --adhoc-bundle \
     /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-ipv4-bgp-oper*.yang \
     /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-types.yang
     /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-ipv4-bgp-datatypes.yang
 ```
 
-This will generate a bundle that contains files specified in the `--adhoc-bundle` option and
-create Python package `ydk-models-test-0.1.0.tar.gz`, which has dependency on the base IETF bundle.
-Note that **all** dependencies for the bundle must be listed. It is expected that this option will be typically used
-for generating point model bundles for specific testing. The `--verbose` option is automatically enabled to quickly
-and easily let the user see if dependencies have been satisfied.
+When run in this way, we will generate a bundle that only contains the files specified with the `--adhoc-bundle` option, creating a `pip` package name by the `--adhoc-bundle-name`, with a version `0.1.0` and a dependency on the base IETF bundle. Note that **all** dependencies for the bundle must be listed, and the expectation is that this option will typically be used for generating point YDK-Py bundles for specific testing, the `--verbose` option is automatically enabled to quickly and easily let a user see if dependencies have been satisfied.
 
 # Notes
 
-## Python requirements
-
-Starting from release 0.8.5 YDK supports only Python3 version.  At least Python 3.5 along with corresponding pip3 utility 
-must be installed on your system. It is also required for Python installation to include corresponding shared 
-library. As example:
+## Python Requirements
 
- - python3.6m - /usr/lib/x86_64-linux-gnu/libpython3.6m.so
+YDK supports both Python2 and Python3 versions.  At least Python2.7 or Python3.4 along with corresponding utilities pip and pip3 must be installed on your system.
 
-It is recommended to follow [Core Installation](#core-installation) procedure to ensure presence of shared Python libraries.
+It is also required for Python installation to include corresponding shared library. As example:
 
-**NOTE.** Due to GitHub issue [#1050](https://github.com/CiscoDevNet/ydk-gen/issues/1050) YDK is not supported with Python 3.9.x.
+ - python2.7  - /usr/lib/x86_64-linux-gnu/libpython2.7.so
+ - python3.5m - /usr/lib/x86_64-linux-gnu/libpython3.5m.so
 
-## C++ requirements
+Please follow [System requirements](#system-requirements) to assure presence of shared Python libraries.
 
 In some OS configurations during YDK package installation the `cmake` fails to find C/C++ headers for installed YDK libraries.
 In this case the header location must be specified explicitly:
@@ -536,88 +653,127 @@ export C_INCLUDE_PATH=/usr/local/include
 export CPLUS_INCLUDE_PATH=/usr/local/include
 ```
 
+### Mac OS
+
+The developers of Python2 on Mac OS might face an issue ([#837](https://github.com/CiscoDevNet/ydk-gen/issues/837)).
+This is well known and documented issue. Each developer might have different approaches for its resolution.
+One of them is to use Python2 virtual environment. See [Setting up Python virtual environment](#setting-up-python-virtual-environment) for details.
+
 ## Directory structure
 
 ```
-gen-api         - generated code and packages for core and bundles
+README          - install and usage notes
+gen-api         - generated bundle/core
                     - python (Python SDK)
                     - go (Go SDK)
                     - cpp (C++ SDK)
 
-3d_party        - suplemental code for third party software
+generate.py     - script used to generate SDK for yang models
 profiles        - profile files used during generation
-sdk             - sdk core and stubs for python, go and cpp
-test            - dependencies and unit test shell scripts
-yang            - some YANG models used for testing
-ydkgen          - python code to extend generate.py script 
-
-create_ydk_sdk_for_github.sh - convenience script to generate language specific repositories
-generate_bundles.sh          - convinience script to generate core and bundle packages for deployment
-
-generate.py     - script used to generate SDK for YANG models
-install_ydk.sh  - YDK core components installation script
+yang            - some yang models used for testing
 requirements.txt- python dependencies used during installation
-README.md       - installation and usage notes
+sdk             - sdk core and stubs for python and cpp
+test            - test code
 ```
 
 ## Troubleshooting
 
-Sometimes, developers using ydk-gen may run across errors when generating a YDK bundle using generate.py with some yang models.
-If there are issues with the profile file being used, such JSON formatting errors will be evident.
-Other times, when the problem is not so evident, it is recommended to try running the script with the
-`[--verbose|-v]` flag, which may reveal syntax problems with the YANG models being used. For example:
+Sometimes, developers using ydk-gen may run across errors when generating a YDK bundle using generate.py with some yang models. If there are issues with the .json profile file being used, such errors will be easily evident. Other times, when the problem is not so evident, it is recommended to try running with the `[--verbose|-v]` flag, which may reveal syntax problems with the yang models being used. For example,
 
 ```
-python3 generate.py --python --bundle profiles/bundles/ietf_0_1_1.json --verbose
+./generate.py --python --bundle profiles/bundles/ietf_0_1_1.json --verbose
 ```
 
-Also, it may be a good idea to obtain a local copy of the YANG models and compile them using `pyang` to ensure
-the validity of the models and completeness of the model package:
-
+Also, it may be a good idea to obtain a local copy of the yang models and compile them using `pyang` to ensure the validity of the models,
 ```
 cd /path/to/yang/models
 pyang *.yang
 ```
 
-## Running Unit Tests
+# Running Unit Tests
+
+## Python
+
+#### Install the core and bundle packages
+
+After creating and activating [virtual environment](#setting-up-python-virtual-environment) install Python dependencies:
+
+```
+cd ydk-gen
+pip install -r requirements.txt
+```
+Then install core and bundle packages:
+
+```
+cd ydk-gen
+./generate.py -i --core
+./generate.py -i --bundle profiles/test/ydktest-cpp.json
+./generate.py -i --bundle profiles/test/ydktest-oc-nis.json
+```
+
+#### Start confd
+
+```
+source /confd/installation/directory/confdrc
+cd ydk-gen/sdk/cpp/core/tests/confd/ydktest
+make all
+make start
+```
+
+#### Run unit tests
+
+```
+cd ydk-gen/sdk/python
+python test/test_sanity_types.py
+python test/test_sanity_levels.py
+python test/test_sanity_filters.py
+```
+
+## C++
+
+#### Install the core and bundle packages
+
+```
+cd ydk-gen
+./generate.py -is --core --cpp
+./generate.py -is --bundle profiles/test/ydktest-cpp.json --cpp
+./generate.py -is --bundle profiles/test/ydktest-oc-nis.json --cpp
+```
 
-The repository includes complete set of unit tests for all supported languages. To invoke the test for specific language,
-simply get to 'ydk-gen' directory, activate runtime environment, if it was not done previously, and run language specific script.
-The script will install core and bundle packages and then perform the unit tests.
+#### Run the core tests
 
-**C++**
+```
+cd ydkgen/gen-api/cpp/ydk/build
+./test/ydk_core_test
+```
 
-    ```
-    cd ydk-gen
-    source .env  # if previously not run
-    ./test/run_cpp_tests
-    ```
+#### Start confd
 
-**Python**
+```
+source /confd/installation/directory/confdrc
+cd ydk-gen/sdk/cpp/core/tests/confd/ydktest
+make all
+make start
+```
 
-    ```
-    cd ydk-gen
-    source .env  # if previously not run
-    ./test/run_py_tests
-    ```
+#### Build and run bundle tests
 
-**Go**
+```
+cd ydk-gen/sdk/cpp/tests
+mkdir build && cd build
+cmake .. && make
+./ydk_bundle_test
+```
 
-    ```
-    cd ydk-gen
-    source .env  # if previously not run
-    ./test/run_go_tests
-    ```
+## Go
 
-# Documentation and Support
+Please refer [here](https://github.com/CiscoDevNet/ydk-gen/blob/master/sdk/go/core/README.md).
 
-<!--- - Read the online [YDK documentation](http://ydk.cisco.com/py/docs) (release 0.8.3) for details on how to use the YDK and API for specific models -->
-- Check [GitHub Pages](https://ygorelik.github.io/ydk-gen/) for the latest YDK release documentation
-- Find hundreds of sample apps in the [ydk-py-samples](https://github.com/CiscoDevNet/ydk-py-samples) repository
-- Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with YDK users and developers
+#### Support
 
-# Release Notes
+Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with other users and with the makers of YDK.
 
-The current YDK release version is 0.8.6.4.
+#### Release Notes
 
+The current YDK release version is 0.8.5. The version of the latest YDK-Gen master branch is 0.8.5.
 YDK-Gen is licensed under the Apache 2.0 License.
diff --git a/docs/.buildinfo b/docs/.buildinfo
deleted file mode 100644
index ec7b770f8..000000000
--- a/docs/.buildinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sphinx build info version 1
-# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 2d6e418c931c2f0eb9712caad15e91a8
-tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/.doctrees/about_ydk.doctree b/docs/.doctrees/about_ydk.doctree
deleted file mode 100644
index 6a96fb9ee..000000000
Binary files a/docs/.doctrees/about_ydk.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/class_hierarchy.doctree b/docs/.doctrees/api/class_hierarchy.doctree
deleted file mode 100644
index 25d59b33f..000000000
Binary files a/docs/.doctrees/api/class_hierarchy.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/errors.doctree b/docs/.doctrees/api/errors.doctree
deleted file mode 100644
index 4976b449a..000000000
Binary files a/docs/.doctrees/api/errors.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/filters.doctree b/docs/.doctrees/api/filters.doctree
deleted file mode 100644
index 4fbfa3d91..000000000
Binary files a/docs/.doctrees/api/filters.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/annotation.doctree b/docs/.doctrees/api/path/annotation.doctree
deleted file mode 100644
index 760a2062f..000000000
Binary files a/docs/.doctrees/api/path/annotation.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/capability.doctree b/docs/.doctrees/api/path/capability.doctree
deleted file mode 100644
index 596c3333e..000000000
Binary files a/docs/.doctrees/api/path/capability.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/codec.doctree b/docs/.doctrees/api/path/codec.doctree
deleted file mode 100644
index 448cc698c..000000000
Binary files a/docs/.doctrees/api/path/codec.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/data_node.doctree b/docs/.doctrees/api/path/data_node.doctree
deleted file mode 100644
index 0cb777a6d..000000000
Binary files a/docs/.doctrees/api/path/data_node.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/gnmi_session.doctree b/docs/.doctrees/api/path/gnmi_session.doctree
deleted file mode 100644
index 52aee7c5c..000000000
Binary files a/docs/.doctrees/api/path/gnmi_session.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/netconf_session.doctree b/docs/.doctrees/api/path/netconf_session.doctree
deleted file mode 100644
index 1255beeb7..000000000
Binary files a/docs/.doctrees/api/path/netconf_session.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/path.doctree b/docs/.doctrees/api/path/path.doctree
deleted file mode 100644
index 145b85637..000000000
Binary files a/docs/.doctrees/api/path/path.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/repository.doctree b/docs/.doctrees/api/path/repository.doctree
deleted file mode 100644
index 2bc3deb7e..000000000
Binary files a/docs/.doctrees/api/path/repository.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/restconf_session.doctree b/docs/.doctrees/api/path/restconf_session.doctree
deleted file mode 100644
index 9beb37636..000000000
Binary files a/docs/.doctrees/api/path/restconf_session.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/root_schema_node.doctree b/docs/.doctrees/api/path/root_schema_node.doctree
deleted file mode 100644
index fee25f9c5..000000000
Binary files a/docs/.doctrees/api/path/root_schema_node.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/rpc.doctree b/docs/.doctrees/api/path/rpc.doctree
deleted file mode 100644
index 9cb972c99..000000000
Binary files a/docs/.doctrees/api/path/rpc.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/schema_node.doctree b/docs/.doctrees/api/path/schema_node.doctree
deleted file mode 100644
index 6c793d23d..000000000
Binary files a/docs/.doctrees/api/path/schema_node.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/path/statement.doctree b/docs/.doctrees/api/path/statement.doctree
deleted file mode 100644
index 9a8cc58dd..000000000
Binary files a/docs/.doctrees/api/path/statement.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/codec_provider.doctree b/docs/.doctrees/api/providers/codec_provider.doctree
deleted file mode 100644
index 2c55d97c2..000000000
Binary files a/docs/.doctrees/api/providers/codec_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/gnmi_provider.doctree b/docs/.doctrees/api/providers/gnmi_provider.doctree
deleted file mode 100644
index 25e72ebef..000000000
Binary files a/docs/.doctrees/api/providers/gnmi_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/netconf_provider.doctree b/docs/.doctrees/api/providers/netconf_provider.doctree
deleted file mode 100644
index e28a7cf69..000000000
Binary files a/docs/.doctrees/api/providers/netconf_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/odl_provider.doctree b/docs/.doctrees/api/providers/odl_provider.doctree
deleted file mode 100644
index db1a9d9bf..000000000
Binary files a/docs/.doctrees/api/providers/odl_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/providers.doctree b/docs/.doctrees/api/providers/providers.doctree
deleted file mode 100644
index beebf9a13..000000000
Binary files a/docs/.doctrees/api/providers/providers.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/restconf_provider.doctree b/docs/.doctrees/api/providers/restconf_provider.doctree
deleted file mode 100644
index 0a2f6e133..000000000
Binary files a/docs/.doctrees/api/providers/restconf_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/providers/service_provider.doctree b/docs/.doctrees/api/providers/service_provider.doctree
deleted file mode 100644
index 0a693e7a8..000000000
Binary files a/docs/.doctrees/api/providers/service_provider.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/codec_service.doctree b/docs/.doctrees/api/services/codec_service.doctree
deleted file mode 100644
index 0f3bcd427..000000000
Binary files a/docs/.doctrees/api/services/codec_service.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/crud_service.doctree b/docs/.doctrees/api/services/crud_service.doctree
deleted file mode 100644
index 2ea34b896..000000000
Binary files a/docs/.doctrees/api/services/crud_service.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/executor_service.doctree b/docs/.doctrees/api/services/executor_service.doctree
deleted file mode 100644
index a60fc47c7..000000000
Binary files a/docs/.doctrees/api/services/executor_service.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/gnmi_service.doctree b/docs/.doctrees/api/services/gnmi_service.doctree
deleted file mode 100644
index a24ba7170..000000000
Binary files a/docs/.doctrees/api/services/gnmi_service.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/netconf_service.doctree b/docs/.doctrees/api/services/netconf_service.doctree
deleted file mode 100644
index e0a1e272c..000000000
Binary files a/docs/.doctrees/api/services/netconf_service.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/services/services.doctree b/docs/.doctrees/api/services/services.doctree
deleted file mode 100644
index ec27a75ff..000000000
Binary files a/docs/.doctrees/api/services/services.doctree and /dev/null differ
diff --git a/docs/.doctrees/api/types.doctree b/docs/.doctrees/api/types.doctree
deleted file mode 100644
index d8fdd9631..000000000
Binary files a/docs/.doctrees/api/types.doctree and /dev/null differ
diff --git a/docs/.doctrees/api_guide.doctree b/docs/.doctrees/api_guide.doctree
deleted file mode 100644
index 7c674f0d2..000000000
Binary files a/docs/.doctrees/api_guide.doctree and /dev/null differ
diff --git a/docs/.doctrees/developer_guide.doctree b/docs/.doctrees/developer_guide.doctree
deleted file mode 100644
index f8ef6b95a..000000000
Binary files a/docs/.doctrees/developer_guide.doctree and /dev/null differ
diff --git a/docs/.doctrees/environment.pickle b/docs/.doctrees/environment.pickle
deleted file mode 100644
index 8ea6e24cb..000000000
Binary files a/docs/.doctrees/environment.pickle and /dev/null differ
diff --git a/docs/.doctrees/faq.doctree b/docs/.doctrees/faq.doctree
deleted file mode 100644
index 28db33053..000000000
Binary files a/docs/.doctrees/faq.doctree and /dev/null differ
diff --git a/docs/.doctrees/getting_started.doctree b/docs/.doctrees/getting_started.doctree
deleted file mode 100644
index ac700d3d6..000000000
Binary files a/docs/.doctrees/getting_started.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/backward_compatibility.doctree b/docs/.doctrees/guides/backward_compatibility.doctree
deleted file mode 100644
index b1e4e1e0d..000000000
Binary files a/docs/.doctrees/guides/backward_compatibility.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/codec_guide.doctree b/docs/.doctrees/guides/codec_guide.doctree
deleted file mode 100644
index 6cbe5b287..000000000
Binary files a/docs/.doctrees/guides/codec_guide.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/crud_guide.doctree b/docs/.doctrees/guides/crud_guide.doctree
deleted file mode 100644
index 7189f4ae8..000000000
Binary files a/docs/.doctrees/guides/crud_guide.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/deviation.doctree b/docs/.doctrees/guides/deviation.doctree
deleted file mode 100644
index c030a9380..000000000
Binary files a/docs/.doctrees/guides/deviation.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/executor_guide.doctree b/docs/.doctrees/guides/executor_guide.doctree
deleted file mode 100644
index a27e1a85a..000000000
Binary files a/docs/.doctrees/guides/executor_guide.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/introduction.doctree b/docs/.doctrees/guides/introduction.doctree
deleted file mode 100644
index 0045c518f..000000000
Binary files a/docs/.doctrees/guides/introduction.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/opendaylight.doctree b/docs/.doctrees/guides/opendaylight.doctree
deleted file mode 100644
index 4987723e4..000000000
Binary files a/docs/.doctrees/guides/opendaylight.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/path.doctree b/docs/.doctrees/guides/path.doctree
deleted file mode 100644
index 7785e0da8..000000000
Binary files a/docs/.doctrees/guides/path.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/presence_class.doctree b/docs/.doctrees/guides/presence_class.doctree
deleted file mode 100644
index aeed46f04..000000000
Binary files a/docs/.doctrees/guides/presence_class.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/restconf_https.doctree b/docs/.doctrees/guides/restconf_https.doctree
deleted file mode 100644
index 50ca07faa..000000000
Binary files a/docs/.doctrees/guides/restconf_https.doctree and /dev/null differ
diff --git a/docs/.doctrees/guides/validation.doctree b/docs/.doctrees/guides/validation.doctree
deleted file mode 100644
index 82e182992..000000000
Binary files a/docs/.doctrees/guides/validation.doctree and /dev/null differ
diff --git a/docs/.doctrees/index.doctree b/docs/.doctrees/index.doctree
deleted file mode 100644
index 6504922a8..000000000
Binary files a/docs/.doctrees/index.doctree and /dev/null differ
diff --git a/docs/.doctrees/ydk.models.doctree b/docs/.doctrees/ydk.models.doctree
deleted file mode 100644
index ff6fc249a..000000000
Binary files a/docs/.doctrees/ydk.models.doctree and /dev/null differ
diff --git a/docs/_static/ajax-loader.gif b/docs/_static/ajax-loader.gif
deleted file mode 100644
index 61faf8cab..000000000
Binary files a/docs/_static/ajax-loader.gif and /dev/null differ
diff --git a/docs/_static/basic.css b/docs/_static/basic.css
deleted file mode 100644
index dc88b5a2d..000000000
--- a/docs/_static/basic.css
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * basic.css
- * ~~~~~~~~~
- *
- * Sphinx stylesheet -- basic theme.
- *
- * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.clearer {
-    clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
-    width: 100%;
-    font-size: 90%;
-}
-
-div.related h3 {
-    display: none;
-}
-
-div.related ul {
-    margin: 0;
-    padding: 0 0 0 10px;
-    list-style: none;
-}
-
-div.related li {
-    display: inline;
-}
-
-div.related li.right {
-    float: right;
-    margin-right: 5px;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
-    padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
-    float: left;
-    width: 230px;
-    margin-left: -100%;
-    font-size: 90%;
-    word-wrap: break-word;
-    overflow-wrap : break-word;
-}
-
-div.sphinxsidebar ul {
-    list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
-    margin-left: 20px;
-    list-style: square;
-}
-
-div.sphinxsidebar ul ul {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
-    margin-top: 10px;
-}
-
-div.sphinxsidebar input {
-    border: 1px solid #98dbcc;
-    font-family: sans-serif;
-    font-size: 1em;
-}
-
-div.sphinxsidebar #searchbox input[type="text"] {
-    width: 170px;
-}
-
-img {
-    border: 0;
-    max-width: 100%;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
-    margin: 10px 0 0 20px;
-    padding: 0;
-}
-
-ul.search li {
-    padding: 5px 0 5px 20px;
-    background-image: url(file.png);
-    background-repeat: no-repeat;
-    background-position: 0 7px;
-}
-
-ul.search li a {
-    font-weight: bold;
-}
-
-ul.search li div.context {
-    color: #888;
-    margin: 2px 0 0 30px;
-    text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
-    font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
-    width: 90%;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-table.contentstable p.biglink {
-    line-height: 150%;
-}
-
-a.biglink {
-    font-size: 1.3em;
-}
-
-span.linkdescr {
-    font-style: italic;
-    padding-top: 5px;
-    font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable {
-    width: 100%;
-}
-
-table.indextable td {
-    text-align: left;
-    vertical-align: top;
-}
-
-table.indextable ul {
-    margin-top: 0;
-    margin-bottom: 0;
-    list-style-type: none;
-}
-
-table.indextable > tbody > tr > td > ul {
-    padding-left: 0em;
-}
-
-table.indextable tr.pcap {
-    height: 10px;
-}
-
-table.indextable tr.cap {
-    margin-top: 10px;
-    background-color: #f2f2f2;
-}
-
-img.toggler {
-    margin-right: 3px;
-    margin-top: 3px;
-    cursor: pointer;
-}
-
-div.modindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-div.genindex-jumpbox {
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
-    margin: 1em 0 1em 0;
-    padding: 0.4em;
-}
-
-/* -- domain module index --------------------------------------------------- */
-
-table.modindextable td {
-    padding: 2px;
-    border-collapse: collapse;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-div.body p, div.body dd, div.body li, div.body blockquote {
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
-    -webkit-hyphens: auto;
-    hyphens: auto;
-}
-
-a.headerlink {
-    visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink,
-caption:hover > a.headerlink,
-p.caption:hover > a.headerlink,
-div.code-block-caption:hover > a.headerlink {
-    visibility: visible;
-}
-
-div.body p.caption {
-    text-align: inherit;
-}
-
-div.body td {
-    text-align: left;
-}
-
-.first {
-    margin-top: 0 !important;
-}
-
-p.rubric {
-    margin-top: 30px;
-    font-weight: bold;
-}
-
-img.align-left, .figure.align-left, object.align-left {
-    clear: left;
-    float: left;
-    margin-right: 1em;
-}
-
-img.align-right, .figure.align-right, object.align-right {
-    clear: right;
-    float: right;
-    margin-left: 1em;
-}
-
-img.align-center, .figure.align-center, object.align-center {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.align-center {
-    text-align: center;
-}
-
-.align-right {
-    text-align: right;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
-    margin: 0 0 0.5em 1em;
-    border: 1px solid #ddb;
-    padding: 7px 7px 0 7px;
-    background-color: #ffe;
-    width: 40%;
-    float: right;
-}
-
-p.sidebar-title {
-    font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
-    border: 1px solid #ccc;
-    padding: 7px 7px 0 7px;
-    margin: 10px 0 10px 0;
-}
-
-p.topic-title {
-    font-size: 1.1em;
-    font-weight: bold;
-    margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding: 7px;
-}
-
-div.admonition dt {
-    font-weight: bold;
-}
-
-div.admonition dl {
-    margin-bottom: 0;
-}
-
-p.admonition-title {
-    margin: 0px 10px 5px 0px;
-    font-weight: bold;
-}
-
-div.body p.centered {
-    text-align: center;
-    margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
-    border: 0;
-    border-collapse: collapse;
-}
-
-table caption span.caption-number {
-    font-style: italic;
-}
-
-table caption span.caption-text {
-}
-
-table.docutils td, table.docutils th {
-    padding: 1px 8px 1px 5px;
-    border-top: 0;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 1px solid #aaa;
-}
-
-table.footnote td, table.footnote th {
-    border: 0 !important;
-}
-
-th {
-    text-align: left;
-    padding-right: 5px;
-}
-
-table.citation {
-    border-left: solid 1px gray;
-    margin-left: 1px;
-}
-
-table.citation td {
-    border-bottom: none;
-}
-
-/* -- figures --------------------------------------------------------------- */
-
-div.figure {
-    margin: 0.5em;
-    padding: 0.5em;
-}
-
-div.figure p.caption {
-    padding: 0.3em;
-}
-
-div.figure p.caption span.caption-number {
-    font-style: italic;
-}
-
-div.figure p.caption span.caption-text {
-}
-
-/* -- field list styles ----------------------------------------------------- */
-
-table.field-list td, table.field-list th {
-    border: 0 !important;
-}
-
-.field-list ul {
-    margin: 0;
-    padding-left: 1em;
-}
-
-.field-list p {
-    margin: 0;
-}
-
-/* -- other body styles ----------------------------------------------------- */
-
-ol.arabic {
-    list-style: decimal;
-}
-
-ol.loweralpha {
-    list-style: lower-alpha;
-}
-
-ol.upperalpha {
-    list-style: upper-alpha;
-}
-
-ol.lowerroman {
-    list-style: lower-roman;
-}
-
-ol.upperroman {
-    list-style: upper-roman;
-}
-
-dl {
-    margin-bottom: 15px;
-}
-
-dd p {
-    margin-top: 0px;
-}
-
-dd ul, dd table {
-    margin-bottom: 10px;
-}
-
-dd {
-    margin-top: 3px;
-    margin-bottom: 10px;
-    margin-left: 30px;
-}
-
-dt:target, .highlighted {
-    background-color: #fbe54e;
-}
-
-dl.glossary dt {
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
-.optional {
-    font-size: 1.3em;
-}
-
-.sig-paren {
-    font-size: larger;
-}
-
-.versionmodified {
-    font-style: italic;
-}
-
-.system-message {
-    background-color: #fda;
-    padding: 5px;
-    border: 3px solid red;
-}
-
-.footnote:target  {
-    background-color: #ffa;
-}
-
-.line-block {
-    display: block;
-    margin-top: 1em;
-    margin-bottom: 1em;
-}
-
-.line-block .line-block {
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 1.5em;
-}
-
-.guilabel, .menuselection {
-    font-family: sans-serif;
-}
-
-.accelerator {
-    text-decoration: underline;
-}
-
-.classifier {
-    font-style: oblique;
-}
-
-abbr, acronym {
-    border-bottom: dotted 1px;
-    cursor: help;
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
-    overflow: auto;
-    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
-}
-
-span.pre {
-    -moz-hyphens: none;
-    -ms-hyphens: none;
-    -webkit-hyphens: none;
-    hyphens: none;
-}
-
-td.linenos pre {
-    padding: 5px 0px;
-    border: 0;
-    background-color: transparent;
-    color: #aaa;
-}
-
-table.highlighttable {
-    margin-left: 0.5em;
-}
-
-table.highlighttable td {
-    padding: 0 0.5em 0 0.5em;
-}
-
-div.code-block-caption {
-    padding: 2px 5px;
-    font-size: small;
-}
-
-div.code-block-caption code {
-    background-color: transparent;
-}
-
-div.code-block-caption + div > div.highlight > pre {
-    margin-top: 0;
-}
-
-div.code-block-caption span.caption-number {
-    padding: 0.1em 0.3em;
-    font-style: italic;
-}
-
-div.code-block-caption span.caption-text {
-}
-
-div.literal-block-wrapper {
-    padding: 1em 1em 0;
-}
-
-div.literal-block-wrapper div.highlight {
-    margin: 0;
-}
-
-code.descname {
-    background-color: transparent;
-    font-weight: bold;
-    font-size: 1.2em;
-}
-
-code.descclassname {
-    background-color: transparent;
-}
-
-code.xref, a code {
-    background-color: transparent;
-    font-weight: bold;
-}
-
-h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-    background-color: transparent;
-}
-
-.viewcode-link {
-    float: right;
-}
-
-.viewcode-back {
-    float: right;
-    font-family: sans-serif;
-}
-
-div.viewcode-block:target {
-    margin: -1px -10px;
-    padding: 0 10px;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
-    vertical-align: middle;
-}
-
-div.body div.math p {
-    text-align: center;
-}
-
-span.eqno {
-    float: right;
-}
-
-span.eqno a.headerlink {
-    position: relative;
-    left: 0px;
-    z-index: 1;
-}
-
-div.math:hover a.headerlink {
-    visibility: visible;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
-    div.document,
-    div.documentwrapper,
-    div.bodywrapper {
-        margin: 0 !important;
-        width: 100%;
-    }
-
-    div.sphinxsidebar,
-    div.related,
-    div.footer,
-    #top-link {
-        display: none;
-    }
-}
\ No newline at end of file
diff --git a/docs/_static/comment-bright.png b/docs/_static/comment-bright.png
deleted file mode 100644
index 15e27edb1..000000000
Binary files a/docs/_static/comment-bright.png and /dev/null differ
diff --git a/docs/_static/comment-close.png b/docs/_static/comment-close.png
deleted file mode 100644
index 4d91bcf57..000000000
Binary files a/docs/_static/comment-close.png and /dev/null differ
diff --git a/docs/_static/comment.png b/docs/_static/comment.png
deleted file mode 100644
index dfbc0cbd5..000000000
Binary files a/docs/_static/comment.png and /dev/null differ
diff --git a/docs/_static/css/badge_only.css b/docs/_static/css/badge_only.css
deleted file mode 100644
index 7e17fb148..000000000
--- a/docs/_static/css/badge_only.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
-/*# sourceMappingURL=badge_only.css.map */
diff --git a/docs/_static/css/theme.css b/docs/_static/css/theme.css
deleted file mode 100644
index 7be93399a..000000000
--- a/docs/_static/css/theme.css
+++ /dev/null
@@ -1,5 +0,0 @@
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,.rst-content code,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,.rst-content .toctree-wrapper p.caption,h3{orphans:3;widows:3}h2,.rst-content .toctree-wrapper p.caption,h3{page-break-after:avoid}}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.2.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:0.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.wy-menu-vertical li span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.rst-content code.download span.pull-left:first-child,.pull-left.icon{margin-right:.3em}.fa.pull-right,.wy-menu-vertical li span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.rst-content code.download span.pull-right:first-child,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-remove:before,.fa-close:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:""}.fa-meanpath:before{content:""}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .rst-content p.caption .headerlink,.rst-content p.caption a .headerlink,a .rst-content tt.download span:first-child,.rst-content tt.download a span:first-child,a .rst-content code.download span:first-child,.rst-content code.download a span:first-child,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .btn span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.btn .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .rst-content p.caption .headerlink,.rst-content p.caption .btn .headerlink,.btn .rst-content tt.download span:first-child,.rst-content tt.download .btn span:first-child,.btn .rst-content code.download span:first-child,.rst-content code.download .btn span:first-child,.btn .icon,.nav .fa,.nav .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand,.nav .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .rst-content p.caption .headerlink,.rst-content p.caption .nav .headerlink,.nav .rst-content tt.download span:first-child,.rst-content tt.download .nav span:first-child,.nav .rst-content code.download span:first-child,.rst-content code.download .nav span:first-child,.nav .icon{display:inline}.btn .fa.fa-large,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .btn span.fa-large:first-child,.btn .rst-content code.download span.fa-large:first-child,.rst-content code.download .btn span.fa-large:first-child,.btn .fa-large.icon,.nav .fa.fa-large,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.nav .rst-content code.download span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.nav .fa-large.icon{line-height:0.9em}.btn .fa.fa-spin,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .btn span.fa-spin:first-child,.btn .rst-content code.download span.fa-spin:first-child,.rst-content code.download .btn span.fa-spin:first-child,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.nav .rst-content code.download span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.wy-menu-vertical li span.btn.toctree-expand:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.rst-content code.download span.btn:first-child:before,.btn.icon:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.fa:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.rst-content code.download span.btn:first-child:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.rst-content tt.download .btn-mini span:first-child:before,.btn-mini .rst-content code.download span:first-child:before,.rst-content code.download .btn-mini span:first-child:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all 0.3s ease-in;-moz-transition:all 0.3s ease-in;transition:all 0.3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.35765%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type="radio"][disabled],input[type="checkbox"][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{width:36px;height:12px;margin:12px 0;position:relative;border-radius:4px;background:#ccc;cursor:pointer;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:before{position:absolute;content:"";display:block;width:18px;height:18px;border-radius:4px;background:#999;left:-3px;top:-3px;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:after{content:"false";position:absolute;left:48px;display:block;font-size:12px;color:#ccc}.wy-switch.active{background:#1e8449}.wy-switch.active:before{left:24px;background:#27AE60}.wy-switch.active:after{content:"true"}.wy-switch.disabled,.wy-switch.active.disabled{cursor:not-allowed}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,.rst-content .toctree-wrapper p.caption,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2,.rst-content .toctree-wrapper p.caption{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt,.rst-content code{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9B59B6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],pre.literal-block div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}@media print{.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#EAF2F5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs li code,.wy-breadcrumbs li .rst-content tt,.rst-content .wy-breadcrumbs li tt{padding:5px;border:none;background:none}.wy-breadcrumbs li code.literal,.wy-breadcrumbs li .rst-content tt.literal,.rst-content .wy-breadcrumbs li tt.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical{width:300px}.wy-menu-vertical header,.wy-menu-vertical p.caption{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;margin-bottom:0;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#555;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li code,.wy-menu-vertical li .rst-content tt,.rst-content .wy-menu-vertical li tt{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:0.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.on a:hover span.toctree-expand,.wy-menu-vertical li.current>a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand{display:block;font-size:0.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul{display:none}.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul{display:block}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{display:block;background:#c9c9c9;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3{font-size:0.9em}.wy-menu-vertical li.toctree-l3.current>a{background:#bdbdbd;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{display:block;background:#bdbdbd;padding:0.4045em 5.663em;border-top:none;border-bottom:none}.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.toctree-l4{font-size:0.9em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#b3b3b3}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{display:block;width:300px;padding:0.809em;margin-bottom:0.809em;z-index:200;background-color:#2980B9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-side-nav-search>a img.logo,.wy-side-nav-search .wy-dropdown>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search>a.icon img.logo,.wy-side-nav-search .wy-dropdown>a.icon img.logo{margin-top:0.85em}.wy-side-nav-search>div.version{margin-top:-0.4045em;margin-bottom:0.809em;font-weight:normal;color:rgba(255,255,255,0.3)}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:hidden;min-height:100%;background:#343131;z-index:200}.wy-side-scroll{width:320px;position:relative;overflow-x:hidden;overflow-y:scroll;height:100%}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}footer span.commit code,footer span.commit .rst-content tt,.rst-content footer span.commit tt{padding:0px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:1em;background:none;border:none;color:#999}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-side-scroll{width:auto}.wy-side-nav-search{width:auto}.wy-menu.wy-menu-vertical{width:auto}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img,.rst-content .section>a>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content .toctree-wrapper p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content .toctree-wrapper p.caption .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content p.caption .headerlink:after{visibility:visible;content:"";font-family:FontAwesome;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content .toctree-wrapper p.caption:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink,.rst-content p.caption:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.docutils.citation tt,.rst-content table.docutils.citation code,.rst-content table.docutils.footnote tt,.rst-content table.docutils.footnote code{color:#555}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none;padding-top:5px}.rst-content table.field-list td>strong{display:inline-block;margin-top:3px}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt,.rst-content tt,.rst-content code{color:#000;padding:2px 5px}.rst-content tt big,.rst-content tt em,.rst-content tt big,.rst-content code big,.rst-content tt em,.rst-content code em{font-size:100% !important;line-height:normal}.rst-content tt.literal,.rst-content tt.literal,.rst-content code.literal{color:#E74C3C}.rst-content tt.xref,a .rst-content tt,.rst-content tt.xref,.rst-content code.xref,a .rst-content tt,a .rst-content code{font-weight:bold;color:#404040}.rst-content a tt,.rst-content a tt,.rst-content a code{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:#555}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) code{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) code.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}.rst-content tt.download,.rst-content code.download{background:inherit;padding:inherit;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{margin-right:4px}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:400;src:local("Inconsolata"),local("Inconsolata-Regular"),url(../fonts/Inconsolata-Regular.ttf) format("truetype")}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:700;src:local("Inconsolata Bold"),local("Inconsolata-Bold"),url(../fonts/Inconsolata-Bold.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:400;src:local("Lato Regular"),local("Lato-Regular"),url(../fonts/Lato-Regular.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:700;src:local("Lato Bold"),local("Lato-Bold"),url(../fonts/Lato-Bold.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:400;src:local("Roboto Slab Regular"),local("RobotoSlab-Regular"),url(../fonts/RobotoSlab-Regular.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:700;src:local("Roboto Slab Bold"),local("RobotoSlab-Bold"),url(../fonts/RobotoSlab-Bold.ttf) format("truetype")}
-/*# sourceMappingURL=theme.css.map */
diff --git a/docs/_static/css/width.css b/docs/_static/css/width.css
deleted file mode 100644
index 839eb7dce..000000000
--- a/docs/_static/css/width.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@import url("theme.css");
-
-.wy-nav-content {
-   max-width: none;
-}
diff --git a/docs/_static/doctools.js b/docs/_static/doctools.js
deleted file mode 100644
index 565497723..000000000
--- a/docs/_static/doctools.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * doctools.js
- * ~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for all documentation.
- *
- * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/**
- * select a different prefix for underscore
- */
-$u = _.noConflict();
-
-/**
- * make the code below compatible with browsers without
- * an installed firebug like debugger
-if (!window.console || !console.firebug) {
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
-    "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
-    "profile", "profileEnd"];
-  window.console = {};
-  for (var i = 0; i < names.length; ++i)
-    window.console[names[i]] = function() {};
-}
- */
-
-/**
- * small helper function to urldecode strings
- */
-jQuery.urldecode = function(x) {
-  return decodeURIComponent(x).replace(/\+/g, ' ');
-};
-
-/**
- * small helper function to urlencode strings
- */
-jQuery.urlencode = encodeURIComponent;
-
-/**
- * This function returns the parsed url parameters of the
- * current request. Multiple values per key are supported,
- * it will always return arrays of strings for the value parts.
- */
-jQuery.getQueryParameters = function(s) {
-  if (typeof s == 'undefined')
-    s = document.location.search;
-  var parts = s.substr(s.indexOf('?') + 1).split('&');
-  var result = {};
-  for (var i = 0; i < parts.length; i++) {
-    var tmp = parts[i].split('=', 2);
-    var key = jQuery.urldecode(tmp[0]);
-    var value = jQuery.urldecode(tmp[1]);
-    if (key in result)
-      result[key].push(value);
-    else
-      result[key] = [value];
-  }
-  return result;
-};
-
-/**
- * highlight a given string on a jquery object by wrapping it in
- * span elements with the given class name.
- */
-jQuery.fn.highlightText = function(text, className) {
-  function highlight(node) {
-    if (node.nodeType == 3) {
-      var val = node.nodeValue;
-      var pos = val.toLowerCase().indexOf(text);
-      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
-        var span = document.createElement("span");
-        span.className = className;
-        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
-        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
-          document.createTextNode(val.substr(pos + text.length)),
-          node.nextSibling));
-        node.nodeValue = val.substr(0, pos);
-      }
-    }
-    else if (!jQuery(node).is("button, select, textarea")) {
-      jQuery.each(node.childNodes, function() {
-        highlight(this);
-      });
-    }
-  }
-  return this.each(function() {
-    highlight(this);
-  });
-};
-
-/*
- * backward compatibility for jQuery.browser
- * This will be supported until firefox bug is fixed.
- */
-if (!jQuery.browser) {
-  jQuery.uaMatch = function(ua) {
-    ua = ua.toLowerCase();
-
-    var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
-      /(webkit)[ \/]([\w.]+)/.exec(ua) ||
-      /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
-      /(msie) ([\w.]+)/.exec(ua) ||
-      ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
-      [];
-
-    return {
-      browser: match[ 1 ] || "",
-      version: match[ 2 ] || "0"
-    };
-  };
-  jQuery.browser = {};
-  jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
-}
-
-/**
- * Small JavaScript module for the documentation.
- */
-var Documentation = {
-
-  init : function() {
-    this.fixFirefoxAnchorBug();
-    this.highlightSearchWords();
-    this.initIndexTable();
-    
-  },
-
-  /**
-   * i18n support
-   */
-  TRANSLATIONS : {},
-  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
-  LOCALE : 'unknown',
-
-  // gettext and ngettext don't access this so that the functions
-  // can safely bound to a different name (_ = Documentation.gettext)
-  gettext : function(string) {
-    var translated = Documentation.TRANSLATIONS[string];
-    if (typeof translated == 'undefined')
-      return string;
-    return (typeof translated == 'string') ? translated : translated[0];
-  },
-
-  ngettext : function(singular, plural, n) {
-    var translated = Documentation.TRANSLATIONS[singular];
-    if (typeof translated == 'undefined')
-      return (n == 1) ? singular : plural;
-    return translated[Documentation.PLURALEXPR(n)];
-  },
-
-  addTranslations : function(catalog) {
-    for (var key in catalog.messages)
-      this.TRANSLATIONS[key] = catalog.messages[key];
-    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
-    this.LOCALE = catalog.locale;
-  },
-
-  /**
-   * add context elements like header anchor links
-   */
-  addContextElements : function() {
-    $('div[id] > :header:first').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this headline')).
-      appendTo(this);
-    });
-    $('dt[id]').each(function() {
-      $('<a class="headerlink">\u00B6</a>').
-      attr('href', '#' + this.id).
-      attr('title', _('Permalink to this definition')).
-      appendTo(this);
-    });
-  },
-
-  /**
-   * workaround a firefox stupidity
-   * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
-   */
-  fixFirefoxAnchorBug : function() {
-    if (document.location.hash)
-      window.setTimeout(function() {
-        document.location.href += '';
-      }, 10);
-  },
-
-  /**
-   * highlight the search words provided in the url in the text
-   */
-  highlightSearchWords : function() {
-    var params = $.getQueryParameters();
-    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
-    if (terms.length) {
-      var body = $('div.body');
-      if (!body.length) {
-        body = $('body');
-      }
-      window.setTimeout(function() {
-        $.each(terms, function() {
-          body.highlightText(this.toLowerCase(), 'highlighted');
-        });
-      }, 10);
-      $('<p class="highlight-link"><a href="javascript:Documentation.' +
-        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
-          .appendTo($('#searchbox'));
-    }
-  },
-
-  /**
-   * init the domain index toggle buttons
-   */
-  initIndexTable : function() {
-    var togglers = $('img.toggler').click(function() {
-      var src = $(this).attr('src');
-      var idnum = $(this).attr('id').substr(7);
-      $('tr.cg-' + idnum).toggle();
-      if (src.substr(-9) == 'minus.png')
-        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
-      else
-        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
-    }).css('display', '');
-    if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
-        togglers.click();
-    }
-  },
-
-  /**
-   * helper function to hide the search marks again
-   */
-  hideSearchWords : function() {
-    $('#searchbox .highlight-link').fadeOut(300);
-    $('span.highlighted').removeClass('highlighted');
-  },
-
-  /**
-   * make the url absolute
-   */
-  makeURL : function(relativeURL) {
-    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
-  },
-
-  /**
-   * get the current relative url
-   */
-  getCurrentURL : function() {
-    var path = document.location.pathname;
-    var parts = path.split(/\//);
-    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
-      if (this == '..')
-        parts.pop();
-    });
-    var url = parts.join('/');
-    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
-  },
-
-  initOnKeyListeners: function() {
-    $(document).keyup(function(event) {
-      var activeElementType = document.activeElement.tagName;
-      // don't navigate when in search box or textarea
-      if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') {
-        switch (event.keyCode) {
-          case 37: // left
-            var prevHref = $('link[rel="prev"]').prop('href');
-            if (prevHref) {
-              window.location.href = prevHref;
-              return false;
-            }
-          case 39: // right
-            var nextHref = $('link[rel="next"]').prop('href');
-            if (nextHref) {
-              window.location.href = nextHref;
-              return false;
-            }
-        }
-      }
-    });
-  }
-};
-
-// quick alias for translations
-_ = Documentation.gettext;
-
-$(document).ready(function() {
-  Documentation.init();
-});
\ No newline at end of file
diff --git a/docs/_static/down-pressed.png b/docs/_static/down-pressed.png
deleted file mode 100644
index 5756c8cad..000000000
Binary files a/docs/_static/down-pressed.png and /dev/null differ
diff --git a/docs/_static/down.png b/docs/_static/down.png
deleted file mode 100644
index 1b3bdad2c..000000000
Binary files a/docs/_static/down.png and /dev/null differ
diff --git a/docs/_static/file.png b/docs/_static/file.png
deleted file mode 100644
index a858a410e..000000000
Binary files a/docs/_static/file.png and /dev/null differ
diff --git a/docs/_static/fonts/Inconsolata-Bold.ttf b/docs/_static/fonts/Inconsolata-Bold.ttf
deleted file mode 100644
index 58c9fef3a..000000000
Binary files a/docs/_static/fonts/Inconsolata-Bold.ttf and /dev/null differ
diff --git a/docs/_static/fonts/Inconsolata-Regular.ttf b/docs/_static/fonts/Inconsolata-Regular.ttf
deleted file mode 100644
index a87ffba6b..000000000
Binary files a/docs/_static/fonts/Inconsolata-Regular.ttf and /dev/null differ
diff --git a/docs/_static/fonts/Lato-Bold.ttf b/docs/_static/fonts/Lato-Bold.ttf
deleted file mode 100644
index 74343694e..000000000
Binary files a/docs/_static/fonts/Lato-Bold.ttf and /dev/null differ
diff --git a/docs/_static/fonts/Lato-Regular.ttf b/docs/_static/fonts/Lato-Regular.ttf
deleted file mode 100644
index 04ea8efb1..000000000
Binary files a/docs/_static/fonts/Lato-Regular.ttf and /dev/null differ
diff --git a/docs/_static/fonts/RobotoSlab-Bold.ttf b/docs/_static/fonts/RobotoSlab-Bold.ttf
deleted file mode 100644
index df5d1df27..000000000
Binary files a/docs/_static/fonts/RobotoSlab-Bold.ttf and /dev/null differ
diff --git a/docs/_static/fonts/RobotoSlab-Regular.ttf b/docs/_static/fonts/RobotoSlab-Regular.ttf
deleted file mode 100644
index eb52a7907..000000000
Binary files a/docs/_static/fonts/RobotoSlab-Regular.ttf and /dev/null differ
diff --git a/docs/_static/fonts/fontawesome-webfont.eot b/docs/_static/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 84677bc0c..000000000
Binary files a/docs/_static/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/docs/_static/fonts/fontawesome-webfont.svg b/docs/_static/fonts/fontawesome-webfont.svg
deleted file mode 100644
index d907b25ae..000000000
--- a/docs/_static/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#xd8;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" horiz-adv-x="1537" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" horiz-adv-x="1537" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="&#xf1a1;" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="&#xf1a2;" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1bd;" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="&#xf1d4;" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1ed;" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="&#xf20d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf20e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/docs/_static/fonts/fontawesome-webfont.ttf b/docs/_static/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 96a3639cd..000000000
Binary files a/docs/_static/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/docs/_static/fonts/fontawesome-webfont.woff b/docs/_static/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 628b6a52a..000000000
Binary files a/docs/_static/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/docs/_static/icon.ico b/docs/_static/icon.ico
deleted file mode 100644
index 3a92628e4..000000000
Binary files a/docs/_static/icon.ico and /dev/null differ
diff --git a/docs/_static/jquery-3.1.0.js b/docs/_static/jquery-3.1.0.js
deleted file mode 100644
index f2fc27478..000000000
--- a/docs/_static/jquery-3.1.0.js
+++ /dev/null
@@ -1,10074 +0,0 @@
-/*eslint-disable no-unused-vars*/
-/*!
- * jQuery JavaScript Library v3.1.0
- * https://jquery.com/
- *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2016-07-07T21:44Z
- */
-( function( global, factory ) {
-
-	"use strict";
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
-// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
-// enough that all such attempts are guarded in a try block.
-"use strict";
-
-var arr = [];
-
-var document = window.document;
-
-var getProto = Object.getPrototypeOf;
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var fnToString = hasOwn.toString;
-
-var ObjectFunctionString = fnToString.call( Object );
-
-var support = {};
-
-
-
-	function DOMEval( code, doc ) {
-		doc = doc || document;
-
-		var script = doc.createElement( "script" );
-
-		script.text = code;
-		doc.head.appendChild( script ).parentNode.removeChild( script );
-	}
-/* global Symbol */
-// Defining this global in .eslintrc would create a danger of using the global
-// unguarded in another place, it seems safer to define global only for this module
-
-
-
-var
-	version = "3.1.0",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android <=4.0 only
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([a-z])/g,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	each: function( callback ) {
-		return jQuery.each( this, callback );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map( this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		} ) );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor();
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[ 0 ] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
-		target = {};
-	}
-
-	// Extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-
-		// Only deal with non-null/undefined values
-		if ( ( options = arguments[ i ] ) != null ) {
-
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
-
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray( src ) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject( src ) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend( {
-
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isFunction: function( obj ) {
-		return jQuery.type( obj ) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-
-		// As of jQuery 3.0, isNumeric is limited to
-		// strings and numbers (primitives or objects)
-		// that can be coerced to finite numbers (gh-2662)
-		var type = jQuery.type( obj );
-		return ( type === "number" || type === "string" ) &&
-
-			// parseFloat NaNs numeric-cast false positives ("")
-			// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-			// subtraction forces infinities to NaN
-			!isNaN( obj - parseFloat( obj ) );
-	},
-
-	isPlainObject: function( obj ) {
-		var proto, Ctor;
-
-		// Detect obvious negatives
-		// Use toString instead of jQuery.type to catch host objects
-		if ( !obj || toString.call( obj ) !== "[object Object]" ) {
-			return false;
-		}
-
-		proto = getProto( obj );
-
-		// Objects with no prototype (e.g., `Object.create( null )`) are plain
-		if ( !proto ) {
-			return true;
-		}
-
-		// Objects with prototype are plain iff they were constructed by a global Object function
-		Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
-		return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
-	},
-
-	isEmptyObject: function( obj ) {
-
-		/* eslint-disable no-unused-vars */
-		// See https://github.com/eslint/eslint/issues/6125
-		var name;
-
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-
-		// Support: Android <=2.3 only (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call( obj ) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		DOMEval( code );
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE <=9 - 11, Edge 12 - 13
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	each: function( obj, callback ) {
-		var length, i = 0;
-
-		if ( isArrayLike( obj ) ) {
-			length = obj.length;
-			for ( ; i < length; i++ ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		} else {
-			for ( i in obj ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android <=4.0 only
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArrayLike( Object( arr ) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	// Support: Android <=4.0 only, PhantomJS 1 only
-	// push.apply(_, arraylike) throws on ancient WebKit
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var length, value,
-			i = 0,
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArrayLike( elems ) ) {
-			length = elems.length;
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-} );
-
-if ( typeof Symbol === "function" ) {
-	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
-}
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
-	// Support: real iOS 8.2 only (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = !!obj && "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.3.0
- * https://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2016-01-04
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// https://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + identifier + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + identifier + ")" ),
-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-
-	// CSS escapes
-	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// CSS string/identifier serialization
-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
-	rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,
-	fcssescape = function( ch, asCodePoint ) {
-		if ( asCodePoint ) {
-
-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-			if ( ch === "\0" ) {
-				return "\uFFFD";
-			}
-
-			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
-		}
-
-		// Other potentially-special ASCII characters get backslash-escaped
-		return "\\" + ch;
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	},
-
-	disabledAncestor = addCombinator(
-		function( elem ) {
-			return elem.disabled === true;
-		},
-		{ dir: "parentNode", next: "legend" }
-	);
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, match, groups, newSelector,
-		newContext = context && context.ownerDocument,
-
-		// nodeType defaults to 9, since context defaults to document
-		nodeType = context ? context.nodeType : 9;
-
-	results = results || [];
-
-	// Return early from calls with invalid selector or context
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	// Try to shortcut find operations (as opposed to filters) in HTML documents
-	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
-		context = context || document;
-
-		if ( documentIsHTML ) {
-
-			// If the selector is sufficiently simple, try using a "get*By*" DOM method
-			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-
-				// ID selector
-				if ( (m = match[1]) ) {
-
-					// Document context
-					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
-
-							// Support: IE, Opera, Webkit
-							// TODO: identify versions
-							// getElementById can match elements by name instead of ID
-							if ( elem.id === m ) {
-								results.push( elem );
-								return results;
-							}
-						} else {
-							return results;
-						}
-
-					// Element context
-					} else {
-
-						// Support: IE, Opera, Webkit
-						// TODO: identify versions
-						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
-							contains( context, elem ) &&
-							elem.id === m ) {
-
-							results.push( elem );
-							return results;
-						}
-					}
-
-				// Type selector
-				} else if ( match[2] ) {
-					push.apply( results, context.getElementsByTagName( selector ) );
-					return results;
-
-				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
-					context.getElementsByClassName ) {
-
-					push.apply( results, context.getElementsByClassName( m ) );
-					return results;
-				}
-			}
-
-			// Take advantage of querySelectorAll
-			if ( support.qsa &&
-				!compilerCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-
-				if ( nodeType !== 1 ) {
-					newContext = context;
-					newSelector = selector;
-
-				// qSA looks outside Element context, which is not what we want
-				// Thanks to Andrew Dupont for this workaround technique
-				// Support: IE <=8
-				// Exclude object elements
-				} else if ( context.nodeName.toLowerCase() !== "object" ) {
-
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rcssescape, fcssescape );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
-					}
-
-					// Prefix every selector in the list
-					groups = tokenize( selector );
-					i = groups.length;
-					while ( i-- ) {
-						groups[i] = "#" + nid + " " + toSelector( groups[i] );
-					}
-					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
-				}
-
-				if ( newSelector ) {
-					try {
-						push.apply( results,
-							newContext.querySelectorAll( newSelector )
-						);
-						return results;
-					} catch ( qsaError ) {
-					} finally {
-						if ( nid === expando ) {
-							context.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created element and returns a boolean result
- */
-function assert( fn ) {
-	var el = document.createElement("fieldset");
-
-	try {
-		return !!fn( el );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( el.parentNode ) {
-			el.parentNode.removeChild( el );
-		}
-		// release memory in IE
-		el = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = arr.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			a.sourceIndex - b.sourceIndex;
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for :enabled/:disabled
- * @param {Boolean} disabled true for :disabled; false for :enabled
- */
-function createDisabledPseudo( disabled ) {
-	// Known :disabled false positives:
-	// IE: *[disabled]:not(button, input, select, textarea, optgroup, option, menuitem, fieldset)
-	// not IE: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
-	return function( elem ) {
-
-		// Check form elements and option elements for explicit disabling
-		return "label" in elem && elem.disabled === disabled ||
-			"form" in elem && elem.disabled === disabled ||
-
-			// Check non-disabled form elements for fieldset[disabled] ancestors
-			"form" in elem && elem.disabled === false && (
-				// Support: IE6-11+
-				// Ancestry is covered for us
-				elem.isDisabled === disabled ||
-
-				// Otherwise, assume any non-<option> under fieldset[disabled] is disabled
-				/* jshint -W018 */
-				elem.isDisabled !== !disabled &&
-					("label" in elem || !disabledAncestor( elem )) !== disabled
-			);
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, subWindow,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Update global variables
-	document = doc;
-	docElem = document.documentElement;
-	documentIsHTML = !isXML( document );
-
-	// Support: IE 9-11, Edge
-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( preferredDoc !== document &&
-		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
-
-		// Support: IE 11, Edge
-		if ( subWindow.addEventListener ) {
-			subWindow.addEventListener( "unload", unloadHandler, false );
-
-		// Support: IE 9 - 10 only
-		} else if ( subWindow.attachEvent ) {
-			subWindow.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( el ) {
-		el.className = "i";
-		return !el.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( el ) {
-		el.appendChild( document.createComment("") );
-		return !el.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programmatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( el ) {
-		docElem.appendChild( el ).id = expando;
-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See https://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( el ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// https://bugs.jquery.com/ticket/12359
-			docElem.appendChild( el ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibling-combinator selector` fails
-			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( el ) {
-			el.innerHTML = "<a href='' disabled='disabled'></a>" +
-				"<select disabled='disabled'><option/></select>";
-
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			el.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll(":enabled").length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Support: IE9-11+
-			// IE's :disabled selector does not pick up the children of disabled fieldsets
-			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll(":disabled").length !== 2 ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( el ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( el, "*" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( el, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully self-exclusive
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		!compilerCache[ expr + " " ] &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.escape = function( sel ) {
-	return (sel + "").replace( rcssescape, fcssescape );
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType,
-						diff = false;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) {
-
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-
-							// Seek `elem` from a previously-cached index
-
-							// ...in a gzip-friendly way
-							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
-
-							// Support: IE <9 only
-							// Defend against cloned attroperties (jQuery gh-1709)
-							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
-
-							cache = uniqueCache[ type ] || [];
-							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-							diff = nodeIndex && cache[ 2 ];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						} else {
-							// Use previously-cached element index if available
-							if ( useCache ) {
-								// ...in a gzip-friendly way
-								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
-
-								// Support: IE <9 only
-								// Defend against cloned attroperties (jQuery gh-1709)
-								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
-
-								cache = uniqueCache[ type ] || [];
-								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-								diff = nodeIndex;
-							}
-
-							// xml :nth-child(...)
-							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
-							if ( diff === false ) {
-								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
-
-									if ( ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) &&
-										++diff ) {
-
-										// Cache the index of each encountered element
-										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
-
-											// Support: IE <9 only
-											// Defend against cloned attroperties (jQuery gh-1709)
-											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
-
-											uniqueCache[ type ] = [ dirruns, diff ];
-										}
-
-										if ( node === elem ) {
-											break;
-										}
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": createDisabledPseudo( false ),
-		"disabled": createDisabledPseudo( true ),
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		skip = combinator.next,
-		key = skip || dir,
-		checkNonElements = base && key === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, uniqueCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-
-						// Support: IE <9 only
-						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
-
-						if ( skip && skip === elem.nodeName.toLowerCase() ) {
-							elem = elem[ dir ] || elem;
-						} else if ( (oldCache = uniqueCache[ key ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ key ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
-						setDocument( elem );
-						xml = !documentIsHTML;
-					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// `i` is now the count of elements visited above, and adding it to `matchedCount`
-			// makes the latter nonnegative.
-			matchedCount += i;
-
-			// Apply set filters to unmatched elements
-			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
-			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
-			// no element matchers and no seed.
-			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
-			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
-			// numerically zero.
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is only one selector in the list and no seed
-	// (the latter of which guarantees us context)
-	if ( match.length === 1 ) {
-
-		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
-	// Should return 1, but returns 4 (following)
-	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
-	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
-	el.innerHTML = "<input/>";
-	el.firstChild.setAttribute( "value", "" );
-	return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
-	return el.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-
-// Deprecated
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-jQuery.escapeSelector = Sizzle.escape;
-
-
-
-
-var dir = function( elem, dir, until ) {
-	var matched = [],
-		truncate = until !== undefined;
-
-	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
-		if ( elem.nodeType === 1 ) {
-			if ( truncate && jQuery( elem ).is( until ) ) {
-				break;
-			}
-			matched.push( elem );
-		}
-	}
-	return matched;
-};
-
-
-var siblings = function( n, elem ) {
-	var matched = [];
-
-	for ( ; n; n = n.nextSibling ) {
-		if ( n.nodeType === 1 && n !== elem ) {
-			matched.push( n );
-		}
-	}
-
-	return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) !== not;
-		} );
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		} );
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) > -1 ) !== not && elem.nodeType === 1;
-	} );
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		} ) );
-};
-
-jQuery.fn.extend( {
-	find: function( selector ) {
-		var i, ret,
-			len = this.length,
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter( function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			} ) );
-		}
-
-		ret = this.pushStack( [] );
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		return len > 1 ? jQuery.uniqueSort( ret ) : ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], false ) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], true ) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	// Shortcut simple #id case for speed
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
-
-	init = jQuery.fn.init = function( selector, context, root ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Method init() accepts an alternate rootjQuery
-		// so migrate can support jQuery.sub (gh-2101)
-		root = root || rootjQuery;
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[ 0 ] === "<" &&
-				selector[ selector.length - 1 ] === ">" &&
-				selector.length >= 3 ) {
-
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && ( match[ 1 ] || !context ) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[ 1 ] ) {
-					context = context instanceof jQuery ? context[ 0 ] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[ 1 ],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[ 2 ] );
-
-					if ( elem ) {
-
-						// Inject the element directly into the jQuery object
-						this[ 0 ] = elem;
-						this.length = 1;
-					}
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || root ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this[ 0 ] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return root.ready !== undefined ?
-				root.ready( selector ) :
-
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend( {
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter( function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[ i ] ) ) {
-					return true;
-				}
-			}
-		} );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			targets = typeof selectors !== "string" && jQuery( selectors );
-
-		// Positional selectors never match, since there's no _selection_ context
-		if ( !rneedsContext.test( selectors ) ) {
-			for ( ; i < l; i++ ) {
-				for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
-					// Always skip document fragments
-					if ( cur.nodeType < 11 && ( targets ?
-						targets.index( cur ) > -1 :
-
-						// Don't pass non-elements to Sizzle
-						cur.nodeType === 1 &&
-							jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
-						matched.push( cur );
-						break;
-					}
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.uniqueSort(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	}
-} );
-
-function sibling( cur, dir ) {
-	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each( {
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return siblings( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return siblings( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.uniqueSort( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-} );
-var rnotwhite = ( /\S+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
-	var object = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	} );
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		createOptions( options ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-
-		// Last fire value for non-forgettable lists
-		memory,
-
-		// Flag to know if list was already fired
-		fired,
-
-		// Flag to prevent firing
-		locked,
-
-		// Actual callback list
-		list = [],
-
-		// Queue of execution data for repeatable lists
-		queue = [],
-
-		// Index of currently firing callback (modified by add/remove as needed)
-		firingIndex = -1,
-
-		// Fire callbacks
-		fire = function() {
-
-			// Enforce single-firing
-			locked = options.once;
-
-			// Execute callbacks for all pending executions,
-			// respecting firingIndex overrides and runtime changes
-			fired = firing = true;
-			for ( ; queue.length; firingIndex = -1 ) {
-				memory = queue.shift();
-				while ( ++firingIndex < list.length ) {
-
-					// Run callback and check for early termination
-					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
-						options.stopOnFalse ) {
-
-						// Jump to end and forget the data so .add doesn't re-fire
-						firingIndex = list.length;
-						memory = false;
-					}
-				}
-			}
-
-			// Forget the data if we're done with it
-			if ( !options.memory ) {
-				memory = false;
-			}
-
-			firing = false;
-
-			// Clean up if we're done firing for good
-			if ( locked ) {
-
-				// Keep an empty list if we have data for future add calls
-				if ( memory ) {
-					list = [];
-
-				// Otherwise, this object is spent
-				} else {
-					list = "";
-				}
-			}
-		},
-
-		// Actual Callbacks object
-		self = {
-
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-
-					// If we have memory from a past run, we should fire after adding
-					if ( memory && !firing ) {
-						firingIndex = list.length - 1;
-						queue.push( memory );
-					}
-
-					( function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							if ( jQuery.isFunction( arg ) ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
-
-								// Inspect recursively
-								add( arg );
-							}
-						} );
-					} )( arguments );
-
-					if ( memory && !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Remove a callback from the list
-			remove: function() {
-				jQuery.each( arguments, function( _, arg ) {
-					var index;
-					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-						list.splice( index, 1 );
-
-						// Handle firing indexes
-						if ( index <= firingIndex ) {
-							firingIndex--;
-						}
-					}
-				} );
-				return this;
-			},
-
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ?
-					jQuery.inArray( fn, list ) > -1 :
-					list.length > 0;
-			},
-
-			// Remove all callbacks from the list
-			empty: function() {
-				if ( list ) {
-					list = [];
-				}
-				return this;
-			},
-
-			// Disable .fire and .add
-			// Abort any current/pending executions
-			// Clear all callbacks and values
-			disable: function() {
-				locked = queue = [];
-				list = memory = "";
-				return this;
-			},
-			disabled: function() {
-				return !list;
-			},
-
-			// Disable .fire
-			// Also disable .add unless we have memory (since it would have no effect)
-			// Abort any pending executions
-			lock: function() {
-				locked = queue = [];
-				if ( !memory && !firing ) {
-					list = memory = "";
-				}
-				return this;
-			},
-			locked: function() {
-				return !!locked;
-			},
-
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( !locked ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					queue.push( args );
-					if ( !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-function Identity( v ) {
-	return v;
-}
-function Thrower( ex ) {
-	throw ex;
-}
-
-function adoptValue( value, resolve, reject ) {
-	var method;
-
-	try {
-
-		// Check for promise aspect first to privilege synchronous behavior
-		if ( value && jQuery.isFunction( ( method = value.promise ) ) ) {
-			method.call( value ).done( resolve ).fail( reject );
-
-		// Other thenables
-		} else if ( value && jQuery.isFunction( ( method = value.then ) ) ) {
-			method.call( value, resolve, reject );
-
-		// Other non-thenables
-		} else {
-
-			// Support: Android 4.0 only
-			// Strict mode functions invoked without .call/.apply get global-object context
-			resolve.call( undefined, value );
-		}
-
-	// For Promises/A+, convert exceptions into rejections
-	// Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
-	// Deferred#then to conditionally suppress rejection.
-	} catch ( value ) {
-
-		// Support: Android 4.0 only
-		// Strict mode functions invoked without .call/.apply get global-object context
-		reject.call( undefined, value );
-	}
-}
-
-jQuery.extend( {
-
-	Deferred: function( func ) {
-		var tuples = [
-
-				// action, add listener, callbacks,
-				// ... .then handlers, argument index, [final state]
-				[ "notify", "progress", jQuery.Callbacks( "memory" ),
-					jQuery.Callbacks( "memory" ), 2 ],
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ),
-					jQuery.Callbacks( "once memory" ), 0, "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ),
-					jQuery.Callbacks( "once memory" ), 1, "rejected" ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				"catch": function( fn ) {
-					return promise.then( null, fn );
-				},
-
-				// Keep pipe for back-compat
-				pipe: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-
-					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-
-							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
-							var fn = jQuery.isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
-
-							// deferred.progress(function() { bind to newDefer or newDefer.notify })
-							// deferred.done(function() { bind to newDefer or newDefer.resolve })
-							// deferred.fail(function() { bind to newDefer or newDefer.reject })
-							deferred[ tuple[ 1 ] ]( function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.progress( newDefer.notify )
-										.done( newDefer.resolve )
-										.fail( newDefer.reject );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ](
-										this,
-										fn ? [ returned ] : arguments
-									);
-								}
-							} );
-						} );
-						fns = null;
-					} ).promise();
-				},
-				then: function( onFulfilled, onRejected, onProgress ) {
-					var maxDepth = 0;
-					function resolve( depth, deferred, handler, special ) {
-						return function() {
-							var that = this,
-								args = arguments,
-								mightThrow = function() {
-									var returned, then;
-
-									// Support: Promises/A+ section 2.3.3.3.3
-									// https://promisesaplus.com/#point-59
-									// Ignore double-resolution attempts
-									if ( depth < maxDepth ) {
-										return;
-									}
-
-									returned = handler.apply( that, args );
-
-									// Support: Promises/A+ section 2.3.1
-									// https://promisesaplus.com/#point-48
-									if ( returned === deferred.promise() ) {
-										throw new TypeError( "Thenable self-resolution" );
-									}
-
-									// Support: Promises/A+ sections 2.3.3.1, 3.5
-									// https://promisesaplus.com/#point-54
-									// https://promisesaplus.com/#point-75
-									// Retrieve `then` only once
-									then = returned &&
-
-										// Support: Promises/A+ section 2.3.4
-										// https://promisesaplus.com/#point-64
-										// Only check objects and functions for thenability
-										( typeof returned === "object" ||
-											typeof returned === "function" ) &&
-										returned.then;
-
-									// Handle a returned thenable
-									if ( jQuery.isFunction( then ) ) {
-
-										// Special processors (notify) just wait for resolution
-										if ( special ) {
-											then.call(
-												returned,
-												resolve( maxDepth, deferred, Identity, special ),
-												resolve( maxDepth, deferred, Thrower, special )
-											);
-
-										// Normal processors (resolve) also hook into progress
-										} else {
-
-											// ...and disregard older resolution values
-											maxDepth++;
-
-											then.call(
-												returned,
-												resolve( maxDepth, deferred, Identity, special ),
-												resolve( maxDepth, deferred, Thrower, special ),
-												resolve( maxDepth, deferred, Identity,
-													deferred.notifyWith )
-											);
-										}
-
-									// Handle all other returned values
-									} else {
-
-										// Only substitute handlers pass on context
-										// and multiple values (non-spec behavior)
-										if ( handler !== Identity ) {
-											that = undefined;
-											args = [ returned ];
-										}
-
-										// Process the value(s)
-										// Default process is resolve
-										( special || deferred.resolveWith )( that, args );
-									}
-								},
-
-								// Only normal processors (resolve) catch and reject exceptions
-								process = special ?
-									mightThrow :
-									function() {
-										try {
-											mightThrow();
-										} catch ( e ) {
-
-											if ( jQuery.Deferred.exceptionHook ) {
-												jQuery.Deferred.exceptionHook( e,
-													process.stackTrace );
-											}
-
-											// Support: Promises/A+ section 2.3.3.3.4.1
-											// https://promisesaplus.com/#point-61
-											// Ignore post-resolution exceptions
-											if ( depth + 1 >= maxDepth ) {
-
-												// Only substitute handlers pass on context
-												// and multiple values (non-spec behavior)
-												if ( handler !== Thrower ) {
-													that = undefined;
-													args = [ e ];
-												}
-
-												deferred.rejectWith( that, args );
-											}
-										}
-									};
-
-							// Support: Promises/A+ section 2.3.3.3.1
-							// https://promisesaplus.com/#point-57
-							// Re-resolve promises immediately to dodge false rejection from
-							// subsequent errors
-							if ( depth ) {
-								process();
-							} else {
-
-								// Call an optional hook to record the stack, in case of exception
-								// since it's otherwise lost when execution goes async
-								if ( jQuery.Deferred.getStackHook ) {
-									process.stackTrace = jQuery.Deferred.getStackHook();
-								}
-								window.setTimeout( process );
-							}
-						};
-					}
-
-					return jQuery.Deferred( function( newDefer ) {
-
-						// progress_handlers.add( ... )
-						tuples[ 0 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								jQuery.isFunction( onProgress ) ?
-									onProgress :
-									Identity,
-								newDefer.notifyWith
-							)
-						);
-
-						// fulfilled_handlers.add( ... )
-						tuples[ 1 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								jQuery.isFunction( onFulfilled ) ?
-									onFulfilled :
-									Identity
-							)
-						);
-
-						// rejected_handlers.add( ... )
-						tuples[ 2 ][ 3 ].add(
-							resolve(
-								0,
-								newDefer,
-								jQuery.isFunction( onRejected ) ?
-									onRejected :
-									Thrower
-							)
-						);
-					} ).promise();
-				},
-
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 5 ];
-
-			// promise.progress = list.add
-			// promise.done = list.add
-			// promise.fail = list.add
-			promise[ tuple[ 1 ] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(
-					function() {
-
-						// state = "resolved" (i.e., fulfilled)
-						// state = "rejected"
-						state = stateString;
-					},
-
-					// rejected_callbacks.disable
-					// fulfilled_callbacks.disable
-					tuples[ 3 - i ][ 2 ].disable,
-
-					// progress_callbacks.lock
-					tuples[ 0 ][ 2 ].lock
-				);
-			}
-
-			// progress_handlers.fire
-			// fulfilled_handlers.fire
-			// rejected_handlers.fire
-			list.add( tuple[ 3 ].fire );
-
-			// deferred.notify = function() { deferred.notifyWith(...) }
-			// deferred.resolve = function() { deferred.resolveWith(...) }
-			// deferred.reject = function() { deferred.rejectWith(...) }
-			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
-				return this;
-			};
-
-			// deferred.notifyWith = list.fireWith
-			// deferred.resolveWith = list.fireWith
-			// deferred.rejectWith = list.fireWith
-			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
-		} );
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( singleValue ) {
-		var
-
-			// count of uncompleted subordinates
-			remaining = arguments.length,
-
-			// count of unprocessed arguments
-			i = remaining,
-
-			// subordinate fulfillment data
-			resolveContexts = Array( i ),
-			resolveValues = slice.call( arguments ),
-
-			// the master Deferred
-			master = jQuery.Deferred(),
-
-			// subordinate callback factory
-			updateFunc = function( i ) {
-				return function( value ) {
-					resolveContexts[ i ] = this;
-					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( !( --remaining ) ) {
-						master.resolveWith( resolveContexts, resolveValues );
-					}
-				};
-			};
-
-		// Single- and empty arguments are adopted like Promise.resolve
-		if ( remaining <= 1 ) {
-			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject );
-
-			// Use .then() to unwrap secondary thenables (cf. gh-3000)
-			if ( master.state() === "pending" ||
-				jQuery.isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
-
-				return master.then();
-			}
-		}
-
-		// Multiple arguments are aggregated like Promise.all array elements
-		while ( i-- ) {
-			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
-		}
-
-		return master.promise();
-	}
-} );
-
-
-// These usually indicate a programmer mistake during development,
-// warn about them ASAP rather than swallowing them by default.
-var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
-
-jQuery.Deferred.exceptionHook = function( error, stack ) {
-
-	// Support: IE 8 - 9 only
-	// Console exists when dev tools are open, which can happen at any time
-	if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
-		window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
-	}
-};
-
-
-
-
-jQuery.readyException = function( error ) {
-	window.setTimeout( function() {
-		throw error;
-	} );
-};
-
-
-
-
-// The deferred used on DOM ready
-var readyList = jQuery.Deferred();
-
-jQuery.fn.ready = function( fn ) {
-
-	readyList
-		.then( fn )
-
-		// Wrap jQuery.readyException in a function so that the lookup
-		// happens at the time of error handling instead of callback
-		// registration.
-		.catch( function( error ) {
-			jQuery.readyException( error );
-		} );
-
-	return this;
-};
-
-jQuery.extend( {
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-	}
-} );
-
-jQuery.ready.then = readyList.then;
-
-// The ready event handler and self cleanup method
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed );
-	window.removeEventListener( "load", completed );
-	jQuery.ready();
-}
-
-// Catch cases where $(document).ready() is called
-// after the browser event has already occurred.
-// Support: IE <=9 - 10 only
-// Older IE sometimes signals "interactive" too soon
-if ( document.readyState === "complete" ||
-	( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
-	// Handle it asynchronously to allow scripts the opportunity to delay ready
-	window.setTimeout( jQuery.ready );
-
-} else {
-
-	// Use the handy event callback
-	document.addEventListener( "DOMContentLoaded", completed );
-
-	// A fallback to window.onload, that will always work
-	window.addEventListener( "load", completed );
-}
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn(
-					elems[ i ], key, raw ?
-					value :
-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
-				);
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[ 0 ], key ) : emptyGet;
-};
-var acceptData = function( owner ) {
-
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-
-
-function Data() {
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-
-Data.prototype = {
-
-	cache: function( owner ) {
-
-		// Check if the owner object already has a cache
-		var value = owner[ this.expando ];
-
-		// If not, create one
-		if ( !value ) {
-			value = {};
-
-			// We can accept data for non-element nodes in modern browsers,
-			// but we should not, see #8335.
-			// Always return an empty object.
-			if ( acceptData( owner ) ) {
-
-				// If it is a node unlikely to be stringify-ed or looped over
-				// use plain assignment
-				if ( owner.nodeType ) {
-					owner[ this.expando ] = value;
-
-				// Otherwise secure it in a non-enumerable property
-				// configurable must be true to allow the property to be
-				// deleted when data is removed
-				} else {
-					Object.defineProperty( owner, this.expando, {
-						value: value,
-						configurable: true
-					} );
-				}
-			}
-		}
-
-		return value;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			cache = this.cache( owner );
-
-		// Handle: [ owner, key, value ] args
-		// Always use camelCase key (gh-2257)
-		if ( typeof data === "string" ) {
-			cache[ jQuery.camelCase( data ) ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-
-			// Copy the properties one-by-one to the cache object
-			for ( prop in data ) {
-				cache[ jQuery.camelCase( prop ) ] = data[ prop ];
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		return key === undefined ?
-			this.cache( owner ) :
-
-			// Always use camelCase key (gh-2257)
-			owner[ this.expando ] && owner[ this.expando ][ jQuery.camelCase( key ) ];
-	},
-	access: function( owner, key, value ) {
-
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				( ( key && typeof key === "string" ) && value === undefined ) ) {
-
-			return this.get( owner, key );
-		}
-
-		// When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i,
-			cache = owner[ this.expando ];
-
-		if ( cache === undefined ) {
-			return;
-		}
-
-		if ( key !== undefined ) {
-
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-
-				// If key is an array of keys...
-				// We always set camelCase keys, so remove that.
-				key = key.map( jQuery.camelCase );
-			} else {
-				key = jQuery.camelCase( key );
-
-				// If a key with the spaces exists, use it.
-				// Otherwise, create an array by matching non-whitespace
-				key = key in cache ?
-					[ key ] :
-					( key.match( rnotwhite ) || [] );
-			}
-
-			i = key.length;
-
-			while ( i-- ) {
-				delete cache[ key[ i ] ];
-			}
-		}
-
-		// Remove the expando if there's no more data
-		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
-
-			// Support: Chrome <=35 - 45
-			// Webkit & Blink performance suffers when deleting properties
-			// from DOM nodes, so set to undefined instead
-			// https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
-			if ( owner.nodeType ) {
-				owner[ this.expando ] = undefined;
-			} else {
-				delete owner[ this.expando ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		var cache = owner[ this.expando ];
-		return cache !== undefined && !jQuery.isEmptyObject( cache );
-	}
-};
-var dataPriv = new Data();
-
-var dataUser = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /[A-Z]/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? JSON.parse( data ) :
-					data;
-			} catch ( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			dataUser.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend( {
-	hasData: function( elem ) {
-		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return dataUser.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		dataUser.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to dataPriv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return dataPriv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		dataPriv.remove( elem, name );
-	}
-} );
-
-jQuery.fn.extend( {
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = dataUser.get( elem );
-
-				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE 11 only
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice( 5 ) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					dataPriv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each( function() {
-				dataUser.set( this, key );
-			} );
-		}
-
-		return access( this, function( value ) {
-			var data;
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-
-				// Attempt to get data from the cache
-				// The key will always be camelCased in Data
-				data = dataUser.get( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, key );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			this.each( function() {
-
-				// We always store the camelCased key
-				dataUser.set( this, key, value );
-			} );
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each( function() {
-			dataUser.remove( this, key );
-		} );
-	}
-} );
-
-
-jQuery.extend( {
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = dataPriv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
-			empty: jQuery.Callbacks( "once memory" ).add( function() {
-				dataPriv.remove( elem, [ type + "queue", key ] );
-			} )
-		} );
-	}
-} );
-
-jQuery.fn.extend( {
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[ 0 ], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each( function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			} );
-	},
-	dequeue: function( type ) {
-		return this.each( function() {
-			jQuery.dequeue( this, type );
-		} );
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-} );
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHiddenWithinTree = function( elem, el ) {
-
-		// isHiddenWithinTree might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-
-		// Inline style trumps all
-		return elem.style.display === "none" ||
-			elem.style.display === "" &&
-
-			// Otherwise, check computed style
-			// Support: Firefox <=43 - 45
-			// Disconnected elements can have computed display: none, so first confirm that elem is
-			// in the document.
-			jQuery.contains( elem.ownerDocument, elem ) &&
-
-			jQuery.css( elem, "display" ) === "none";
-	};
-
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
-	var adjusted,
-		scale = 1,
-		maxIterations = 20,
-		currentValue = tween ?
-			function() {
-				return tween.cur();
-			} :
-			function() {
-				return jQuery.css( elem, prop, "" );
-			},
-		initial = currentValue(),
-		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-		// Starting value computation is required for potential unit mismatches
-		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
-			rcssNum.exec( jQuery.css( elem, prop ) );
-
-	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
-		// Trust units reported by jQuery.css
-		unit = unit || initialInUnit[ 3 ];
-
-		// Make sure we update the tween properties later on
-		valueParts = valueParts || [];
-
-		// Iteratively approximate from a nonzero starting point
-		initialInUnit = +initial || 1;
-
-		do {
-
-			// If previous iteration zeroed out, double until we get *something*.
-			// Use string for doubling so we don't accidentally see scale as unchanged below
-			scale = scale || ".5";
-
-			// Adjust and apply
-			initialInUnit = initialInUnit / scale;
-			jQuery.style( elem, prop, initialInUnit + unit );
-
-		// Update scale, tolerating zero or NaN from tween.cur()
-		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
-		} while (
-			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
-		);
-	}
-
-	if ( valueParts ) {
-		initialInUnit = +initialInUnit || +initial || 0;
-
-		// Apply relative offset (+=/-=) if specified
-		adjusted = valueParts[ 1 ] ?
-			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
-			+valueParts[ 2 ];
-		if ( tween ) {
-			tween.unit = unit;
-			tween.start = initialInUnit;
-			tween.end = adjusted;
-		}
-	}
-	return adjusted;
-}
-
-
-var defaultDisplayMap = {};
-
-function getDefaultDisplay( elem ) {
-	var temp,
-		doc = elem.ownerDocument,
-		nodeName = elem.nodeName,
-		display = defaultDisplayMap[ nodeName ];
-
-	if ( display ) {
-		return display;
-	}
-
-	temp = doc.body.appendChild( doc.createElement( nodeName ) ),
-	display = jQuery.css( temp, "display" );
-
-	temp.parentNode.removeChild( temp );
-
-	if ( display === "none" ) {
-		display = "block";
-	}
-	defaultDisplayMap[ nodeName ] = display;
-
-	return display;
-}
-
-function showHide( elements, show ) {
-	var display, elem,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	// Determine new display value for elements that need to change
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		display = elem.style.display;
-		if ( show ) {
-
-			// Since we force visibility upon cascade-hidden elements, an immediate (and slow)
-			// check is required in this first loop unless we have a nonempty display value (either
-			// inline or about-to-be-restored)
-			if ( display === "none" ) {
-				values[ index ] = dataPriv.get( elem, "display" ) || null;
-				if ( !values[ index ] ) {
-					elem.style.display = "";
-				}
-			}
-			if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
-				values[ index ] = getDefaultDisplay( elem );
-			}
-		} else {
-			if ( display !== "none" ) {
-				values[ index ] = "none";
-
-				// Remember what we're overwriting
-				dataPriv.set( elem, "display", display );
-			}
-		}
-	}
-
-	// Set the display of the elements in a second loop to avoid constant reflow
-	for ( index = 0; index < length; index++ ) {
-		if ( values[ index ] != null ) {
-			elements[ index ].style.display = values[ index ];
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend( {
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each( function() {
-			if ( isHiddenWithinTree( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		} );
-	}
-} );
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
-
-var rscriptType = ( /^$|\/(?:java|ecma)script/i );
-
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
-
-	// Support: IE <=9 only
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-	// XHTML parsers do not magically insert elements in the
-	// same way that tag soup parsers do. So we cannot shorten
-	// this by omitting <tbody> or other required elements.
-	thead: [ 1, "<table>", "</table>" ],
-	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-	_default: [ 0, "", "" ]
-};
-
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-
-function getAll( context, tag ) {
-
-	// Support: IE <=9 - 11 only
-	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
-	var ret = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ?
-				context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		dataPriv.set(
-			elems[ i ],
-			"globalEval",
-			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-
-var rhtml = /<|&#?\w+;/;
-
-function buildFragment( elems, context, scripts, selection, ignored ) {
-	var elem, tmp, tag, wrap, contains, j,
-		fragment = context.createDocumentFragment(),
-		nodes = [],
-		i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		elem = elems[ i ];
-
-		if ( elem || elem === 0 ) {
-
-			// Add nodes directly
-			if ( jQuery.type( elem ) === "object" ) {
-
-				// Support: Android <=4.0 only, PhantomJS 1 only
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-			// Convert non-html into a text node
-			} else if ( !rhtml.test( elem ) ) {
-				nodes.push( context.createTextNode( elem ) );
-
-			// Convert html into DOM nodes
-			} else {
-				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
-
-				// Deserialize a standard representation
-				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-				wrap = wrapMap[ tag ] || wrapMap._default;
-				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
-
-				// Descend through wrappers to the right content
-				j = wrap[ 0 ];
-				while ( j-- ) {
-					tmp = tmp.lastChild;
-				}
-
-				// Support: Android <=4.0 only, PhantomJS 1 only
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, tmp.childNodes );
-
-				// Remember the top-level container
-				tmp = fragment.firstChild;
-
-				// Ensure the created nodes are orphaned (#12392)
-				tmp.textContent = "";
-			}
-		}
-	}
-
-	// Remove wrapper from fragment
-	fragment.textContent = "";
-
-	i = 0;
-	while ( ( elem = nodes[ i++ ] ) ) {
-
-		// Skip elements already in the context collection (trac-4087)
-		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
-			if ( ignored ) {
-				ignored.push( elem );
-			}
-			continue;
-		}
-
-		contains = jQuery.contains( elem.ownerDocument, elem );
-
-		// Append to fragment
-		tmp = getAll( fragment.appendChild( elem ), "script" );
-
-		// Preserve script evaluation history
-		if ( contains ) {
-			setGlobalEval( tmp );
-		}
-
-		// Capture executables
-		if ( scripts ) {
-			j = 0;
-			while ( ( elem = tmp[ j++ ] ) ) {
-				if ( rscriptType.test( elem.type || "" ) ) {
-					scripts.push( elem );
-				}
-			}
-		}
-	}
-
-	return fragment;
-}
-
-
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0 - 4.3 only
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Android <=4.1 only
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE <=11 only
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-var documentElement = document.documentElement;
-
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-// Support: IE <=9 only
-// See #13393 for more info
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
-	var origFn, type;
-
-	// Types can be a map of types/handlers
-	if ( typeof types === "object" ) {
-
-		// ( types-Object, selector, data )
-		if ( typeof selector !== "string" ) {
-
-			// ( types-Object, data )
-			data = data || selector;
-			selector = undefined;
-		}
-		for ( type in types ) {
-			on( elem, type, selector, data, types[ type ], one );
-		}
-		return elem;
-	}
-
-	if ( data == null && fn == null ) {
-
-		// ( types, fn )
-		fn = selector;
-		data = selector = undefined;
-	} else if ( fn == null ) {
-		if ( typeof selector === "string" ) {
-
-			// ( types, selector, fn )
-			fn = data;
-			data = undefined;
-		} else {
-
-			// ( types, data, fn )
-			fn = data;
-			data = selector;
-			selector = undefined;
-		}
-	}
-	if ( fn === false ) {
-		fn = returnFalse;
-	} else if ( !fn ) {
-		return elem;
-	}
-
-	if ( one === 1 ) {
-		origFn = fn;
-		fn = function( event ) {
-
-			// Can use an empty set, since event contains the info
-			jQuery().off( event );
-			return origFn.apply( this, arguments );
-		};
-
-		// Use same guid so caller can remove using origFn
-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-	}
-	return elem.each( function() {
-		jQuery.event.add( this, types, fn, data, selector );
-	} );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Ensure that invalid selectors throw exceptions at attach time
-		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
-		if ( selector ) {
-			jQuery.find.matchesSelector( documentElement, selector );
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
-		}
-		if ( !( eventHandle = elemData.handle ) ) {
-			eventHandle = elemData.handle = function( e ) {
-
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend( {
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join( "." )
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !( handlers = events[ type ] ) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup ||
-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
-
-		if ( !elemData || !( events = elemData.events ) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[ 2 ] &&
-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector ||
-						selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown ||
-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove data and the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			dataPriv.remove( elem, "handle events" );
-		}
-	},
-
-	dispatch: function( nativeEvent ) {
-
-		// Make a writable jQuery.Event from the native event object
-		var event = jQuery.event.fix( nativeEvent );
-
-		var i, j, ret, matched, handleObj, handlerQueue,
-			args = new Array( arguments.length ),
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[ 0 ] = event;
-
-		for ( i = 1; i < arguments.length; i++ ) {
-			args[ i ] = arguments[ i ];
-		}
-
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
-				!event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
-						handleObj.handler ).apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( ( event.result = ret ) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Support: IE <=9
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		//
-		// Support: Firefox <=42
-		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
-		if ( delegateCount && cur.nodeType &&
-			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push( { elem: cur, handlers: matches } );
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
-		}
-
-		return handlerQueue;
-	},
-
-	addProp: function( name, hook ) {
-		Object.defineProperty( jQuery.Event.prototype, name, {
-			enumerable: true,
-			configurable: true,
-
-			get: jQuery.isFunction( hook ) ?
-				function() {
-					if ( this.originalEvent ) {
-							return hook( this.originalEvent );
-					}
-				} :
-				function() {
-					if ( this.originalEvent ) {
-							return this.originalEvent[ name ];
-					}
-				},
-
-			set: function( value ) {
-				Object.defineProperty( this, name, {
-					enumerable: true,
-					configurable: true,
-					writable: true,
-					value: value
-				} );
-			}
-		} );
-	},
-
-	fix: function( originalEvent ) {
-		return originalEvent[ jQuery.expando ] ?
-			originalEvent :
-			new jQuery.Event( originalEvent );
-	},
-
-	special: {
-		load: {
-
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-
-	// This "if" is needed for plain objects
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-
-	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-
-				// Support: Android <=2.3 only
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-		// Create target properties
-		// Support: Safari <=6 - 7 only
-		// Target should not be a text node (#504, #13143)
-		this.target = ( src.target && src.target.nodeType === 3 ) ?
-			src.target.parentNode :
-			src.target;
-
-		this.currentTarget = src.currentTarget;
-		this.relatedTarget = src.relatedTarget;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-	isSimulated: false,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Includes all common event props including KeyEvent and MouseEvent specific props
-jQuery.each( {
-	altKey: true,
-	bubbles: true,
-	cancelable: true,
-	changedTouches: true,
-	ctrlKey: true,
-	detail: true,
-	eventPhase: true,
-	metaKey: true,
-	pageX: true,
-	pageY: true,
-	shiftKey: true,
-	view: true,
-	"char": true,
-	charCode: true,
-	key: true,
-	keyCode: true,
-	button: true,
-	buttons: true,
-	clientX: true,
-	clientY: true,
-	offsetX: true,
-	offsetY: true,
-	pointerId: true,
-	pointerType: true,
-	screenX: true,
-	screenY: true,
-	targetTouches: true,
-	toElement: true,
-	touches: true,
-
-	which: function( event ) {
-		var button = event.button;
-
-		// Add which for key events
-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
-			return event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
-			return ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-		}
-
-		return event.which;
-	}
-}, jQuery.event.addProp );
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mouseenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-} );
-
-jQuery.fn.extend( {
-
-	on: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn );
-	},
-	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
-					handleObj.origType + "." + handleObj.namespace :
-					handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each( function() {
-			jQuery.event.remove( this, types, fn, selector );
-		} );
-	}
-} );
-
-
-var
-
-	/* eslint-disable max-len */
-
-	// See https://github.com/eslint/eslint/issues/3229
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
-	/* eslint-enable */
-
-	// Support: IE <=10 - 11, Edge 12 - 13
-	// In IE/Edge using regex groups here causes severe slowdowns.
-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
-	rnoInnerhtml = /<script|<style|<link/i,
-
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
-
-function manipulationTarget( elem, content ) {
-	if ( jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
-
-		return elem.getElementsByTagName( "tbody" )[ 0 ] || elem;
-	}
-
-	return elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute( "type" );
-	}
-
-	return elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.access( src );
-		pdataCur = dataPriv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( dataUser.hasData( src ) ) {
-		udataOld = dataUser.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		dataUser.set( dest, udataCur );
-	}
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-function domManip( collection, args, callback, ignored ) {
-
-	// Flatten any nested arrays
-	args = concat.apply( [], args );
-
-	var fragment, first, scripts, hasScripts, node, doc,
-		i = 0,
-		l = collection.length,
-		iNoClone = l - 1,
-		value = args[ 0 ],
-		isFunction = jQuery.isFunction( value );
-
-	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( isFunction ||
-			( l > 1 && typeof value === "string" &&
-				!support.checkClone && rchecked.test( value ) ) ) {
-		return collection.each( function( index ) {
-			var self = collection.eq( index );
-			if ( isFunction ) {
-				args[ 0 ] = value.call( this, index, self.html() );
-			}
-			domManip( self, args, callback, ignored );
-		} );
-	}
-
-	if ( l ) {
-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
-		first = fragment.firstChild;
-
-		if ( fragment.childNodes.length === 1 ) {
-			fragment = first;
-		}
-
-		// Require either new content or an interest in ignored elements to invoke the callback
-		if ( first || ignored ) {
-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-			hasScripts = scripts.length;
-
-			// Use the original fragment for the last item
-			// instead of the first because it can end up
-			// being emptied incorrectly in certain situations (#8070).
-			for ( ; i < l; i++ ) {
-				node = fragment;
-
-				if ( i !== iNoClone ) {
-					node = jQuery.clone( node, true, true );
-
-					// Keep references to cloned scripts for later restoration
-					if ( hasScripts ) {
-
-						// Support: Android <=4.0 only, PhantomJS 1 only
-						// push.apply(_, arraylike) throws on ancient WebKit
-						jQuery.merge( scripts, getAll( node, "script" ) );
-					}
-				}
-
-				callback.call( collection[ i ], node, i );
-			}
-
-			if ( hasScripts ) {
-				doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-				// Reenable scripts
-				jQuery.map( scripts, restoreScript );
-
-				// Evaluate executable scripts on first document insertion
-				for ( i = 0; i < hasScripts; i++ ) {
-					node = scripts[ i ];
-					if ( rscriptType.test( node.type || "" ) &&
-						!dataPriv.access( node, "globalEval" ) &&
-						jQuery.contains( doc, node ) ) {
-
-						if ( node.src ) {
-
-							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl ) {
-								jQuery._evalUrl( node.src );
-							}
-						} else {
-							DOMEval( node.textContent.replace( rcleanScript, "" ), doc );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return collection;
-}
-
-function remove( elem, selector, keepData ) {
-	var node,
-		nodes = selector ? jQuery.filter( selector, elem ) : elem,
-		i = 0;
-
-	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
-		if ( !keepData && node.nodeType === 1 ) {
-			jQuery.cleanData( getAll( node ) );
-		}
-
-		if ( node.parentNode ) {
-			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
-				setGlobalEval( getAll( node, "script" ) );
-			}
-			node.parentNode.removeChild( node );
-		}
-	}
-
-	return elem;
-}
-
-jQuery.extend( {
-	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
-	},
-
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
-			if ( acceptData( elem ) ) {
-				if ( ( data = elem[ dataPriv.expando ] ) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Support: Chrome <=35 - 45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataPriv.expando ] = undefined;
-				}
-				if ( elem[ dataUser.expando ] ) {
-
-					// Support: Chrome <=35 - 45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataUser.expando ] = undefined;
-				}
-			}
-		}
-	}
-} );
-
-jQuery.fn.extend( {
-	detach: function( selector ) {
-		return remove( this, selector, true );
-	},
-
-	remove: function( selector ) {
-		return remove( this, selector );
-	},
-
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each( function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				} );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		} );
-	},
-
-	prepend: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		} );
-	},
-
-	before: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		} );
-	},
-
-	after: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		} );
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		} );
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = jQuery.htmlPrefilter( value );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch ( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var ignored = [];
-
-		// Make the changes, replacing each non-ignored context element with the new content
-		return domManip( this, arguments, function( elem ) {
-			var parent = this.parentNode;
-
-			if ( jQuery.inArray( this, ignored ) < 0 ) {
-				jQuery.cleanData( getAll( this ) );
-				if ( parent ) {
-					parent.replaceChild( elem, this );
-				}
-			}
-
-		// Force callback invocation
-		}, ignored );
-	}
-} );
-
-jQuery.each( {
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: Android <=4.0 only, PhantomJS 1 only
-			// .get() because push.apply(_, arraylike) throws on ancient WebKit
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-var rmargin = ( /^margin/ );
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var getStyles = function( elem ) {
-
-		// Support: IE <=11 only, Firefox <=30 (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		var view = elem.ownerDocument.defaultView;
-
-		if ( !view || !view.opener ) {
-			view = window;
-		}
-
-		return view.getComputedStyle( elem );
-	};
-
-
-
-( function() {
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computeStyleTests() {
-
-		// This is a singleton, we need to execute it only once
-		if ( !div ) {
-			return;
-		}
-
-		div.style.cssText =
-			"box-sizing:border-box;" +
-			"position:relative;display:block;" +
-			"margin:auto;border:1px;padding:1px;" +
-			"top:1%;width:50%";
-		div.innerHTML = "";
-		documentElement.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div );
-		pixelPositionVal = divStyle.top !== "1%";
-
-		// Support: Android 4.0 - 4.3 only, Firefox <=3 - 44
-		reliableMarginLeftVal = divStyle.marginLeft === "2px";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		// Support: Android 4.0 - 4.3 only
-		// Some styles come back with percentage values, even though they shouldn't
-		div.style.marginRight = "50%";
-		pixelMarginRightVal = divStyle.marginRight === "4px";
-
-		documentElement.removeChild( container );
-
-		// Nullify the div so it wouldn't be stored in the memory and
-		// it will also be a sign that checks already performed
-		div = null;
-	}
-
-	var pixelPositionVal, boxSizingReliableVal, pixelMarginRightVal, reliableMarginLeftVal,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	// Finish early in limited (non-browser) environments
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE <=9 - 11 only
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
-		"padding:0;margin-top:1px;position:absolute";
-	container.appendChild( div );
-
-	jQuery.extend( support, {
-		pixelPosition: function() {
-			computeStyleTests();
-			return pixelPositionVal;
-		},
-		boxSizingReliable: function() {
-			computeStyleTests();
-			return boxSizingReliableVal;
-		},
-		pixelMarginRight: function() {
-			computeStyleTests();
-			return pixelMarginRightVal;
-		},
-		reliableMarginLeft: function() {
-			computeStyleTests();
-			return reliableMarginLeftVal;
-		}
-	} );
-} )();
-
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-
-	// Support: IE <=9 only
-	// getPropertyValue is only needed for .css('filter') (#12537)
-	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
-
-		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-			ret = jQuery.style( elem, name );
-		}
-
-		// A tribute to the "awesome hack by Dean Edwards"
-		// Android Browser returns percentage for some values,
-		// but width seems to be reliably pixels.
-		// This is against the CSSOM draft spec:
-		// https://drafts.csswg.org/cssom/#resolved-values
-		if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-
-		// Support: IE <=9 - 11 only
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return ( this.get = hookFn ).apply( this, arguments );
-		}
-	};
-}
-
-
-var
-
-	// Swappable if display is none or starts with table
-	// except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "Moz", "ms" ],
-	emptyStyle = document.createElement( "div" ).style;
-
-// Return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( name ) {
-
-	// Shortcut for names that are not vendor prefixed
-	if ( name in emptyStyle ) {
-		return name;
-	}
-
-	// Check for vendor prefixed names
-	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in emptyStyle ) {
-			return name;
-		}
-	}
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-
-	// Any relative (+/-) values have already been
-	// normalized at this point
-	var matches = rcssNum.exec( value );
-	return matches ?
-
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-
-		// If we already have the right measurement, avoid augmentation
-		4 :
-
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var val,
-		valueIsBorderBox = true,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Support: IE <=11 only
-	// Running getBoundingClientRect on a disconnected node
-	// in IE throws an error.
-	if ( elem.getClientRects().length ) {
-		val = elem.getBoundingClientRect()[ name ];
-	}
-
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test( val ) ) {
-			return val;
-		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// Use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-jQuery.extend( {
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"animationIterationCount": true,
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
-				value = adjustCSS( elem, name, ret );
-
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add the unit (except for certain CSS properties)
-			if ( type === "number" ) {
-				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
-			}
-
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !( "set" in hooks ) ||
-				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
-
-				style[ name ] = value;
-			}
-
-		} else {
-
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks &&
-				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
-
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || isFinite( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-} );
-
-jQuery.each( [ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-
-					// Support: Safari 8+
-					// Table columns in Safari have non-zero offsetWidth & zero
-					// getBoundingClientRect().width unless display is changed.
-					// Support: IE <=11 only
-					// Running getBoundingClientRect on a disconnected node
-					// in IE throws an error.
-					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, name, extra );
-						} ) :
-						getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var matches,
-				styles = extra && getStyles( elem ),
-				subtract = extra && augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				);
-
-			// Convert to pixels if value adjustment is needed
-			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
-				( matches[ 3 ] || "px" ) !== "px" ) {
-
-				elem.style[ name ] = value;
-				value = jQuery.css( elem, name );
-			}
-
-			return setPositiveNumber( elem, value, subtract );
-		}
-	};
-} );
-
-jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
-	function( elem, computed ) {
-		if ( computed ) {
-			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
-				elem.getBoundingClientRect().left -
-					swap( elem, { marginLeft: 0 }, function() {
-						return elem.getBoundingClientRect().left;
-					} )
-				) + "px";
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each( {
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split( " " ) : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-} );
-
-jQuery.fn.extend( {
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	}
-} );
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || jQuery.easing._default;
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			// Use a property on the element directly when it is not a DOM element,
-			// or when there is no matching style property that exists.
-			if ( tween.elem.nodeType !== 1 ||
-				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.nodeType === 1 &&
-				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
-					jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE <=9 only
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	},
-	_default: "swing"
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rrun = /queueHooks$/;
-
-function raf() {
-	if ( timerId ) {
-		window.requestAnimationFrame( raf );
-		jQuery.fx.tick();
-	}
-}
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	window.setTimeout( function() {
-		fxNow = undefined;
-	} );
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
-		isBox = "width" in props || "height" in props,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHiddenWithinTree( elem ),
-		dataShow = dataPriv.get( elem, "fxshow" );
-
-	// Queue-skipping animations hijack the fx hooks
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always( function() {
-
-			// Ensure the complete handler is called before this completes
-			anim.always( function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			} );
-		} );
-	}
-
-	// Detect show/hide animations
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.test( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// Pretend to be hidden if this is a "show" and
-				// there is still data from a stopped show/hide
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-
-				// Ignore all other no-op show/hide data
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	// Bail out if this is a no-op like .hide().hide()
-	propTween = !jQuery.isEmptyObject( props );
-	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
-		return;
-	}
-
-	// Restrict "overflow" and "display" styles during box animations
-	if ( isBox && elem.nodeType === 1 ) {
-
-		// Support: IE <=9 - 11, Edge 12 - 13
-		// Record all 3 overflow attributes because IE does not infer the shorthand
-		// from identically-valued overflowX and overflowY
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Identify a display type, preferring old show/hide data over the CSS cascade
-		restoreDisplay = dataShow && dataShow.display;
-		if ( restoreDisplay == null ) {
-			restoreDisplay = dataPriv.get( elem, "display" );
-		}
-		display = jQuery.css( elem, "display" );
-		if ( display === "none" ) {
-			if ( restoreDisplay ) {
-				display = restoreDisplay;
-			} else {
-
-				// Get nonempty value(s) by temporarily forcing visibility
-				showHide( [ elem ], true );
-				restoreDisplay = elem.style.display || restoreDisplay;
-				display = jQuery.css( elem, "display" );
-				showHide( [ elem ] );
-			}
-		}
-
-		// Animate inline elements as inline-block
-		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
-			if ( jQuery.css( elem, "float" ) === "none" ) {
-
-				// Restore the original display value at the end of pure show/hide animations
-				if ( !propTween ) {
-					anim.done( function() {
-						style.display = restoreDisplay;
-					} );
-					if ( restoreDisplay == null ) {
-						display = style.display;
-						restoreDisplay = display === "none" ? "" : display;
-					}
-				}
-				style.display = "inline-block";
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always( function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		} );
-	}
-
-	// Implement show/hide animations
-	propTween = false;
-	for ( prop in orig ) {
-
-		// General show/hide setup for this element animation
-		if ( !propTween ) {
-			if ( dataShow ) {
-				if ( "hidden" in dataShow ) {
-					hidden = dataShow.hidden;
-				}
-			} else {
-				dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } );
-			}
-
-			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
-			if ( toggle ) {
-				dataShow.hidden = !hidden;
-			}
-
-			// Show elements before animating them
-			if ( hidden ) {
-				showHide( [ elem ], true );
-			}
-
-			/* eslint-disable no-loop-func */
-
-			anim.done( function() {
-
-			/* eslint-enable no-loop-func */
-
-				// The final step of a "hide" animation is actually hiding the element
-				if ( !hidden ) {
-					showHide( [ elem ] );
-				}
-				dataPriv.remove( elem, "fxshow" );
-				for ( prop in orig ) {
-					jQuery.style( elem, prop, orig[ prop ] );
-				}
-			} );
-		}
-
-		// Per-property setup
-		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-		if ( !( prop in dataShow ) ) {
-			dataShow[ prop ] = propTween.start;
-			if ( hidden ) {
-				propTween.end = propTween.start;
-				propTween.start = 0;
-			}
-		}
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = Animation.prefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		} ),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-
-				// Support: Android 2.3 only
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ] );
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise( {
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, {
-				specialEasing: {},
-				easing: jQuery.easing._default
-			}, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.notifyWith( elem, [ animation, 1, 0 ] );
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		} ),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length; index++ ) {
-		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			if ( jQuery.isFunction( result.stop ) ) {
-				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
-					jQuery.proxy( result.stop, result );
-			}
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		} )
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweeners: {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value );
-			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
-			return tween;
-		} ]
-	},
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.match( rnotwhite );
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length; index++ ) {
-			prop = props[ index ];
-			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
-			Animation.tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilters: [ defaultPrefilter ],
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			Animation.prefilters.unshift( callback );
-		} else {
-			Animation.prefilters.push( callback );
-		}
-	}
-} );
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	// Go to the end state if fx are off or if document is hidden
-	if ( jQuery.fx.off || document.hidden ) {
-		opt.duration = 0;
-
-	} else {
-		opt.duration = typeof opt.duration === "number" ?
-			opt.duration : opt.duration in jQuery.fx.speeds ?
-				jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-	}
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend( {
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate( { opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || dataPriv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each( function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = dataPriv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this &&
-					( type == null || timers[ index ].queue === type ) ) {
-
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		} );
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each( function() {
-			var index,
-				data = dataPriv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		} );
-	}
-} );
-
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-} );
-
-// Generate shortcuts for custom animations
-jQuery.each( {
-	slideDown: genFx( "show" ),
-	slideUp: genFx( "hide" ),
-	slideToggle: genFx( "toggle" ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-} );
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = window.requestAnimationFrame ?
-			window.requestAnimationFrame( raf ) :
-			window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	if ( window.cancelAnimationFrame ) {
-		window.cancelAnimationFrame( timerId );
-	} else {
-		window.clearInterval( timerId );
-	}
-
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = window.setTimeout( next, time );
-		hooks.stop = function() {
-			window.clearTimeout( timeout );
-		};
-	} );
-};
-
-
-( function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: Android <=4.3 only
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE <=11 only
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: IE <=11 only
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-} )();
-
-
-var boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend( {
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each( function() {
-			jQuery.removeAttr( this, name );
-		} );
-	}
-} );
-
-jQuery.extend( {
-	attr: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set attributes on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// Attribute hooks are determined by the lowercase version
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			hooks = jQuery.attrHooks[ name.toLowerCase() ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
-		}
-
-		if ( value !== undefined ) {
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-			}
-
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			elem.setAttribute( name, value + "" );
-			return value;
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		ret = jQuery.find.attr( elem, name );
-
-		// Non-existent attributes return null, we normalize to undefined
-		return ret == null ? undefined : ret;
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( ( name = attrNames[ i++ ] ) ) {
-				elem.removeAttribute( name );
-			}
-		}
-	}
-} );
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle,
-			lowercaseName = name.toLowerCase();
-
-		if ( !isXML ) {
-
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ lowercaseName ];
-			attrHandle[ lowercaseName ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				lowercaseName :
-				null;
-			attrHandle[ lowercaseName ] = handle;
-		}
-		return ret;
-	};
-} );
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend( {
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each( function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		} );
-	}
-} );
-
-jQuery.extend( {
-	prop: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			return ( elem[ name ] = value );
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		return elem[ name ];
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-
-				// Support: IE <=9 - 11 only
-				// elem.tabIndex doesn't always return the
-				// correct value when it hasn't been explicitly set
-				// https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) ||
-						rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							-1;
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	}
-} );
-
-// Support: IE <=11 only
-// Accessing the selectedIndex property
-// forces the browser to respect setting selected
-// on the option
-// The getter ensures a default option is selected
-// when in an optgroup
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		},
-		set: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent ) {
-				parent.selectedIndex;
-
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-	};
-}
-
-jQuery.each( [
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-} );
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-function getClass( elem ) {
-	return elem.getAttribute && elem.getAttribute( "class" ) || "";
-}
-
-jQuery.fn.extend( {
-	addClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( !arguments.length ) {
-			return this.attr( "class", "" );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).toggleClass(
-					value.call( this, i, getClass( this ), stateVal ),
-					stateVal
-				);
-			} );
-		}
-
-		return this.each( function() {
-			var className, i, self, classNames;
-
-			if ( type === "string" ) {
-
-				// Toggle individual class names
-				i = 0;
-				self = jQuery( this );
-				classNames = value.match( rnotwhite ) || [];
-
-				while ( ( className = classNames[ i++ ] ) ) {
-
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( value === undefined || type === "boolean" ) {
-				className = getClass( this );
-				if ( className ) {
-
-					// Store className if set
-					dataPriv.set( this, "__className__", className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				if ( this.setAttribute ) {
-					this.setAttribute( "class",
-						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
-					);
-				}
-			}
-		} );
-	},
-
-	hasClass: function( selector ) {
-		var className, elem,
-			i = 0;
-
-		className = " " + selector + " ";
-		while ( ( elem = this[ i++ ] ) ) {
-			if ( elem.nodeType === 1 &&
-				( " " + getClass( elem ) + " " ).replace( rclass, " " )
-					.indexOf( className ) > -1
-			) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-} );
-
-
-
-
-var rreturn = /\r/g,
-	rspaces = /[\x20\t\r\n\f]+/g;
-
-jQuery.fn.extend( {
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[ 0 ];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] ||
-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks &&
-					"get" in hooks &&
-					( ret = hooks.get( elem, "value" ) ) !== undefined
-				) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-
-					// Handle most common string cases
-					ret.replace( rreturn, "" ) :
-
-					// Handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each( function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-
-			} else if ( typeof val === "number" ) {
-				val += "";
-
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				} );
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		} );
-	}
-} );
-
-jQuery.extend( {
-	valHooks: {
-		option: {
-			get: function( elem ) {
-
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-
-					// Support: IE <=10 - 11 only
-					// option.text throws exceptions (#14686, #14858)
-					// Strip and collapse whitespace
-					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
-					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one",
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// Support: IE <=9 only
-					// IE8-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-
-							// Don't return options that are disabled or in a disabled optgroup
-							!option.disabled &&
-							( !option.parentNode.disabled ||
-								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-
-					/* eslint-disable no-cond-assign */
-
-					if ( option.selected =
-						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
-					) {
-						optionSet = true;
-					}
-
-					/* eslint-enable no-cond-assign */
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-} );
-
-// Radios and checkboxes getter/setter
-jQuery.each( [ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
-		};
-	}
-} );
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/;
-
-jQuery.extend( jQuery.event, {
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "." ) > -1 ) {
-
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split( "." );
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf( ":" ) < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join( "." );
-		event.rnamespace = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === ( elem.ownerDocument || document ) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
-				dataPriv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( ( !special._default ||
-				special._default.apply( eventPath.pop(), data ) === false ) &&
-				acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	// Piggyback on a donor event to simulate a different one
-	// Used only for `focus(in | out)` events
-	simulate: function( type, elem, event ) {
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true
-			}
-		);
-
-		jQuery.event.trigger( e, null, elem );
-	}
-
-} );
-
-jQuery.fn.extend( {
-
-	trigger: function( type, data ) {
-		return this.each( function() {
-			jQuery.event.trigger( type, data, this );
-		} );
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[ 0 ];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-} );
-
-
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-} );
-
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
-
-
-
-support.focusin = "onfocusin" in window;
-
-
-// Support: Firefox <=44
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = dataPriv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = dataPriv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					dataPriv.remove( doc, fix );
-
-				} else {
-					dataPriv.access( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-var location = window.location;
-
-var nonce = jQuery.now();
-
-var rquery = ( /\?/ );
-
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE throws on parseFromString with invalid input.
-	try {
-		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams(
-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
-					v,
-					traditional,
-					add
-				);
-			}
-		} );
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, valueOrFunction ) {
-
-			// If value is a function, invoke it and use its return value
-			var value = jQuery.isFunction( valueOrFunction ) ?
-				valueOrFunction() :
-				valueOrFunction;
-
-			s[ s.length ] = encodeURIComponent( key ) + "=" +
-				encodeURIComponent( value == null ? "" : value );
-		};
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		} );
-
-	} else {
-
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" );
-};
-
-jQuery.fn.extend( {
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map( function() {
-
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					} ) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		} ).get();
-	}
-} );
-
-
-var
-	r20 = /%20/g,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Anchor tag for parsing the document origin
-	originAnchor = document.createElement( "a" );
-	originAnchor.href = location.href;
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-
-			// For each dataType in the dataTypeExpression
-			while ( ( dataType = dataTypes[ i++ ] ) ) {
-
-				// Prepend if requested
-				if ( dataType[ 0 ] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
-
-				// Otherwise append
-				} else {
-					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" &&
-				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		} );
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s.throws ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return {
-								state: "parsererror",
-								error: conv ? e : "No conversion from " + prev + " to " + current
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend( {
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: location.href,
-		type: "GET",
-		isLocal: rlocalProtocol.test( location.protocol ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /\bxml\b/,
-			html: /\bhtml/,
-			json: /\bjson\b/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": JSON.parse,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-
-			// URL without anti-cache param
-			cacheURL,
-
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-
-			// timeout handle
-			timeoutTimer,
-
-			// Url cleanup var
-			urlAnchor,
-
-			// Request state (becomes false upon send and true upon completion)
-			completed,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			// Loop variable
-			i,
-
-			// uncached part of the url
-			uncached,
-
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-
-			// Callbacks context
-			callbackContext = s.context || s,
-
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context &&
-				( callbackContext.nodeType || callbackContext.jquery ) ?
-					jQuery( callbackContext ) :
-					jQuery.event,
-
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-
-			// Default abort message
-			strAbort = "canceled",
-
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( completed ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return completed ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( completed == null ) {
-						name = requestHeadersNames[ name.toLowerCase() ] =
-							requestHeadersNames[ name.toLowerCase() ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( completed == null ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( completed ) {
-
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						} else {
-
-							// Lazy-add the new callbacks in a way that preserves old ones
-							for ( code in map ) {
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || location.href ) + "" )
-			.replace( rprotocol, location.protocol + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when the origin doesn't match the current origin.
-		if ( s.crossDomain == null ) {
-			urlAnchor = document.createElement( "a" );
-
-			// Support: IE <=8 - 11, Edge 12 - 13
-			// IE throws exception on accessing the href property if url is malformed,
-			// e.g. http://example.com:80x/
-			try {
-				urlAnchor.href = s.url;
-
-				// Support: IE <=8 - 11 only
-				// Anchor's host property isn't correctly set when s.url is relative
-				urlAnchor.href = urlAnchor.href;
-				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
-					urlAnchor.protocol + "//" + urlAnchor.host;
-			} catch ( e ) {
-
-				// If there is an error parsing the URL, assume it is crossDomain,
-				// it can be rejected by the transport if it is invalid
-				s.crossDomain = true;
-			}
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( completed ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		// Remove hash to simplify url manipulation
-		cacheURL = s.url.replace( rhash, "" );
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// Remember the hash so we can put it back
-			uncached = s.url.slice( cacheURL.length );
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data;
-
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in uncached url if needed
-			if ( s.cache === false ) {
-				cacheURL = cacheURL.replace( rts, "" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
-			}
-
-			// Put hash and anti-cache on the URL that will be requested (gh-1732)
-			s.url = cacheURL + uncached;
-
-		// Change '%20' to '+' if this is encoded form body content (gh-2658)
-		} else if ( s.data && s.processData &&
-			( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) {
-			s.data = s.data.replace( r20, "+" );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
-				s.accepts[ s.dataTypes[ 0 ] ] +
-					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend &&
-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) {
-
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		completeDeferred.add( s.complete );
-		jqXHR.done( s.success );
-		jqXHR.fail( s.error );
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-
-			// If request was aborted inside ajaxSend, stop there
-			if ( completed ) {
-				return jqXHR;
-			}
-
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = window.setTimeout( function() {
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				completed = false;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-
-				// Rethrow post-completion exceptions
-				if ( completed ) {
-					throw e;
-				}
-
-				// Propagate others as results
-				done( -1, e );
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Ignore repeat invocations
-			if ( completed ) {
-				return;
-			}
-
-			completed = true;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				window.clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader( "Last-Modified" );
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader( "etag" );
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-} );
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-
-		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		// The url can be an options object (which then must have .url)
-		return jQuery.ajax( jQuery.extend( {
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		}, jQuery.isPlainObject( url ) && url ) );
-	};
-} );
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax( {
-		url: url,
-
-		// Make this explicit, since user can override this through ajaxSetup (#11264)
-		type: "GET",
-		dataType: "script",
-		cache: true,
-		async: false,
-		global: false,
-		"throws": true
-	} );
-};
-
-
-jQuery.fn.extend( {
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( this[ 0 ] ) {
-			if ( jQuery.isFunction( html ) ) {
-				html = html.call( this[ 0 ] );
-			}
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map( function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			} ).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapInner( html.call( this, i ) );
-			} );
-		}
-
-		return this.each( function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		} );
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each( function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
-		} );
-	},
-
-	unwrap: function( selector ) {
-		this.parent( selector ).not( "body" ).each( function() {
-			jQuery( this ).replaceWith( this.childNodes );
-		} );
-		return this;
-	}
-} );
-
-
-jQuery.expr.pseudos.hidden = function( elem ) {
-	return !jQuery.expr.pseudos.visible( elem );
-};
-jQuery.expr.pseudos.visible = function( elem ) {
-	return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length );
-};
-
-
-
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch ( e ) {}
-};
-
-var xhrSuccessStatus = {
-
-		// File protocol always yields status code 0, assume 200
-		0: 200,
-
-		// Support: IE <=9 only
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport( function( options ) {
-	var callback, errorCallback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr();
-
-				xhr.open(
-					options.type,
-					options.url,
-					options.async,
-					options.username,
-					options.password
-				);
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
-					headers[ "X-Requested-With" ] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							callback = errorCallback = xhr.onload =
-								xhr.onerror = xhr.onabort = xhr.onreadystatechange = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-
-								// Support: IE <=9 only
-								// On a manual native abort, IE9 throws
-								// errors on any property access that is not readyState
-								if ( typeof xhr.status !== "number" ) {
-									complete( 0, "error" );
-								} else {
-									complete(
-
-										// File: protocol always yields status 0; see #8605, #14207
-										xhr.status,
-										xhr.statusText
-									);
-								}
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-
-									// Support: IE <=9 only
-									// IE9 has no XHR2 but throws on binary (trac-11426)
-									// For XHR2 non-text, let the caller handle it (gh-2498)
-									( xhr.responseType || "text" ) !== "text"  ||
-									typeof xhr.responseText !== "string" ?
-										{ binary: xhr.response } :
-										{ text: xhr.responseText },
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				errorCallback = xhr.onerror = callback( "error" );
-
-				// Support: IE 9 only
-				// Use onreadystatechange to replace onabort
-				// to handle uncaught aborts
-				if ( xhr.onabort !== undefined ) {
-					xhr.onabort = errorCallback;
-				} else {
-					xhr.onreadystatechange = function() {
-
-						// Check readyState before timeout as it changes
-						if ( xhr.readyState === 4 ) {
-
-							// Allow onerror to be called first,
-							// but that will not handle a native abort
-							// Also, save errorCallback to a variable
-							// as xhr.onerror cannot be accessed
-							window.setTimeout( function() {
-								if ( callback ) {
-									errorCallback();
-								}
-							} );
-						}
-					};
-				}
-
-				// Create the abort callback
-				callback = callback( "abort" );
-
-				try {
-
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
-jQuery.ajaxPrefilter( function( s ) {
-	if ( s.crossDomain ) {
-		s.contents.script = false;
-	}
-} );
-
-// Install script dataType
-jQuery.ajaxSetup( {
-	accepts: {
-		script: "text/javascript, application/javascript, " +
-			"application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /\b(?:java|ecma)script\b/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-} );
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-} );
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery( "<script>" ).prop( {
-					charset: s.scriptCharset,
-					src: s.url
-				} ).on(
-					"load error",
-					callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					}
-				);
-
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup( {
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-} );
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" &&
-				( s.contentType || "" )
-					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
-				rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters[ "script json" ] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// Force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always( function() {
-
-			// If previous value didn't exist - remove it
-			if ( overwritten === undefined ) {
-				jQuery( window ).removeProp( callbackName );
-
-			// Otherwise restore preexisting value
-			} else {
-				window[ callbackName ] = overwritten;
-			}
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-
-				// Make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// Save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		} );
-
-		// Delegate to script
-		return "script";
-	}
-} );
-
-
-
-
-// Support: Safari 8 only
-// In Safari 8 documents created via document.implementation.createHTMLDocument
-// collapse sibling forms: the second one becomes a child of the first one.
-// Because of that, this security measure has to be disabled in Safari 8.
-// https://bugs.webkit.org/show_bug.cgi?id=137337
-support.createHTMLDocument = ( function() {
-	var body = document.implementation.createHTMLDocument( "" ).body;
-	body.innerHTML = "<form></form><form></form>";
-	return body.childNodes.length === 2;
-} )();
-
-
-// Argument "data" should be string of html
-// context (optional): If specified, the fragment will be created in this context,
-// defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( typeof data !== "string" ) {
-		return [];
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-
-	var base, parsed, scripts;
-
-	if ( !context ) {
-
-		// Stop scripts or inline event handlers from being executed immediately
-		// by using document.implementation
-		if ( support.createHTMLDocument ) {
-			context = document.implementation.createHTMLDocument( "" );
-
-			// Set the base href for the created document
-			// so any parsed elements with URLs
-			// are based on the document's URL (gh-2965)
-			base = context.createElement( "base" );
-			base.href = document.location.href;
-			context.head.appendChild( base );
-		} else {
-			context = document;
-		}
-	}
-
-	parsed = rsingleTag.exec( data );
-	scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[ 1 ] ) ];
-	}
-
-	parsed = buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	var selector, type, response,
-		self = this,
-		off = url.indexOf( " " );
-
-	if ( off > -1 ) {
-		selector = jQuery.trim( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax( {
-			url: url,
-
-			// If "type" variable is undefined, then "GET" method will be used.
-			// Make value of this field explicit since
-			// user can override it through ajaxSetup method
-			type: type || "GET",
-			dataType: "html",
-			data: params
-		} ).done( function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		// If the request succeeds, this function gets "data", "status", "jqXHR"
-		// but they are ignored because response was set above.
-		// If it fails, this function gets "jqXHR", "status", "error"
-		} ).always( callback && function( jqXHR, status ) {
-			self.each( function() {
-				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
-			} );
-		} );
-	}
-
-	return this;
-};
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
-jQuery.expr.pseudos.animated = function( elem ) {
-	return jQuery.grep( jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	} ).length;
-};
-
-
-
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-
-			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
-			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend( {
-	offset: function( options ) {
-
-		// Preserve chaining for setter
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each( function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				} );
-		}
-
-		var docElem, win, rect, doc,
-			elem = this[ 0 ];
-
-		if ( !elem ) {
-			return;
-		}
-
-		// Support: IE <=11 only
-		// Running getBoundingClientRect on a
-		// disconnected node in IE throws an error
-		if ( !elem.getClientRects().length ) {
-			return { top: 0, left: 0 };
-		}
-
-		rect = elem.getBoundingClientRect();
-
-		// Make sure element is not hidden (display: none)
-		if ( rect.width || rect.height ) {
-			doc = elem.ownerDocument;
-			win = getWindow( doc );
-			docElem = doc.documentElement;
-
-			return {
-				top: rect.top + win.pageYOffset - docElem.clientTop,
-				left: rect.left + win.pageXOffset - docElem.clientLeft
-			};
-		}
-
-		// Return zeros for disconnected and hidden elements (gh-2310)
-		return rect;
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
-		// because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-
-			// Assume getBoundingClientRect is there when computed position is fixed
-			offset = elem.getBoundingClientRect();
-
-		} else {
-
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset = {
-				top: parentOffset.top + jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ),
-				left: parentOffset.left + jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true )
-			};
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	// This method will return documentElement in the following cases:
-	// 1) For the element inside the iframe without offsetParent, this method will return
-	//    documentElement of the parent window
-	// 2) For the hidden or detached element
-	// 3) For body or html element, i.e. in case of the html node - it will return itself
-	//
-	// but those exceptions were never presented as a real life use-cases
-	// and might be considered as more preferable results.
-	//
-	// This logic, however, is not guaranteed and can change at any point in the future
-	offsetParent: function() {
-		return this.map( function() {
-			var offsetParent = this.offsetParent;
-
-			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || documentElement;
-		} );
-	}
-} );
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : win.pageXOffset,
-					top ? val : win.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length );
-	};
-} );
-
-// Support: Safari <=7 - 9.1, Chrome <=37 - 49
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-} );
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-		function( defaultExtra, funcName ) {
-
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-
-					// $( window ).outerWidth/Height return w/h including scrollbars (gh-1729)
-					return funcName.indexOf( "outer" ) === 0 ?
-						elem[ "inner" + name ] :
-						elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable );
-		};
-	} );
-} );
-
-
-jQuery.fn.extend( {
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ?
-			this.off( selector, "**" ) :
-			this.off( types, selector || "**", fn );
-	}
-} );
-
-jQuery.parseJSON = JSON.parse;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	} );
-}
-
-
-
-
-
-var
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-
-return jQuery;
-} );
diff --git a/docs/_static/jquery.js b/docs/_static/jquery.js
deleted file mode 100644
index f6a6a99e6..000000000
--- a/docs/_static/jquery.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v3.1.0 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.0",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null!=a?a<0?this[a+this.length]:this[a]:f.call(this)},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"label"in b&&b.disabled===a||"form"in b&&b.disabled===a||"form"in b&&b.disabled===!1&&(b.isDisabled===a||b.isDisabled!==!a&&("label"in b||!ea(b))!==a)}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e)}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(_,aa),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=V.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(_,aa),$.test(j[0].type)&&qa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&sa(j),!a)return G.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||$.test(a)&&qa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){if(r.isFunction(b))return r.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return r.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(C.test(b))return r.filter(b,a,c);b=r.filter(b,a)}return r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType})}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/\S+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,
-r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c||"false"!==c&&("null"===c?null:+c+""===c?+c:X.test(c)?JSON.parse(c):c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),Z(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=Z(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var $=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,_=new RegExp("^(?:([+-])=|)("+$+")([a-z%]*)$","i"),aa=["Top","Right","Bottom","Left"],ba=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ca=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function da(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&_.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ea={};function fa(a){var b,c=a.ownerDocument,d=a.nodeName,e=ea[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ea[d]=e,e)}function ga(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ba(d)&&(e[f]=fa(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ga(this,!0)},hide:function(){return ga(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ba(this)?r(this).show():r(this).hide()})}});var ha=/^(?:checkbox|radio)$/i,ia=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ja=/^$|\/(?:java|ecma)script/i,ka={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ka.optgroup=ka.option,ka.tbody=ka.tfoot=ka.colgroup=ka.caption=ka.thead,ka.th=ka.td;function la(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function ma(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var na=/<|&#?\w+;/;function oa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(na.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ia.exec(f)||["",""])[1].toLowerCase(),i=ka[h]||ka._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=la(l.appendChild(f),"script"),j&&ma(g),c){k=0;while(f=g[k++])ja.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var pa=d.documentElement,qa=/^key/,ra=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,sa=/^([^.]*)(?:\.(.+)|)/;function ta(){return!0}function ua(){return!1}function va(){try{return d.activeElement}catch(a){}}function wa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)wa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ua;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(pa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;c<h;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?r(e,this).index(i)>-1:r.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==va()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===va()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ta:ua,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:ua,isPropagationStopped:ua,isImmediatePropagationStopped:ua,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ta,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ta,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ta,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&qa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ra.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return wa(this,a,b,c,d)},one:function(a,b,c,d){return wa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ua),this.each(function(){r.event.remove(this,a,c,b)})}});var xa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,ya=/<script|<style|<link/i,za=/checked\s*(?:[^=]|=\s*.checked.)/i,Aa=/^true\/(.*)/,Ba=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ca(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Da(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ea(a){var b=Aa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ga(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ha.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ha(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&za.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(m&&(e=oa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(la(e,"script"),Da),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,la(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ea),l=0;l<i;l++)j=h[l],ja.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ba,""),k))}return a}function Ia(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(la(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&ma(la(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(xa,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=la(h),f=la(a),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);if(b)if(c)for(f=f||la(a),g=g||la(h),d=0,e=f.length;d<e;d++)Fa(f[d],g[d]);else Fa(a,h);return g=la(h,"script"),g.length>0&&ma(g,!i&&la(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(la(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!ya.test(a)&&!ka[(ia.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(la(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(la(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ja=/^margin/,Ka=new RegExp("^("+$+")(?!px)[a-z%]+$","i"),La=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",pa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,pa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Ma(a,b,c){var d,e,f,g,h=a.style;return c=c||La(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ka.test(g)&&Ja.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Na(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Oa=/^(none|table(?!-c[ea]).+)/,Pa={position:"absolute",visibility:"hidden",display:"block"},Qa={letterSpacing:"0",fontWeight:"400"},Ra=["Webkit","Moz","ms"],Sa=d.createElement("div").style;function Ta(a){if(a in Sa)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ra.length;while(c--)if(a=Ra[c]+b,a in Sa)return a}function Ua(a,b,c){var d=_.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Va(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+aa[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+aa[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+aa[f]+"Width",!0,e))):(g+=r.css(a,"padding"+aa[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+aa[f]+"Width",!0,e)));return g}function Wa(a,b,c){var d,e=!0,f=La(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Ma(a,b,f),(d<0||null==d)&&(d=a.style[b]),Ka.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Va(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ma(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=_.exec(c))&&e[1]&&(c=da(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Ma(a,b,d)),"normal"===e&&b in Qa&&(e=Qa[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Oa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Wa(a,b,d):ca(a,Pa,function(){return Wa(a,b,d)})},set:function(a,c,d){var e,f=d&&La(a),g=d&&Va(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=_.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ua(a,c,g)}}}),r.cssHooks.marginLeft=Na(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Ma(a,"marginLeft"))||a.getBoundingClientRect().left-ca(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+aa[d]+b]=f[d]||f[d-2]||f[0];return e}},Ja.test(a)||(r.cssHooks[a+b].set=Ua)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=La(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Xa(a,b,c,d,e){return new Xa.prototype.init(a,b,c,d,e)}r.Tween=Xa,Xa.prototype={constructor:Xa,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Xa.propHooks[this.prop];return a&&a.get?a.get(this):Xa.propHooks._default.get(this)},run:function(a){var b,c=Xa.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Xa.propHooks._default.set(this),this}},Xa.prototype.init.prototype=Xa.prototype,Xa.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Xa.propHooks.scrollTop=Xa.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Xa.prototype.init,r.fx.step={};var Ya,Za,$a=/^(?:toggle|show|hide)$/,_a=/queueHooks$/;function ab(){Za&&(a.requestAnimationFrame(ab),r.fx.tick())}function bb(){return a.setTimeout(function(){Ya=void 0}),Ya=r.now()}function cb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=aa[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function db(a,b,c){for(var d,e=(gb.tweeners[b]||[]).concat(gb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function eb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ba(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],$a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ga([a],!0),j=a.style.display||j,k=r.css(a,"display"),ga([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ga([a],!0),m.done(function(){p||ga([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=db(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function fb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function gb(a,b,c){var d,e,f=0,g=gb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Ya||bb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Ya||bb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(fb(k,j.opts.specialEasing);f<g;f++)if(d=gb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,db,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}r.Animation=r.extend(gb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return da(c.elem,a,_.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],gb.tweeners[c]=gb.tweeners[c]||[],gb.tweeners[c].unshift(b)},prefilters:[eb],prefilter:function(a,b){b?gb.prefilters.unshift(a):gb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:e.duration="number"==typeof e.duration?e.duration:e.duration in r.fx.speeds?r.fx.speeds[e.duration]:r.fx.speeds._default,null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ba).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=gb(this,r.extend({},a),f);(e||V.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&_a.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(cb(b,!0),a,d,e)}}),r.each({slideDown:cb("show"),slideUp:cb("hide"),slideToggle:cb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Ya=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Ya=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){Za||(Za=a.requestAnimationFrame?a.requestAnimationFrame(ab):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame(Za):a.clearInterval(Za),Za=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var hb,ib=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?hb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);
-if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),hb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ib[b]||r.find.attr;ib[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=ib[g],ib[g]=e,e=null!=c(a,b,d)?g:null,ib[g]=f),e}});var jb=/^(?:input|select|textarea|button)$/i,kb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):jb.test(a.nodeName)||kb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});var lb=/[\t\r\n\f]/g;function mb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,mb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,mb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,mb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=mb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(c)+" ").replace(lb," ").indexOf(b)>-1)return!0;return!1}});var nb=/\r/g,ob=/[\x20\t\r\n\f]+/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(nb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:r.trim(r.text(a)).replace(ob," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type,g=f?null:[],h=f?e+1:d.length,i=e<0?h:f?e:0;i<h;i++)if(c=d[i],(c.selected||i===e)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ha.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,""),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=oa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=r.trim(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||pa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Na(o.pixelPosition,function(a,c){if(c)return c=Ma(a,b),Ka.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
diff --git a/docs/_static/js/modernizr.min.js b/docs/_static/js/modernizr.min.js
deleted file mode 100644
index f65d47974..000000000
--- a/docs/_static/js/modernizr.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=function(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
diff --git a/docs/_static/js/theme.js b/docs/_static/js/theme.js
deleted file mode 100644
index 48a9f06b5..000000000
--- a/docs/_static/js/theme.js
+++ /dev/null
@@ -1,153 +0,0 @@
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"sphinx-rtd-theme":[function(require,module,exports){
-var jQuery = (typeof(window) != 'undefined') ? window.jQuery : require('jquery');
-
-// Sphinx theme nav state
-function ThemeNav () {
-
-    var nav = {
-        navBar: null,
-        win: null,
-        winScroll: false,
-        winResize: false,
-        linkScroll: false,
-        winPosition: 0,
-        winHeight: null,
-        docHeight: null,
-        isRunning: null
-    };
-
-    nav.enable = function () {
-        var self = this;
-
-        jQuery(function ($) {
-            self.init($);
-
-            self.reset();
-            self.win.on('hashchange', self.reset);
-
-            // Set scroll monitor
-            self.win.on('scroll', function () {
-                if (!self.linkScroll) {
-                    self.winScroll = true;
-                }
-            });
-            setInterval(function () { if (self.winScroll) self.onScroll(); }, 25);
-
-            // Set resize monitor
-            self.win.on('resize', function () {
-                self.winResize = true;
-            });
-            setInterval(function () { if (self.winResize) self.onResize(); }, 25);
-            self.onResize();
-        });
-    };
-
-    nav.init = function ($) {
-        var doc = $(document),
-            self = this;
-
-        this.navBar = $('div.wy-side-scroll:first');
-        this.win = $(window);
-
-        // Set up javascript UX bits
-        $(document)
-            // Shift nav in mobile when clicking the menu.
-            .on('click', "[data-toggle='wy-nav-top']", function() {
-                $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-            })
-
-            // Nav menu link click operations
-            .on('click', ".wy-menu-vertical .current ul li a", function() {
-                var target = $(this);
-                // Close menu when you click a link.
-                $("[data-toggle='wy-nav-shift']").removeClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-                // Handle dynamic display of l3 and l4 nav lists
-                self.toggleCurrent(target);
-                self.hashChange();
-            })
-            .on('click', "[data-toggle='rst-current-version']", function() {
-                $("[data-toggle='rst-versions']").toggleClass("shift-up");
-            })
-
-        // Make tables responsive
-        $("table.docutils:not(.field-list)")
-            .wrap("<div class='wy-table-responsive'></div>");
-
-        // Add expand links to all parents of nested ul
-        $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
-            var link = $(this);
-                expand = $('<span class="toctree-expand"></span>');
-            expand.on('click', function (ev) {
-                self.toggleCurrent(link);
-                ev.stopPropagation();
-                return false;
-            });
-            link.prepend(expand);
-        });
-    };
-
-    nav.reset = function () {
-        // Get anchor from URL and open up nested nav
-        var anchor = encodeURI(window.location.hash);
-        if (anchor) {
-            try {
-                var link = $('.wy-menu-vertical')
-                    .find('[href="' + anchor + '"]');
-                $('.wy-menu-vertical li.toctree-l1 li.current')
-                    .removeClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
-            }
-            catch (err) {
-                console.log("Error expanding nav for anchor", err);
-            }
-        }
-    };
-
-    nav.onScroll = function () {
-        this.winScroll = false;
-        var newWinPosition = this.win.scrollTop(),
-            winBottom = newWinPosition + this.winHeight,
-            navPosition = this.navBar.scrollTop(),
-            newNavPosition = navPosition + (newWinPosition - this.winPosition);
-        if (newWinPosition < 0 || winBottom > this.docHeight) {
-            return;
-        }
-        this.navBar.scrollTop(newNavPosition);
-        this.winPosition = newWinPosition;
-    };
-
-    nav.onResize = function () {
-        this.winResize = false;
-        this.winHeight = this.win.height();
-        this.docHeight = $(document).height();
-    };
-
-    nav.hashChange = function () {
-        this.linkScroll = true;
-        this.win.one('hashchange', function () {
-            this.linkScroll = false;
-        });
-    };
-
-    nav.toggleCurrent = function (elem) {
-        var parent_li = elem.closest('li');
-        parent_li.siblings('li.current').removeClass('current');
-        parent_li.siblings().find('li.current').removeClass('current');
-        parent_li.find('> ul li.current').removeClass('current');
-        parent_li.toggleClass('current');
-    }
-
-    return nav;
-};
-
-module.exports.ThemeNav = ThemeNav();
-
-if (typeof(window) != 'undefined') {
-    window.SphinxRtdTheme = { StickyNav: module.exports.ThemeNav };
-}
-
-},{"jquery":"jquery"}]},{},["sphinx-rtd-theme"]);
diff --git a/docs/_static/logo.png b/docs/_static/logo.png
deleted file mode 100644
index 2d8946efe..000000000
Binary files a/docs/_static/logo.png and /dev/null differ
diff --git a/docs/_static/minus.png b/docs/_static/minus.png
deleted file mode 100644
index d96755fda..000000000
Binary files a/docs/_static/minus.png and /dev/null differ
diff --git a/docs/_static/plus.png b/docs/_static/plus.png
deleted file mode 100644
index 7107cec93..000000000
Binary files a/docs/_static/plus.png and /dev/null differ
diff --git a/docs/_static/pygments.css b/docs/_static/pygments.css
deleted file mode 100644
index 691aeb82d..000000000
--- a/docs/_static/pygments.css
+++ /dev/null
@@ -1,74 +0,0 @@
-pre { line-height: 125%; }
-td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
-td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
-span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
-.highlight .hll { background-color: #ffffcc }
-.highlight { background: #eeffcc; }
-.highlight .c { color: #408090; font-style: italic } /* Comment */
-.highlight .err { border: 1px solid #FF0000 } /* Error */
-.highlight .k { color: #007020; font-weight: bold } /* Keyword */
-.highlight .o { color: #666666 } /* Operator */
-.highlight .ch { color: #408090; font-style: italic } /* Comment.Hashbang */
-.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #007020 } /* Comment.Preproc */
-.highlight .cpf { color: #408090; font-style: italic } /* Comment.PreprocFile */
-.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
-.highlight .gd { color: #A00000 } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #FF0000 } /* Generic.Error */
-.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: #333333 } /* Generic.Output */
-.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0044DD } /* Generic.Traceback */
-.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #007020 } /* Keyword.Pseudo */
-.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #902000 } /* Keyword.Type */
-.highlight .m { color: #208050 } /* Literal.Number */
-.highlight .s { color: #4070a0 } /* Literal.String */
-.highlight .na { color: #4070a0 } /* Name.Attribute */
-.highlight .nb { color: #007020 } /* Name.Builtin */
-.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
-.highlight .no { color: #60add5 } /* Name.Constant */
-.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
-.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
-.highlight .ne { color: #007020 } /* Name.Exception */
-.highlight .nf { color: #06287e } /* Name.Function */
-.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
-.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #bb60d5 } /* Name.Variable */
-.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mb { color: #208050 } /* Literal.Number.Bin */
-.highlight .mf { color: #208050 } /* Literal.Number.Float */
-.highlight .mh { color: #208050 } /* Literal.Number.Hex */
-.highlight .mi { color: #208050 } /* Literal.Number.Integer */
-.highlight .mo { color: #208050 } /* Literal.Number.Oct */
-.highlight .sa { color: #4070a0 } /* Literal.String.Affix */
-.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
-.highlight .sc { color: #4070a0 } /* Literal.String.Char */
-.highlight .dl { color: #4070a0 } /* Literal.String.Delimiter */
-.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
-.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
-.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
-.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
-.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
-.highlight .sx { color: #c65d09 } /* Literal.String.Other */
-.highlight .sr { color: #235388 } /* Literal.String.Regex */
-.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
-.highlight .ss { color: #517918 } /* Literal.String.Symbol */
-.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
-.highlight .fm { color: #06287e } /* Name.Function.Magic */
-.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
-.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
-.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
-.highlight .vm { color: #bb60d5 } /* Name.Variable.Magic */
-.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/docs/_static/searchtools.js b/docs/_static/searchtools.js
deleted file mode 100644
index c82157380..000000000
--- a/docs/_static/searchtools.js
+++ /dev/null
@@ -1,758 +0,0 @@
-/*
- * searchtools.js_t
- * ~~~~~~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for the full-text search.
- *
- * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-
-/* Non-minified version JS is _stemmer.js if file is provided */ 
-/**
- * Porter Stemmer
- */
-var Stemmer = function() {
-
-  var step2list = {
-    ational: 'ate',
-    tional: 'tion',
-    enci: 'ence',
-    anci: 'ance',
-    izer: 'ize',
-    bli: 'ble',
-    alli: 'al',
-    entli: 'ent',
-    eli: 'e',
-    ousli: 'ous',
-    ization: 'ize',
-    ation: 'ate',
-    ator: 'ate',
-    alism: 'al',
-    iveness: 'ive',
-    fulness: 'ful',
-    ousness: 'ous',
-    aliti: 'al',
-    iviti: 'ive',
-    biliti: 'ble',
-    logi: 'log'
-  };
-
-  var step3list = {
-    icate: 'ic',
-    ative: '',
-    alize: 'al',
-    iciti: 'ic',
-    ical: 'ic',
-    ful: '',
-    ness: ''
-  };
-
-  var c = "[^aeiou]";          // consonant
-  var v = "[aeiouy]";          // vowel
-  var C = c + "[^aeiouy]*";    // consonant sequence
-  var V = v + "[aeiou]*";      // vowel sequence
-
-  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
-  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
-  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
-  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
-
-  this.stemWord = function (w) {
-    var stem;
-    var suffix;
-    var firstch;
-    var origword = w;
-
-    if (w.length < 3)
-      return w;
-
-    var re;
-    var re2;
-    var re3;
-    var re4;
-
-    firstch = w.substr(0,1);
-    if (firstch == "y")
-      w = firstch.toUpperCase() + w.substr(1);
-
-    // Step 1a
-    re = /^(.+?)(ss|i)es$/;
-    re2 = /^(.+?)([^s])s$/;
-
-    if (re.test(w))
-      w = w.replace(re,"$1$2");
-    else if (re2.test(w))
-      w = w.replace(re2,"$1$2");
-
-    // Step 1b
-    re = /^(.+?)eed$/;
-    re2 = /^(.+?)(ed|ing)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      re = new RegExp(mgr0);
-      if (re.test(fp[1])) {
-        re = /.$/;
-        w = w.replace(re,"");
-      }
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1];
-      re2 = new RegExp(s_v);
-      if (re2.test(stem)) {
-        w = stem;
-        re2 = /(at|bl|iz)$/;
-        re3 = new RegExp("([^aeiouylsz])\\1$");
-        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-        if (re2.test(w))
-          w = w + "e";
-        else if (re3.test(w)) {
-          re = /.$/;
-          w = w.replace(re,"");
-        }
-        else if (re4.test(w))
-          w = w + "e";
-      }
-    }
-
-    // Step 1c
-    re = /^(.+?)y$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(s_v);
-      if (re.test(stem))
-        w = stem + "i";
-    }
-
-    // Step 2
-    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step2list[suffix];
-    }
-
-    // Step 3
-    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      suffix = fp[2];
-      re = new RegExp(mgr0);
-      if (re.test(stem))
-        w = stem + step3list[suffix];
-    }
-
-    // Step 4
-    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
-    re2 = /^(.+?)(s|t)(ion)$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      if (re.test(stem))
-        w = stem;
-    }
-    else if (re2.test(w)) {
-      var fp = re2.exec(w);
-      stem = fp[1] + fp[2];
-      re2 = new RegExp(mgr1);
-      if (re2.test(stem))
-        w = stem;
-    }
-
-    // Step 5
-    re = /^(.+?)e$/;
-    if (re.test(w)) {
-      var fp = re.exec(w);
-      stem = fp[1];
-      re = new RegExp(mgr1);
-      re2 = new RegExp(meq1);
-      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
-      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
-        w = stem;
-    }
-    re = /ll$/;
-    re2 = new RegExp(mgr1);
-    if (re.test(w) && re2.test(w)) {
-      re = /.$/;
-      w = w.replace(re,"");
-    }
-
-    // and turn initial Y back to y
-    if (firstch == "y")
-      w = firstch.toLowerCase() + w.substr(1);
-    return w;
-  }
-}
-
-
-
-/**
- * Simple result scoring code.
- */
-var Scorer = {
-  // Implement the following function to further tweak the score for each result
-  // The function takes a result array [filename, title, anchor, descr, score]
-  // and returns the new score.
-  /*
-  score: function(result) {
-    return result[4];
-  },
-  */
-
-  // query matches the full name of an object
-  objNameMatch: 11,
-  // or matches in the last dotted part of the object name
-  objPartialMatch: 6,
-  // Additive scores depending on the priority of the object
-  objPrio: {0:  15,   // used to be importantResults
-            1:  5,   // used to be objectResults
-            2: -5},  // used to be unimportantResults
-  //  Used when the priority is not in the mapping.
-  objPrioDefault: 0,
-
-  // query found in title
-  title: 15,
-  // query found in terms
-  term: 5
-};
-
-
-
-
-
-var splitChars = (function() {
-    var result = {};
-    var singles = [96, 180, 187, 191, 215, 247, 749, 885, 903, 907, 909, 930, 1014, 1648,
-         1748, 1809, 2416, 2473, 2481, 2526, 2601, 2609, 2612, 2615, 2653, 2702,
-         2706, 2729, 2737, 2740, 2857, 2865, 2868, 2910, 2928, 2948, 2961, 2971,
-         2973, 3085, 3089, 3113, 3124, 3213, 3217, 3241, 3252, 3295, 3341, 3345,
-         3369, 3506, 3516, 3633, 3715, 3721, 3736, 3744, 3748, 3750, 3756, 3761,
-         3781, 3912, 4239, 4347, 4681, 4695, 4697, 4745, 4785, 4799, 4801, 4823,
-         4881, 5760, 5901, 5997, 6313, 7405, 8024, 8026, 8028, 8030, 8117, 8125,
-         8133, 8181, 8468, 8485, 8487, 8489, 8494, 8527, 11311, 11359, 11687, 11695,
-         11703, 11711, 11719, 11727, 11735, 12448, 12539, 43010, 43014, 43019, 43587,
-         43696, 43713, 64286, 64297, 64311, 64317, 64319, 64322, 64325, 65141];
-    var i, j, start, end;
-    for (i = 0; i < singles.length; i++) {
-        result[singles[i]] = true;
-    }
-    var ranges = [[0, 47], [58, 64], [91, 94], [123, 169], [171, 177], [182, 184], [706, 709],
-         [722, 735], [741, 747], [751, 879], [888, 889], [894, 901], [1154, 1161],
-         [1318, 1328], [1367, 1368], [1370, 1376], [1416, 1487], [1515, 1519], [1523, 1568],
-         [1611, 1631], [1642, 1645], [1750, 1764], [1767, 1773], [1789, 1790], [1792, 1807],
-         [1840, 1868], [1958, 1968], [1970, 1983], [2027, 2035], [2038, 2041], [2043, 2047],
-         [2070, 2073], [2075, 2083], [2085, 2087], [2089, 2307], [2362, 2364], [2366, 2383],
-         [2385, 2391], [2402, 2405], [2419, 2424], [2432, 2436], [2445, 2446], [2449, 2450],
-         [2483, 2485], [2490, 2492], [2494, 2509], [2511, 2523], [2530, 2533], [2546, 2547],
-         [2554, 2564], [2571, 2574], [2577, 2578], [2618, 2648], [2655, 2661], [2672, 2673],
-         [2677, 2692], [2746, 2748], [2750, 2767], [2769, 2783], [2786, 2789], [2800, 2820],
-         [2829, 2830], [2833, 2834], [2874, 2876], [2878, 2907], [2914, 2917], [2930, 2946],
-         [2955, 2957], [2966, 2968], [2976, 2978], [2981, 2983], [2987, 2989], [3002, 3023],
-         [3025, 3045], [3059, 3076], [3130, 3132], [3134, 3159], [3162, 3167], [3170, 3173],
-         [3184, 3191], [3199, 3204], [3258, 3260], [3262, 3293], [3298, 3301], [3312, 3332],
-         [3386, 3388], [3390, 3423], [3426, 3429], [3446, 3449], [3456, 3460], [3479, 3481],
-         [3518, 3519], [3527, 3584], [3636, 3647], [3655, 3663], [3674, 3712], [3717, 3718],
-         [3723, 3724], [3726, 3731], [3752, 3753], [3764, 3772], [3774, 3775], [3783, 3791],
-         [3802, 3803], [3806, 3839], [3841, 3871], [3892, 3903], [3949, 3975], [3980, 4095],
-         [4139, 4158], [4170, 4175], [4182, 4185], [4190, 4192], [4194, 4196], [4199, 4205],
-         [4209, 4212], [4226, 4237], [4250, 4255], [4294, 4303], [4349, 4351], [4686, 4687],
-         [4702, 4703], [4750, 4751], [4790, 4791], [4806, 4807], [4886, 4887], [4955, 4968],
-         [4989, 4991], [5008, 5023], [5109, 5120], [5741, 5742], [5787, 5791], [5867, 5869],
-         [5873, 5887], [5906, 5919], [5938, 5951], [5970, 5983], [6001, 6015], [6068, 6102],
-         [6104, 6107], [6109, 6111], [6122, 6127], [6138, 6159], [6170, 6175], [6264, 6271],
-         [6315, 6319], [6390, 6399], [6429, 6469], [6510, 6511], [6517, 6527], [6572, 6592],
-         [6600, 6607], [6619, 6655], [6679, 6687], [6741, 6783], [6794, 6799], [6810, 6822],
-         [6824, 6916], [6964, 6980], [6988, 6991], [7002, 7042], [7073, 7085], [7098, 7167],
-         [7204, 7231], [7242, 7244], [7294, 7400], [7410, 7423], [7616, 7679], [7958, 7959],
-         [7966, 7967], [8006, 8007], [8014, 8015], [8062, 8063], [8127, 8129], [8141, 8143],
-         [8148, 8149], [8156, 8159], [8173, 8177], [8189, 8303], [8306, 8307], [8314, 8318],
-         [8330, 8335], [8341, 8449], [8451, 8454], [8456, 8457], [8470, 8472], [8478, 8483],
-         [8506, 8507], [8512, 8516], [8522, 8525], [8586, 9311], [9372, 9449], [9472, 10101],
-         [10132, 11263], [11493, 11498], [11503, 11516], [11518, 11519], [11558, 11567],
-         [11622, 11630], [11632, 11647], [11671, 11679], [11743, 11822], [11824, 12292],
-         [12296, 12320], [12330, 12336], [12342, 12343], [12349, 12352], [12439, 12444],
-         [12544, 12548], [12590, 12592], [12687, 12689], [12694, 12703], [12728, 12783],
-         [12800, 12831], [12842, 12880], [12896, 12927], [12938, 12976], [12992, 13311],
-         [19894, 19967], [40908, 40959], [42125, 42191], [42238, 42239], [42509, 42511],
-         [42540, 42559], [42592, 42593], [42607, 42622], [42648, 42655], [42736, 42774],
-         [42784, 42785], [42889, 42890], [42893, 43002], [43043, 43055], [43062, 43071],
-         [43124, 43137], [43188, 43215], [43226, 43249], [43256, 43258], [43260, 43263],
-         [43302, 43311], [43335, 43359], [43389, 43395], [43443, 43470], [43482, 43519],
-         [43561, 43583], [43596, 43599], [43610, 43615], [43639, 43641], [43643, 43647],
-         [43698, 43700], [43703, 43704], [43710, 43711], [43715, 43738], [43742, 43967],
-         [44003, 44015], [44026, 44031], [55204, 55215], [55239, 55242], [55292, 55295],
-         [57344, 63743], [64046, 64047], [64110, 64111], [64218, 64255], [64263, 64274],
-         [64280, 64284], [64434, 64466], [64830, 64847], [64912, 64913], [64968, 65007],
-         [65020, 65135], [65277, 65295], [65306, 65312], [65339, 65344], [65371, 65381],
-         [65471, 65473], [65480, 65481], [65488, 65489], [65496, 65497]];
-    for (i = 0; i < ranges.length; i++) {
-        start = ranges[i][0];
-        end = ranges[i][1];
-        for (j = start; j <= end; j++) {
-            result[j] = true;
-        }
-    }
-    return result;
-})();
-
-function splitQuery(query) {
-    var result = [];
-    var start = -1;
-    for (var i = 0; i < query.length; i++) {
-        if (splitChars[query.charCodeAt(i)]) {
-            if (start !== -1) {
-                result.push(query.slice(start, i));
-                start = -1;
-            }
-        } else if (start === -1) {
-            start = i;
-        }
-    }
-    if (start !== -1) {
-        result.push(query.slice(start));
-    }
-    return result;
-}
-
-
-
-
-/**
- * Search Module
- */
-var Search = {
-
-  _index : null,
-  _queued_query : null,
-  _pulse_status : -1,
-
-  init : function() {
-      var params = $.getQueryParameters();
-      if (params.q) {
-          var query = params.q[0];
-          $('input[name="q"]')[0].value = query;
-          this.performSearch(query);
-      }
-  },
-
-  loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null,
-            dataType: "script", cache: true,
-            complete: function(jqxhr, textstatus) {
-              if (textstatus != "success") {
-                document.getElementById("searchindexloader").src = url;
-              }
-            }});
-  },
-
-  setIndex : function(index) {
-    var q;
-    this._index = index;
-    if ((q = this._queued_query) !== null) {
-      this._queued_query = null;
-      Search.query(q);
-    }
-  },
-
-  hasIndex : function() {
-      return this._index !== null;
-  },
-
-  deferQuery : function(query) {
-      this._queued_query = query;
-  },
-
-  stopPulse : function() {
-      this._pulse_status = 0;
-  },
-
-  startPulse : function() {
-    if (this._pulse_status >= 0)
-        return;
-    function pulse() {
-      var i;
-      Search._pulse_status = (Search._pulse_status + 1) % 4;
-      var dotString = '';
-      for (i = 0; i < Search._pulse_status; i++)
-        dotString += '.';
-      Search.dots.text(dotString);
-      if (Search._pulse_status > -1)
-        window.setTimeout(pulse, 500);
-    }
-    pulse();
-  },
-
-  /**
-   * perform a search for something (or wait until index is loaded)
-   */
-  performSearch : function(query) {
-    // create the required interface elements
-    this.out = $('#search-results');
-    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
-    this.dots = $('<span></span>').appendTo(this.title);
-    this.status = $('<p style="display: none"></p>').appendTo(this.out);
-    this.output = $('<ul class="search"/>').appendTo(this.out);
-
-    $('#search-progress').text(_('Preparing search...'));
-    this.startPulse();
-
-    // index already loaded, the browser was quick!
-    if (this.hasIndex())
-      this.query(query);
-    else
-      this.deferQuery(query);
-  },
-
-  /**
-   * execute search (requires search index to be loaded)
-   */
-  query : function(query) {
-    var i;
-    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
-
-    // stem the searchterms and add them to the correct list
-    var stemmer = new Stemmer();
-    var searchterms = [];
-    var excluded = [];
-    var hlterms = [];
-    var tmp = splitQuery(query);
-    var objectterms = [];
-    for (i = 0; i < tmp.length; i++) {
-      if (tmp[i] !== "") {
-          objectterms.push(tmp[i].toLowerCase());
-      }
-
-      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
-          tmp[i] === "") {
-        // skip this "word"
-        continue;
-      }
-      // stem the word
-      var word = stemmer.stemWord(tmp[i].toLowerCase());
-      // prevent stemmer from cutting word smaller than two chars
-      if(word.length < 3 && tmp[i].length >= 3) {
-        word = tmp[i];
-      }
-      var toAppend;
-      // select the correct list
-      if (word[0] == '-') {
-        toAppend = excluded;
-        word = word.substr(1);
-      }
-      else {
-        toAppend = searchterms;
-        hlterms.push(tmp[i].toLowerCase());
-      }
-      // only add if not already in the list
-      if (!$u.contains(toAppend, word))
-        toAppend.push(word);
-    }
-    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
-
-    // console.debug('SEARCH: searching for:');
-    // console.info('required: ', searchterms);
-    // console.info('excluded: ', excluded);
-
-    // prepare search
-    var terms = this._index.terms;
-    var titleterms = this._index.titleterms;
-
-    // array of [filename, title, anchor, descr, score]
-    var results = [];
-    $('#search-progress').empty();
-
-    // lookup as object
-    for (i = 0; i < objectterms.length; i++) {
-      var others = [].concat(objectterms.slice(0, i),
-                             objectterms.slice(i+1, objectterms.length));
-      results = results.concat(this.performObjectSearch(objectterms[i], others));
-    }
-
-    // lookup as search terms in fulltext
-    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
-
-    // let the scorer override scores with a custom scoring function
-    if (Scorer.score) {
-      for (i = 0; i < results.length; i++)
-        results[i][4] = Scorer.score(results[i]);
-    }
-
-    // now sort the results by score (in opposite order of appearance, since the
-    // display function below uses pop() to retrieve items) and then
-    // alphabetically
-    results.sort(function(a, b) {
-      var left = a[4];
-      var right = b[4];
-      if (left > right) {
-        return 1;
-      } else if (left < right) {
-        return -1;
-      } else {
-        // same score: sort alphabetically
-        left = a[1].toLowerCase();
-        right = b[1].toLowerCase();
-        return (left > right) ? -1 : ((left < right) ? 1 : 0);
-      }
-    });
-
-    // for debugging
-    //Search.lastresults = results.slice();  // a copy
-    //console.info('search results:', Search.lastresults);
-
-    // print the results
-    var resultCount = results.length;
-    function displayNextItem() {
-      // results left, load the summary and display it
-      if (results.length) {
-        var item = results.pop();
-        var listItem = $('<li style="display:none"></li>');
-        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
-          // dirhtml builder
-          var dirname = item[0] + '/';
-          if (dirname.match(/\/index\/$/)) {
-            dirname = dirname.substring(0, dirname.length-6);
-          } else if (dirname == 'index/') {
-            dirname = '';
-          }
-          listItem.append($('<a/>').attr('href',
-            DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
-            highlightstring + item[2]).html(item[1]));
-        } else {
-          // normal html builders
-          listItem.append($('<a/>').attr('href',
-            item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
-            highlightstring + item[2]).html(item[1]));
-        }
-        if (item[3]) {
-          listItem.append($('<span> (' + item[3] + ')</span>'));
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          var suffix = DOCUMENTATION_OPTIONS.SOURCELINK_SUFFIX;
-          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[5] + (item[5].slice(-suffix.length) === suffix ? '' : suffix),
-                  dataType: "text",
-                  complete: function(jqxhr, textstatus) {
-                    var data = jqxhr.responseText;
-                    if (data !== '' && data !== undefined) {
-                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
-                    }
-                    Search.output.append(listItem);
-                    listItem.slideDown(5, function() {
-                      displayNextItem();
-                    });
-                  }});
-        } else {
-          // no source available, just display title
-          Search.output.append(listItem);
-          listItem.slideDown(5, function() {
-            displayNextItem();
-          });
-        }
-      }
-      // search finished, update title and status message
-      else {
-        Search.stopPulse();
-        Search.title.text(_('Search Results'));
-        if (!resultCount)
-          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
-        else
-            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
-        Search.status.fadeIn(500);
-      }
-    }
-    displayNextItem();
-  },
-
-  /**
-   * search for object names
-   */
-  performObjectSearch : function(object, otherterms) {
-    var filenames = this._index.filenames;
-    var docnames = this._index.docnames;
-    var objects = this._index.objects;
-    var objnames = this._index.objnames;
-    var titles = this._index.titles;
-
-    var i;
-    var results = [];
-
-    for (var prefix in objects) {
-      for (var name in objects[prefix]) {
-        var fullname = (prefix ? prefix + '.' : '') + name;
-        if (fullname.toLowerCase().indexOf(object) > -1) {
-          var score = 0;
-          var parts = fullname.split('.');
-          // check for different match types: exact matches of full name or
-          // "last name" (i.e. last dotted part)
-          if (fullname == object || parts[parts.length - 1] == object) {
-            score += Scorer.objNameMatch;
-          // matches in last name
-          } else if (parts[parts.length - 1].indexOf(object) > -1) {
-            score += Scorer.objPartialMatch;
-          }
-          var match = objects[prefix][name];
-          var objname = objnames[match[1]][2];
-          var title = titles[match[0]];
-          // If more than one term searched for, we require other words to be
-          // found in the name/title/description
-          if (otherterms.length > 0) {
-            var haystack = (prefix + ' ' + name + ' ' +
-                            objname + ' ' + title).toLowerCase();
-            var allfound = true;
-            for (i = 0; i < otherterms.length; i++) {
-              if (haystack.indexOf(otherterms[i]) == -1) {
-                allfound = false;
-                break;
-              }
-            }
-            if (!allfound) {
-              continue;
-            }
-          }
-          var descr = objname + _(', in ') + title;
-
-          var anchor = match[3];
-          if (anchor === '')
-            anchor = fullname;
-          else if (anchor == '-')
-            anchor = objnames[match[1]][1] + '-' + fullname;
-          // add custom score for some objects according to scorer
-          if (Scorer.objPrio.hasOwnProperty(match[2])) {
-            score += Scorer.objPrio[match[2]];
-          } else {
-            score += Scorer.objPrioDefault;
-          }
-          results.push([docnames[match[0]], fullname, '#'+anchor, descr, score, filenames[match[0]]]);
-        }
-      }
-    }
-
-    return results;
-  },
-
-  /**
-   * search for full-text terms in the index
-   */
-  performTermsSearch : function(searchterms, excluded, terms, titleterms) {
-    var docnames = this._index.docnames;
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
-
-    var i, j, file;
-    var fileMap = {};
-    var scoreMap = {};
-    var results = [];
-
-    // perform the search on the required terms
-    for (i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      var files = [];
-      var _o = [
-        {files: terms[word], score: Scorer.term},
-        {files: titleterms[word], score: Scorer.title}
-      ];
-
-      // no match but word was a required one
-      if ($u.every(_o, function(o){return o.files === undefined;})) {
-        break;
-      }
-      // found search word in contents
-      $u.each(_o, function(o) {
-        var _files = o.files;
-        if (_files === undefined)
-          return
-
-        if (_files.length === undefined)
-          _files = [_files];
-        files = files.concat(_files);
-
-        // set score for the word in each file to Scorer.term
-        for (j = 0; j < _files.length; j++) {
-          file = _files[j];
-          if (!(file in scoreMap))
-            scoreMap[file] = {}
-          scoreMap[file][word] = o.score;
-        }
-      });
-
-      // create the mapping
-      for (j = 0; j < files.length; j++) {
-        file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-          continue;
-
-      // ensure that none of the excluded terms is in the search result
-      for (i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-            titleterms[excluded[i]] == file ||
-            $u.contains(terms[excluded[i]] || [], file) ||
-            $u.contains(titleterms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
-
-      // if we have still a valid result we can add it to the result list
-      if (valid) {
-        // select one (max) score for the file.
-        // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
-        var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
-        results.push([docnames[file], titles[file], '', null, score, filenames[file]]);
-      }
-    }
-    return results;
-  },
-
-  /**
-   * helper function to return a node containing the
-   * search summary for a given text. keywords is a list
-   * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurrence, the
-   * latter for highlighting it.
-   */
-  makeSearchSummary : function(text, keywords, hlwords) {
-    var textLower = text.toLowerCase();
-    var start = 0;
-    $.each(keywords, function() {
-      var i = textLower.indexOf(this.toLowerCase());
-      if (i > -1)
-        start = i;
-    });
-    start = Math.max(start - 120, 0);
-    var excerpt = ((start > 0) ? '...' : '') +
-      $.trim(text.substr(start, 240)) +
-      ((start + 240 - text.length) ? '...' : '');
-    var rv = $('<div class="context"></div>').text(excerpt);
-    $.each(hlwords, function() {
-      rv = rv.highlightText(this, 'highlighted');
-    });
-    return rv;
-  }
-};
-
-$(document).ready(function() {
-  Search.init();
-});
\ No newline at end of file
diff --git a/docs/_static/underscore-1.3.1.js b/docs/_static/underscore-1.3.1.js
deleted file mode 100644
index 208d4cd89..000000000
--- a/docs/_static/underscore-1.3.1.js
+++ /dev/null
@@ -1,999 +0,0 @@
-//     Underscore.js 1.3.1
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore is freely distributable under the MIT license.
-//     Portions of Underscore are inspired or borrowed from Prototype,
-//     Oliver Steele's Functional, and John Resig's Micro-Templating.
-//     For all details and documentation:
-//     http://documentcloud.github.com/underscore
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var slice            = ArrayProto.slice,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) { return new wrapper(obj); };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.3.1';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    if (obj.length === +obj.length) results.length = obj.length;
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var reversed = _.toArray(obj).reverse();
-    if (context && !initial) iterator = _.bind(iterator, context);
-    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if a given value is included in the array or object using `===`.
-  // Aliased as `contains`.
-  _.include = _.contains = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
-      return value === target;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Return the maximum element or (element-based computation).
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
-    if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Shuffle an array.
-  _.shuffle = function(obj) {
-    var shuffled = [], rand;
-    each(obj, function(value, index, list) {
-      if (index == 0) {
-        shuffled[0] = value;
-      } else {
-        rand = Math.floor(Math.random() * (index + 1));
-        shuffled[index] = shuffled[rand];
-        shuffled[rand] = value;
-      }
-    });
-    return shuffled;
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, iterator, context) {
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }), 'value');
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, val) {
-    var result = {};
-    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
-    each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
-    });
-    return result;
-  };
-
-  // Use a comparator function to figure out at what index an object should
-  // be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator) {
-    iterator || (iterator = _.identity);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >> 1;
-      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(iterable) {
-    if (!iterable)                return [];
-    if (iterable.toArray)         return iterable.toArray();
-    if (_.isArray(iterable))      return slice.call(iterable);
-    if (_.isArguments(iterable))  return slice.call(iterable);
-    return _.values(iterable);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return _.toArray(obj).length;
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head`. The **guard** check allows it to work
-  // with `_.map`.
-  _.first = _.head = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the last entry of the array. Especcialy useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
-      return array[array.length - 1];
-    }
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail`.
-  // Especially useful on the arguments object. Passing an **index** will return
-  // the rest of the values in the array from that index onward. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = function(array, index, guard) {
-    return slice.call(array, (index == null) || guard ? 1 : index);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array, shallow) {
-    return _.reduce(array, function(memo, value) {
-      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
-      memo[memo.length] = value;
-      return memo;
-    }, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator) {
-    var initial = iterator ? _.map(array, iterator) : array;
-    var result = [];
-    _.reduce(initial, function(memo, el, i) {
-      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
-        memo[memo.length] = el;
-        result[result.length] = array[i];
-      }
-      return memo;
-    }, []);
-    return result;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(_.flatten(arguments, true));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays. (Aliased as "intersect" for back-compat.)
-  _.intersection = _.intersect = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = _.flatten(slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.include(rest, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
-    return results;
-  };
-
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i, l;
-    if (isSorted) {
-      i = _.sortedIndex(array, item);
-      return array[i] === item ? i : -1;
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
-    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item) {
-    if (array == null) return -1;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
-    var i = array.length;
-    while (i--) if (i in array && array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(func, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
-    return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) func.apply(context, args);
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        func.apply(context, args);
-      }
-      whenDone();
-      throttling = true;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds.
-  _.debounce = function(func, wait) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        func.apply(context, args);
-      };
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      return memo = func.apply(this, arguments);
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return function() {
-      var args = [func].concat(slice.call(arguments, 0));
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = arguments;
-    return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    if (times <= 0) return func();
-    return function() {
-      if (--times < 1) { return func.apply(this, arguments); }
-    };
-  };
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    return _.map(obj, _.identity);
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function.
-  function eq(a, b, stack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a._chain) a = a._wrapped;
-    if (b._chain) b = b._wrapped;
-    // Invoke a custom `isEqual` method if one is provided.
-    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
-    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className != toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return a == String(b);
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = stack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (stack[length] == a) return true;
-    }
-    // Add the first object to the stack of traversed objects.
-    stack.push(a);
-    var size = 0, result = true;
-    // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          // Ensure commutative equality for sparse arrays.
-          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
-        }
-      }
-    } else {
-      // Objects with different constructors are not equivalent.
-      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
-      // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
-      if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
-        }
-        result = !size;
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    stack.pop();
-    return result;
-  }
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType == 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Is a given variable an arguments object?
-  _.isArguments = function(obj) {
-    return toString.call(obj) == '[object Arguments]';
-  };
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
-    };
-  }
-
-  // Is a given value a function?
-  _.isFunction = function(obj) {
-    return toString.call(obj) == '[object Function]';
-  };
-
-  // Is a given value a string?
-  _.isString = function(obj) {
-    return toString.call(obj) == '[object String]';
-  };
-
-  // Is a given value a number?
-  _.isNumber = function(obj) {
-    return toString.call(obj) == '[object Number]';
-  };
-
-  // Is the given value `NaN`?
-  _.isNaN = function(obj) {
-    // `NaN` is the only value for which `===` is not reflexive.
-    return obj !== obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
-  };
-
-  // Is a given value a date?
-  _.isDate = function(obj) {
-    return toString.call(obj) == '[object Date]';
-  };
-
-  // Is the given value a regular expression?
-  _.isRegExp = function(obj) {
-    return toString.call(obj) == '[object RegExp]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Has own property?
-  _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function (n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Escape a string for HTML interpolation.
-  _.escape = function(string) {
-    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
-  };
-
-  // Add your own custom functions to the Underscore object, ensuring that
-  // they're correctly added to the OOP wrapper as well.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      addToWrapper(name, _[name] = obj[name]);
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /.^/;
-
-  // Within an interpolation, evaluation, or escaping, remove HTML escaping
-  // that had been previously added.
-  var unescape = function(code) {
-    return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
-  };
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(str, data) {
-    var c  = _.templateSettings;
-    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
-      'with(obj||{}){__p.push(\'' +
-      str.replace(/\\/g, '\\\\')
-         .replace(/'/g, "\\'")
-         .replace(c.escape || noMatch, function(match, code) {
-           return "',_.escape(" + unescape(code) + "),'";
-         })
-         .replace(c.interpolate || noMatch, function(match, code) {
-           return "'," + unescape(code) + ",'";
-         })
-         .replace(c.evaluate || noMatch, function(match, code) {
-           return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
-         })
-         .replace(/\r/g, '\\r')
-         .replace(/\n/g, '\\n')
-         .replace(/\t/g, '\\t')
-         + "');}return __p.join('');";
-    var func = new Function('obj', '_', tmpl);
-    if (data) return func(data, _);
-    return function(data) {
-      return func.call(this, data, _);
-    };
-  };
-
-  // Add a "chain" function, which will delegate to the wrapper.
-  _.chain = function(obj) {
-    return _(obj).chain();
-  };
-
-  // The OOP Wrapper
-  // ---------------
-
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-  var wrapper = function(obj) { this._wrapped = obj; };
-
-  // Expose `wrapper.prototype` as `_.prototype`
-  _.prototype = wrapper.prototype;
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj, chain) {
-    return chain ? _(obj).chain() : obj;
-  };
-
-  // A method to easily add functions to the OOP wrapper.
-  var addToWrapper = function(name, func) {
-    wrapper.prototype[name] = function() {
-      var args = slice.call(arguments);
-      unshift.call(args, this._wrapped);
-      return result(func.apply(_, args), this._chain);
-    };
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      var wrapped = this._wrapped;
-      method.apply(wrapped, arguments);
-      var length = wrapped.length;
-      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
-      return result(wrapped, this._chain);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    wrapper.prototype[name] = function() {
-      return result(method.apply(this._wrapped, arguments), this._chain);
-    };
-  });
-
-  // Start chaining a wrapped Underscore object.
-  wrapper.prototype.chain = function() {
-    this._chain = true;
-    return this;
-  };
-
-  // Extracts the result from a wrapped and chained object.
-  wrapper.prototype.value = function() {
-    return this._wrapped;
-  };
-
-}).call(this);
diff --git a/docs/_static/underscore.js b/docs/_static/underscore.js
deleted file mode 100644
index 5b55f32be..000000000
--- a/docs/_static/underscore.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Underscore.js 1.3.1
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,
-h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each=
-b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==
-null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=
-function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=
-e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a,computed:b})});
-return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,
-c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=
-b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];return d},[]);
-return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,
-d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};
-var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,
-c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c));g?h=true:
-a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};
-b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments,
-1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};
-b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};
-b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.mixin=function(a){j(b.functions(a),
-function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+
-u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]=
-function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=
-true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/docs/_static/up-pressed.png b/docs/_static/up-pressed.png
deleted file mode 100644
index acee3b68e..000000000
Binary files a/docs/_static/up-pressed.png and /dev/null differ
diff --git a/docs/_static/up.png b/docs/_static/up.png
deleted file mode 100644
index 2a940a7da..000000000
Binary files a/docs/_static/up.png and /dev/null differ
diff --git a/docs/_static/websupport.js b/docs/_static/websupport.js
deleted file mode 100644
index 53f6a4525..000000000
--- a/docs/_static/websupport.js
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * websupport.js
- * ~~~~~~~~~~~~~
- *
- * sphinx.websupport utilities for all documentation.
- *
- * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-(function($) {
-  $.fn.autogrow = function() {
-    return this.each(function() {
-    var textarea = this;
-
-    $.fn.autogrow.resize(textarea);
-
-    $(textarea)
-      .focus(function() {
-        textarea.interval = setInterval(function() {
-          $.fn.autogrow.resize(textarea);
-        }, 500);
-      })
-      .blur(function() {
-        clearInterval(textarea.interval);
-      });
-    });
-  };
-
-  $.fn.autogrow.resize = function(textarea) {
-    var lineHeight = parseInt($(textarea).css('line-height'), 10);
-    var lines = textarea.value.split('\n');
-    var columns = textarea.cols;
-    var lineCount = 0;
-    $.each(lines, function() {
-      lineCount += Math.ceil(this.length / columns) || 1;
-    });
-    var height = lineHeight * (lineCount + 1);
-    $(textarea).css('height', height);
-  };
-})(jQuery);
-
-(function($) {
-  var comp, by;
-
-  function init() {
-    initEvents();
-    initComparator();
-  }
-
-  function initEvents() {
-    $(document).on("click", 'a.comment-close', function(event) {
-      event.preventDefault();
-      hide($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.vote', function(event) {
-      event.preventDefault();
-      handleVote($(this));
-    });
-    $(document).on("click", 'a.reply', function(event) {
-      event.preventDefault();
-      openReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.close-reply', function(event) {
-      event.preventDefault();
-      closeReply($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.sort-option', function(event) {
-      event.preventDefault();
-      handleReSort($(this));
-    });
-    $(document).on("click", 'a.show-proposal', function(event) {
-      event.preventDefault();
-      showProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-proposal', function(event) {
-      event.preventDefault();
-      hideProposal($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.show-propose-change', function(event) {
-      event.preventDefault();
-      showProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.hide-propose-change', function(event) {
-      event.preventDefault();
-      hideProposeChange($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.accept-comment', function(event) {
-      event.preventDefault();
-      acceptComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.delete-comment', function(event) {
-      event.preventDefault();
-      deleteComment($(this).attr('id').substring(2));
-    });
-    $(document).on("click", 'a.comment-markup', function(event) {
-      event.preventDefault();
-      toggleCommentMarkupBox($(this).attr('id').substring(2));
-    });
-  }
-
-  /**
-   * Set comp, which is a comparator function used for sorting and
-   * inserting comments into the list.
-   */
-  function setComparator() {
-    // If the first three letters are "asc", sort in ascending order
-    // and remove the prefix.
-    if (by.substring(0,3) == 'asc') {
-      var i = by.substring(3);
-      comp = function(a, b) { return a[i] - b[i]; };
-    } else {
-      // Otherwise sort in descending order.
-      comp = function(a, b) { return b[by] - a[by]; };
-    }
-
-    // Reset link styles and format the selected sort option.
-    $('a.sel').attr('href', '#').removeClass('sel');
-    $('a.by' + by).removeAttr('href').addClass('sel');
-  }
-
-  /**
-   * Create a comp function. If the user has preferences stored in
-   * the sortBy cookie, use those, otherwise use the default.
-   */
-  function initComparator() {
-    by = 'rating'; // Default to sort by rating.
-    // If the sortBy cookie is set, use that instead.
-    if (document.cookie.length > 0) {
-      var start = document.cookie.indexOf('sortBy=');
-      if (start != -1) {
-        start = start + 7;
-        var end = document.cookie.indexOf(";", start);
-        if (end == -1) {
-          end = document.cookie.length;
-          by = unescape(document.cookie.substring(start, end));
-        }
-      }
-    }
-    setComparator();
-  }
-
-  /**
-   * Show a comment div.
-   */
-  function show(id) {
-    $('#ao' + id).hide();
-    $('#ah' + id).show();
-    var context = $.extend({id: id}, opts);
-    var popup = $(renderTemplate(popupTemplate, context)).hide();
-    popup.find('textarea[name="proposal"]').hide();
-    popup.find('a.by' + by).addClass('sel');
-    var form = popup.find('#cf' + id);
-    form.submit(function(event) {
-      event.preventDefault();
-      addComment(form);
-    });
-    $('#s' + id).after(popup);
-    popup.slideDown('fast', function() {
-      getComments(id);
-    });
-  }
-
-  /**
-   * Hide a comment div.
-   */
-  function hide(id) {
-    $('#ah' + id).hide();
-    $('#ao' + id).show();
-    var div = $('#sc' + id);
-    div.slideUp('fast', function() {
-      div.remove();
-    });
-  }
-
-  /**
-   * Perform an ajax request to get comments for a node
-   * and insert the comments into the comments tree.
-   */
-  function getComments(id) {
-    $.ajax({
-     type: 'GET',
-     url: opts.getCommentsURL,
-     data: {node: id},
-     success: function(data, textStatus, request) {
-       var ul = $('#cl' + id);
-       var speed = 100;
-       $('#cf' + id)
-         .find('textarea[name="proposal"]')
-         .data('source', data.source);
-
-       if (data.comments.length === 0) {
-         ul.html('<li>No comments yet.</li>');
-         ul.data('empty', true);
-       } else {
-         // If there are comments, sort them and put them in the list.
-         var comments = sortComments(data.comments);
-         speed = data.comments.length * 100;
-         appendComments(comments, ul);
-         ul.data('empty', false);
-       }
-       $('#cn' + id).slideUp(speed + 200);
-       ul.slideDown(speed);
-     },
-     error: function(request, textStatus, error) {
-       showError('Oops, there was a problem retrieving the comments.');
-     },
-     dataType: 'json'
-    });
-  }
-
-  /**
-   * Add a comment via ajax and insert the comment into the comment tree.
-   */
-  function addComment(form) {
-    var node_id = form.find('input[name="node"]').val();
-    var parent_id = form.find('input[name="parent"]').val();
-    var text = form.find('textarea[name="comment"]').val();
-    var proposal = form.find('textarea[name="proposal"]').val();
-
-    if (text == '') {
-      showError('Please enter a comment.');
-      return;
-    }
-
-    // Disable the form that is being submitted.
-    form.find('textarea,input').attr('disabled', 'disabled');
-
-    // Send the comment to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.addCommentURL,
-      dataType: 'json',
-      data: {
-        node: node_id,
-        parent: parent_id,
-        text: text,
-        proposal: proposal
-      },
-      success: function(data, textStatus, error) {
-        // Reset the form.
-        if (node_id) {
-          hideProposeChange(node_id);
-        }
-        form.find('textarea')
-          .val('')
-          .add(form.find('input'))
-          .removeAttr('disabled');
-	var ul = $('#cl' + (node_id || parent_id));
-        if (ul.data('empty')) {
-          $(ul).empty();
-          ul.data('empty', false);
-        }
-        insertComment(data.comment);
-        var ao = $('#ao' + node_id);
-        ao.find('img').attr({'src': opts.commentBrightImage});
-        if (node_id) {
-          // if this was a "root" comment, remove the commenting box
-          // (the user can get it back by reopening the comment popup)
-          $('#ca' + node_id).slideUp();
-        }
-      },
-      error: function(request, textStatus, error) {
-        form.find('textarea,input').removeAttr('disabled');
-        showError('Oops, there was a problem adding the comment.');
-      }
-    });
-  }
-
-  /**
-   * Recursively append comments to the main comment list and children
-   * lists, creating the comment tree.
-   */
-  function appendComments(comments, ul) {
-    $.each(comments, function() {
-      var div = createCommentDiv(this);
-      ul.append($(document.createElement('li')).html(div));
-      appendComments(this.children, div.find('ul.comment-children'));
-      // To avoid stagnating data, don't store the comments children in data.
-      this.children = null;
-      div.data('comment', this);
-    });
-  }
-
-  /**
-   * After adding a new comment, it must be inserted in the correct
-   * location in the comment tree.
-   */
-  function insertComment(comment) {
-    var div = createCommentDiv(comment);
-
-    // To avoid stagnating data, don't store the comments children in data.
-    comment.children = null;
-    div.data('comment', comment);
-
-    var ul = $('#cl' + (comment.node || comment.parent));
-    var siblings = getChildren(ul);
-
-    var li = $(document.createElement('li'));
-    li.hide();
-
-    // Determine where in the parents children list to insert this comment.
-    for(i=0; i < siblings.length; i++) {
-      if (comp(comment, siblings[i]) <= 0) {
-        $('#cd' + siblings[i].id)
-          .parent()
-          .before(li.html(div));
-        li.slideDown('fast');
-        return;
-      }
-    }
-
-    // If we get here, this comment rates lower than all the others,
-    // or it is the only comment in the list.
-    ul.append(li.html(div));
-    li.slideDown('fast');
-  }
-
-  function acceptComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.acceptCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        $('#cm' + id).fadeOut('fast');
-        $('#cd' + id).removeClass('moderate');
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem accepting the comment.');
-      }
-    });
-  }
-
-  function deleteComment(id) {
-    $.ajax({
-      type: 'POST',
-      url: opts.deleteCommentURL,
-      data: {id: id},
-      success: function(data, textStatus, request) {
-        var div = $('#cd' + id);
-        if (data == 'delete') {
-          // Moderator mode: remove the comment and all children immediately
-          div.slideUp('fast', function() {
-            div.remove();
-          });
-          return;
-        }
-        // User mode: only mark the comment as deleted
-        div
-          .find('span.user-id:first')
-          .text('[deleted]').end()
-          .find('div.comment-text:first')
-          .text('[deleted]').end()
-          .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
-                ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
-          .remove();
-        var comment = div.data('comment');
-        comment.username = '[deleted]';
-        comment.text = '[deleted]';
-        div.data('comment', comment);
-      },
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem deleting the comment.');
-      }
-    });
-  }
-
-  function showProposal(id) {
-    $('#sp' + id).hide();
-    $('#hp' + id).show();
-    $('#pr' + id).slideDown('fast');
-  }
-
-  function hideProposal(id) {
-    $('#hp' + id).hide();
-    $('#sp' + id).show();
-    $('#pr' + id).slideUp('fast');
-  }
-
-  function showProposeChange(id) {
-    $('#pc' + id).hide();
-    $('#hc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val(textarea.data('source'));
-    $.fn.autogrow.resize(textarea[0]);
-    textarea.slideDown('fast');
-  }
-
-  function hideProposeChange(id) {
-    $('#hc' + id).hide();
-    $('#pc' + id).show();
-    var textarea = $('#pt' + id);
-    textarea.val('').removeAttr('disabled');
-    textarea.slideUp('fast');
-  }
-
-  function toggleCommentMarkupBox(id) {
-    $('#mb' + id).toggle();
-  }
-
-  /** Handle when the user clicks on a sort by link. */
-  function handleReSort(link) {
-    var classes = link.attr('class').split(/\s+/);
-    for (var i=0; i<classes.length; i++) {
-      if (classes[i] != 'sort-option') {
-	by = classes[i].substring(2);
-      }
-    }
-    setComparator();
-    // Save/update the sortBy cookie.
-    var expiration = new Date();
-    expiration.setDate(expiration.getDate() + 365);
-    document.cookie= 'sortBy=' + escape(by) +
-                     ';expires=' + expiration.toUTCString();
-    $('ul.comment-ul').each(function(index, ul) {
-      var comments = getChildren($(ul), true);
-      comments = sortComments(comments);
-      appendComments(comments, $(ul).empty());
-    });
-  }
-
-  /**
-   * Function to process a vote when a user clicks an arrow.
-   */
-  function handleVote(link) {
-    if (!opts.voting) {
-      showError("You'll need to login to vote.");
-      return;
-    }
-
-    var id = link.attr('id');
-    if (!id) {
-      // Didn't click on one of the voting arrows.
-      return;
-    }
-    // If it is an unvote, the new vote value is 0,
-    // Otherwise it's 1 for an upvote, or -1 for a downvote.
-    var value = 0;
-    if (id.charAt(1) != 'u') {
-      value = id.charAt(0) == 'u' ? 1 : -1;
-    }
-    // The data to be sent to the server.
-    var d = {
-      comment_id: id.substring(2),
-      value: value
-    };
-
-    // Swap the vote and unvote links.
-    link.hide();
-    $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
-      .show();
-
-    // The div the comment is displayed in.
-    var div = $('div#cd' + d.comment_id);
-    var data = div.data('comment');
-
-    // If this is not an unvote, and the other vote arrow has
-    // already been pressed, unpress it.
-    if ((d.value !== 0) && (data.vote === d.value * -1)) {
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
-      $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
-    }
-
-    // Update the comments rating in the local data.
-    data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
-    data.vote = d.value;
-    div.data('comment', data);
-
-    // Change the rating text.
-    div.find('.rating:first')
-      .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
-
-    // Send the vote information to the server.
-    $.ajax({
-      type: "POST",
-      url: opts.processVoteURL,
-      data: d,
-      error: function(request, textStatus, error) {
-        showError('Oops, there was a problem casting that vote.');
-      }
-    });
-  }
-
-  /**
-   * Open a reply form used to reply to an existing comment.
-   */
-  function openReply(id) {
-    // Swap out the reply link for the hide link
-    $('#rl' + id).hide();
-    $('#cr' + id).show();
-
-    // Add the reply li to the children ul.
-    var div = $(renderTemplate(replyTemplate, {id: id})).hide();
-    $('#cl' + id)
-      .prepend(div)
-      // Setup the submit handler for the reply form.
-      .find('#rf' + id)
-      .submit(function(event) {
-        event.preventDefault();
-        addComment($('#rf' + id));
-        closeReply(id);
-      })
-      .find('input[type=button]')
-      .click(function() {
-        closeReply(id);
-      });
-    div.slideDown('fast', function() {
-      $('#rf' + id).find('textarea').focus();
-    });
-  }
-
-  /**
-   * Close the reply form opened with openReply.
-   */
-  function closeReply(id) {
-    // Remove the reply div from the DOM.
-    $('#rd' + id).slideUp('fast', function() {
-      $(this).remove();
-    });
-
-    // Swap out the hide link for the reply link
-    $('#cr' + id).hide();
-    $('#rl' + id).show();
-  }
-
-  /**
-   * Recursively sort a tree of comments using the comp comparator.
-   */
-  function sortComments(comments) {
-    comments.sort(comp);
-    $.each(comments, function() {
-      this.children = sortComments(this.children);
-    });
-    return comments;
-  }
-
-  /**
-   * Get the children comments from a ul. If recursive is true,
-   * recursively include childrens' children.
-   */
-  function getChildren(ul, recursive) {
-    var children = [];
-    ul.children().children("[id^='cd']")
-      .each(function() {
-        var comment = $(this).data('comment');
-        if (recursive)
-          comment.children = getChildren($(this).find('#cl' + comment.id), true);
-        children.push(comment);
-      });
-    return children;
-  }
-
-  /** Create a div to display a comment in. */
-  function createCommentDiv(comment) {
-    if (!comment.displayed && !opts.moderator) {
-      return $('<div class="moderate">Thank you!  Your comment will show up '
-               + 'once it is has been approved by a moderator.</div>');
-    }
-    // Prettify the comment rating.
-    comment.pretty_rating = comment.rating + ' point' +
-      (comment.rating == 1 ? '' : 's');
-    // Make a class (for displaying not yet moderated comments differently)
-    comment.css_class = comment.displayed ? '' : ' moderate';
-    // Create a div for this comment.
-    var context = $.extend({}, opts, comment);
-    var div = $(renderTemplate(commentTemplate, context));
-
-    // If the user has voted on this comment, highlight the correct arrow.
-    if (comment.vote) {
-      var direction = (comment.vote == 1) ? 'u' : 'd';
-      div.find('#' + direction + 'v' + comment.id).hide();
-      div.find('#' + direction + 'u' + comment.id).show();
-    }
-
-    if (opts.moderator || comment.text != '[deleted]') {
-      div.find('a.reply').show();
-      if (comment.proposal_diff)
-        div.find('#sp' + comment.id).show();
-      if (opts.moderator && !comment.displayed)
-        div.find('#cm' + comment.id).show();
-      if (opts.moderator || (opts.username == comment.username))
-        div.find('#dc' + comment.id).show();
-    }
-    return div;
-  }
-
-  /**
-   * A simple template renderer. Placeholders such as <%id%> are replaced
-   * by context['id'] with items being escaped. Placeholders such as <#id#>
-   * are not escaped.
-   */
-  function renderTemplate(template, context) {
-    var esc = $(document.createElement('div'));
-
-    function handle(ph, escape) {
-      var cur = context;
-      $.each(ph.split('.'), function() {
-        cur = cur[this];
-      });
-      return escape ? esc.text(cur || "").html() : cur;
-    }
-
-    return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
-      return handle(arguments[2], arguments[1] == '%' ? true : false);
-    });
-  }
-
-  /** Flash an error message briefly. */
-  function showError(message) {
-    $(document.createElement('div')).attr({'class': 'popup-error'})
-      .append($(document.createElement('div'))
-               .attr({'class': 'error-message'}).text(message))
-      .appendTo('body')
-      .fadeIn("slow")
-      .delay(2000)
-      .fadeOut("slow");
-  }
-
-  /** Add a link the user uses to open the comments popup. */
-  $.fn.comment = function() {
-    return this.each(function() {
-      var id = $(this).attr('id').substring(1);
-      var count = COMMENT_METADATA[id];
-      var title = count + ' comment' + (count == 1 ? '' : 's');
-      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
-      var addcls = count == 0 ? ' nocomment' : '';
-      $(this)
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-open' + addcls,
-            id: 'ao' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: image,
-              alt: 'comment',
-              title: title
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              show($(this).attr('id').substring(2));
-            })
-        )
-        .append(
-          $(document.createElement('a')).attr({
-            href: '#',
-            'class': 'sphinx-comment-close hidden',
-            id: 'ah' + id
-          })
-            .append($(document.createElement('img')).attr({
-              src: opts.closeCommentImage,
-              alt: 'close',
-              title: 'close'
-            }))
-            .click(function(event) {
-              event.preventDefault();
-              hide($(this).attr('id').substring(2));
-            })
-        );
-    });
-  };
-
-  var opts = {
-    processVoteURL: '/_process_vote',
-    addCommentURL: '/_add_comment',
-    getCommentsURL: '/_get_comments',
-    acceptCommentURL: '/_accept_comment',
-    deleteCommentURL: '/_delete_comment',
-    commentImage: '/static/_static/comment.png',
-    closeCommentImage: '/static/_static/comment-close.png',
-    loadingImage: '/static/_static/ajax-loader.gif',
-    commentBrightImage: '/static/_static/comment-bright.png',
-    upArrow: '/static/_static/up.png',
-    downArrow: '/static/_static/down.png',
-    upArrowPressed: '/static/_static/up-pressed.png',
-    downArrowPressed: '/static/_static/down-pressed.png',
-    voting: false,
-    moderator: false
-  };
-
-  if (typeof COMMENT_OPTIONS != "undefined") {
-    opts = jQuery.extend(opts, COMMENT_OPTIONS);
-  }
-
-  var popupTemplate = '\
-    <div class="sphinx-comments" id="sc<%id%>">\
-      <p class="sort-options">\
-        Sort by:\
-        <a href="#" class="sort-option byrating">best rated</a>\
-        <a href="#" class="sort-option byascage">newest</a>\
-        <a href="#" class="sort-option byage">oldest</a>\
-      </p>\
-      <div class="comment-header">Comments</div>\
-      <div class="comment-loading" id="cn<%id%>">\
-        loading comments... <img src="<%loadingImage%>" alt="" /></div>\
-      <ul id="cl<%id%>" class="comment-ul"></ul>\
-      <div id="ca<%id%>">\
-      <p class="add-a-comment">Add a comment\
-        (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
-      <div class="comment-markup-box" id="mb<%id%>">\
-        reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
-        <code>``code``</code>, \
-        code blocks: <code>::</code> and an indented block after blank line</div>\
-      <form method="post" id="cf<%id%>" class="comment-form" action="">\
-        <textarea name="comment" cols="80"></textarea>\
-        <p class="propose-button">\
-          <a href="#" id="pc<%id%>" class="show-propose-change">\
-            Propose a change &#9657;\
-          </a>\
-          <a href="#" id="hc<%id%>" class="hide-propose-change">\
-            Propose a change &#9663;\
-          </a>\
-        </p>\
-        <textarea name="proposal" id="pt<%id%>" cols="80"\
-                  spellcheck="false"></textarea>\
-        <input type="submit" value="Add comment" />\
-        <input type="hidden" name="node" value="<%id%>" />\
-        <input type="hidden" name="parent" value="" />\
-      </form>\
-      </div>\
-    </div>';
-
-  var commentTemplate = '\
-    <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
-      <div class="vote">\
-        <div class="arrow">\
-          <a href="#" id="uv<%id%>" class="vote" title="vote up">\
-            <img src="<%upArrow%>" />\
-          </a>\
-          <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
-            <img src="<%upArrowPressed%>" />\
-          </a>\
-        </div>\
-        <div class="arrow">\
-          <a href="#" id="dv<%id%>" class="vote" title="vote down">\
-            <img src="<%downArrow%>" id="da<%id%>" />\
-          </a>\
-          <a href="#" id="du<%id%>" class="un vote" title="vote down">\
-            <img src="<%downArrowPressed%>" />\
-          </a>\
-        </div>\
-      </div>\
-      <div class="comment-content">\
-        <p class="tagline comment">\
-          <span class="user-id"><%username%></span>\
-          <span class="rating"><%pretty_rating%></span>\
-          <span class="delta"><%time.delta%></span>\
-        </p>\
-        <div class="comment-text comment"><#text#></div>\
-        <p class="comment-opts comment">\
-          <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
-          <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
-          <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
-          <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
-          <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
-          <span id="cm<%id%>" class="moderation hidden">\
-            <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
-          </span>\
-        </p>\
-        <pre class="proposal" id="pr<%id%>">\
-<#proposal_diff#>\
-        </pre>\
-          <ul class="comment-children" id="cl<%id%>"></ul>\
-        </div>\
-        <div class="clearleft"></div>\
-      </div>\
-    </div>';
-
-  var replyTemplate = '\
-    <li>\
-      <div class="reply-div" id="rd<%id%>">\
-        <form id="rf<%id%>">\
-          <textarea name="comment" cols="80"></textarea>\
-          <input type="submit" value="Add reply" />\
-          <input type="button" value="Cancel" />\
-          <input type="hidden" name="parent" value="<%id%>" />\
-          <input type="hidden" name="node" value="" />\
-        </form>\
-      </div>\
-    </li>';
-
-  $(document).ready(function() {
-    init();
-  });
-})(jQuery);
-
-$(document).ready(function() {
-  // add comment anchors for all paragraphs that are commentable
-  $('.sphinx-has-comment').comment();
-
-  // highlight search words in search results
-  $("div.context").each(function() {
-    var params = $.getQueryParameters();
-    var terms = (params.q) ? params.q[0].split(/\s+/) : [];
-    var result = $(this);
-    $.each(terms, function() {
-      result.highlightText(this.toLowerCase(), 'highlighted');
-    });
-  });
-
-  // directly open comment window if requested
-  var anchor = document.location.hash;
-  if (anchor.substring(0, 9) == '#comment-') {
-    $('#ao' + anchor.substring(9)).click();
-    document.location.hash = '#s' + anchor.substring(9);
-  }
-});
diff --git a/docs/about_ydk.html b/docs/about_ydk.html
deleted file mode 100644
index 234f18234..000000000
--- a/docs/about_ydk.html
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>About YDK &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/>
-        <link rel="next" title="Getting Started" href="getting_started.html"/>
-        <link rel="prev" title="Contents:" href="index.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">About YDK</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#license">License</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#version">Version</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#release-changes">Release Changes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>About YDK</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="about-ydk">
-<h1>About YDK<a class="headerlink" href="#about-ydk" title="Permalink to this headline">¶</a></h1>
-<p>The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The YDK allows generate YANG model API and provides services to apply generated API over various communication protocols.
-Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
-YDK provides CRUD and protocol specific services over above protocols.
-YDK also provides codec services to translate API models to/from XML and JSON encoded strings.</p>
-<p>The YDK is a multi-language software. Currently supported languages are Python, Go, and C++.</p>
-<div class="section" id="license">
-<h2>License<a class="headerlink" href="#license" title="Permalink to this headline">¶</a></h2>
-<p>Copyright 2016-2019 Cisco Systems. All rights reserved</p>
-<p>Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version 2.0 (the &#8220;License&#8221;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at:</p>
-<blockquote>
-<div><a class="reference external" href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a></div></blockquote>
-<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-&#8220;AS IS&#8221; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.</p>
-<p>Some of the source files in this release have been modified by Yan Gorelik, YDK Solutions.
-All modifications in original files under CiscoDevNet domain introduced since October 2019 are copyrighted
-and protected under Apache License, Version 2.0.</p>
-</div>
-<div class="section" id="version">
-<h2>Version<a class="headerlink" href="#version" title="Permalink to this headline">¶</a></h2>
-<p>Version : 0.8.6.4</p>
-<p>This YDK documentation was generated using
-<a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/blob/master/generate.py">ydk-gen/generate.py</a> script.</p>
-<p>To check out this version of ydk-gen use the below commands:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span>$ git clone https://github.com/ygorelik/ydk-gen.git
-$ git checkout d665b401e363a2dbfbba5258d7705509fd76baed
-</pre></div>
-</div>
-</div>
-<div class="section" id="release-changes">
-<h2>Release Changes<a class="headerlink" href="#release-changes" title="Permalink to this headline">¶</a></h2>
-<blockquote>
-<div><ul class="simple">
-<li><a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/blob/master/CHANGES.md">Changelog</a></li>
-</ul>
-</div></blockquote>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="getting_started.html" class="btn btn-neutral float-right" title="Getting Started" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="index.html" class="btn btn-neutral" title="Contents:" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/class_hierarchy.html b/docs/api/class_hierarchy.html
deleted file mode 100644
index 53b8a9fe2..000000000
--- a/docs/api/class_hierarchy.html
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>YDK API &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="API Guide" href="../api_guide.html"/>
-        <link rel="next" title="Services" href="services/services.html"/>
-        <link rel="prev" title="API Guide" href="../api_guide.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">YDK API</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="services/services.html">Services</a></li>
-<li class="toctree-l3"><a class="reference internal" href="providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../api_guide.html">API Guide</a> &raquo;</li>
-      
-    <li>YDK API</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="ydk-api">
-<h1>YDK API<a class="headerlink" href="#ydk-api" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="services/services.html">Services</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="services/codec_service.html">Codec Services</a></li>
-<li class="toctree-l2"><a class="reference internal" href="services/crud_service.html">CRUD Service</a></li>
-<li class="toctree-l2"><a class="reference internal" href="services/executor_service.html">Executor Service</a></li>
-<li class="toctree-l2"><a class="reference internal" href="services/netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l2"><a class="reference internal" href="services/gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="services/gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="providers/providers.html">Service Providers</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="providers/service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="providers/codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="providers/netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="providers/gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="providers/odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="providers/restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="filters.html">Filters</a></li>
-<li class="toctree-l1"><a class="reference internal" href="types.html">Types</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="types.html#yang-built-in-types">YANG built-in types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="types.html#ydk-types">YDK types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="types.html#utility-functions">Utility functions</a></li>
-<li class="toctree-l2"><a class="reference internal" href="types.html#examples">Examples</a></li>
-<li class="toctree-l2"><a class="reference internal" href="types.html#validation">Validation</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="errors.html">Errors</a></li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="services/services.html" class="btn btn-neutral float-right" title="Services" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../api_guide.html" class="btn btn-neutral" title="API Guide" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/errors.html b/docs/api/errors.html
deleted file mode 100644
index 9bbf81b7d..000000000
--- a/docs/api/errors.html
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Errors &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="YDK API" href="class_hierarchy.html"/>
-        <link rel="next" title="YDK Path API" href="path/path.html"/>
-        <link rel="prev" title="Types" href="types.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="services/services.html">Services</a></li>
-<li class="toctree-l3"><a class="reference internal" href="providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="types.html">Types</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-    <li>Errors</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.errors">
-<span id="errors"></span><h1>Errors<a class="headerlink" href="#module-ydk.errors" title="Permalink to this headline">¶</a></h1>
-<p>This module contains YDK Python errors classes. These errors are thrown in case of data not conforming to the yang model or due to a server-side error.</p>
-<dl class="exception">
-<dt id="ydk.errors.YError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YError</code><a class="headerlink" href="#ydk.errors.YError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <code class="xref py py-exc docutils literal"><span class="pre">exceptions.Exception</span></code></p>
-<p>Base class for Y Errors. The subclasses give a specialized view of the error that has occurred.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YCoreError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YCoreError</code><a class="headerlink" href="#ydk.errors.YCoreError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Core Error. Base exception class for all YDK core errors.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YCodecError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YCodecError</code><a class="headerlink" href="#ydk.errors.YCodecError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YCoreError" title="ydk.errors.YCoreError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YCoreError</span></code></a></p>
-<p>Codec Error. Thrown when a Path Codec fails to perform encoding or decoding.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YModelError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YModelError</code><a class="headerlink" href="#ydk.errors.YModelError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Model Error. Thrown when a model constraint is violated.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YServiceProviderError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YServiceProviderError</code><a class="headerlink" href="#ydk.errors.YServiceProviderError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Exception for Service Provider. Thrown in case of a server-side error.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YClientError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YClientError</code><a class="headerlink" href="#ydk.errors.YClientError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Exception for client connection</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YIllegalStateError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YIllegalStateError</code><a class="headerlink" href="#ydk.errors.YIllegalStateError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Illegal State Error. Thrown when an operation/service is invoked on an object that is not in the right state. Use the error_msg for the error.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YInvalidArgumentError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YInvalidArgumentError</code><a class="headerlink" href="#ydk.errors.YInvalidArgumentError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Invalid Argument. Use the error_msg for the error.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YOperationNotSupportedError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YOperationNotSupportedError</code><a class="headerlink" href="#ydk.errors.YOperationNotSupportedError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Operation Not Supported Error. Thrown when an operation is not supported.</p>
-</dd></dl>
-
-<dl class="exception">
-<dt id="ydk.errors.YServiceError">
-<em class="property">exception </em><code class="descclassname">ydk.errors.</code><code class="descname">YServiceError</code><a class="headerlink" href="#ydk.errors.YServiceError" title="Permalink to this definition">¶</a></dt>
-<dd><p>Bases: <a class="reference internal" href="#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-exc docutils literal"><span class="pre">ydk.errors.YError</span></code></a></p>
-<p>Exception for Service Side Validation.</p>
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="path/path.html" class="btn btn-neutral float-right" title="YDK Path API" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="types.html" class="btn btn-neutral" title="Types" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/filters.html b/docs/api/filters.html
deleted file mode 100644
index 5bd12feb2..000000000
--- a/docs/api/filters.html
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Filters &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="YDK API" href="class_hierarchy.html"/>
-        <link rel="next" title="Types" href="types.html"/>
-        <link rel="prev" title="RESTCONF Service Provider" href="providers/restconf_provider.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="services/services.html">Services</a></li>
-<li class="toctree-l3"><a class="reference internal" href="providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-    <li>Filters</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="filters">
-<span id="filters-ydk"></span><h1>Filters<a class="headerlink" href="#filters" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.filters.YFilter">
-<em class="property">class </em><code class="descclassname">ydk.filters.</code><code class="descname">YFilter</code><a class="headerlink" href="#ydk.filters.YFilter" title="Permalink to this definition">¶</a></dt>
-<dd><p>YFilter can be used to include the various operations supported in the <a class="reference external" href="https://tools.ietf.org/html/rfc6241#section-7.2">Netconf protocol&#8217;s edit-config RPC</a> in your YDK app. YFilter can also be used to mark leafs, lists or containers for reading.</p>
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.create">
-<code class="descname">create</code><a class="headerlink" href="#ydk.filters.YFilter.create" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute is added to the configuration if
-and only if the configuration data does not already exist in
-the configuration datastore. If the configuration data
-exists, an <a class="reference internal" href="errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-class docutils literal"><span class="pre">ydk.errors.YServiceProviderError</span></code></a> will be thrown
-with XML error message.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.delete">
-<code class="descname">delete</code><a class="headerlink" href="#ydk.filters.YFilter.delete" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute is deleted from the configuration
-if and only if the configuration data currently exists in
-the configuration datastore. If the configuration data does
-not exist, an <a class="reference internal" href="errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-class docutils literal"><span class="pre">ydk.errors.YServiceProviderError</span></code></a> will be
-thrown with XML error message.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.merge">
-<code class="descname">merge</code><a class="headerlink" href="#ydk.filters.YFilter.merge" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute is merged with the configuration
-at the corresponding level in the configuration datastore
-identified by the target.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.not_set">
-<code class="descname">not_set</code><a class="headerlink" href="#ydk.filters.YFilter.not_set" title="Permalink to this definition">¶</a></dt>
-<dd><p>This is the default behavior. No operation tag is attached to the
-payload.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.remove">
-<code class="descname">remove</code><a class="headerlink" href="#ydk.filters.YFilter.remove" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute is deleted from the configuration
-if the configuration data currently exists in the
-configuration datastore.  If the configuration data does not
-exist, the <code class="docutils literal"><span class="pre">remove</span></code> operation is silently ignored by the server.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.replace">
-<code class="descname">replace</code><a class="headerlink" href="#ydk.filters.YFilter.replace" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute replaces any related configuration
-in the configuration datastore identified by the target
-parameter.  If no such configuration data exists in the
-configuration datastore, it is created.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.read">
-<code class="descname">read</code><a class="headerlink" href="#ydk.filters.YFilter.read" title="Permalink to this definition">¶</a></dt>
-<dd><p>When reading configuration or operational data from a network
-device and a specific node, like a leaf or a class, is desired to be read, the yfilter attribute can
-be set to <code class="docutils literal"><span class="pre">YFilter.read</span></code> on that node.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.filters.YFilter.update">
-<code class="descname">update</code><a class="headerlink" href="#ydk.filters.YFilter.update" title="Permalink to this definition">¶</a></dt>
-<dd><p>The configuration data identified by the element
-containing this attribute updates any related configuration
-in the configuration datastore identified by the target
-parameter.  If no such configuration data exists in the
-configuration datastore, it is created.</p>
-<p><strong>Note.</strong> The <code class="docutils literal"><span class="pre">YFilter.update</span></code> is aplicable only to <a class="reference internal" href="services/gnmi_service.html#ydk.gnmi.services.gNMIService" title="ydk.gnmi.services.gNMIService"><code class="xref py py-class docutils literal"><span class="pre">gNMIService</span></code></a> <strong>set</strong> operation.</p>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="types.html" class="btn btn-neutral float-right" title="Types" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="providers/restconf_provider.html" class="btn btn-neutral" title="RESTCONF Service Provider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/annotation.html b/docs/api/path/annotation.html
deleted file mode 100644
index da16998b2..000000000
--- a/docs/api/path/annotation.html
+++ /dev/null
@@ -1,256 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Annotation &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Capability" href="capability.html"/>
-        <link rel="prev" title="YDK Path API" href="path.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Annotation</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="annotation"></span><h1>Annotation<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Annotation">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Annotation</code><span class="sig-paren">(</span><em>namespace</em>, <em>name</em>, <em>value</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Annotation" title="Permalink to this definition">¶</a></dt>
-<dd><p>An annotation has a namespace and a name and an associated value. Annotations are not defined in the YANG model and hence just provide a means of hanging some useful data to <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>. For example netconf edit-config rpc operation uses the annotation <code class="docutils literal"><span class="pre">nc:operation</span></code> (<code class="docutils literal"><span class="pre">nc</span></code> refers to the netconf namespace) on the data nodes to describe the kind of operation one needs to perform on the given <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>namespace</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Annotation namespace.</li>
-<li><strong>name</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Annotation name.</li>
-<li><strong>value</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Annotation value.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<p>Example usage:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Annotation</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">ann</span> <span class="o">=</span> <span class="n">Annotation</span><span class="p">(</span><span class="s1">&#39;ietf-netconf&#39;</span><span class="p">,</span> <span class="s1">&#39;operation&#39;</span><span class="p">,</span> <span class="s1">&#39;merge&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="capability.html" class="btn btn-neutral float-right" title="Capability" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="path.html" class="btn btn-neutral" title="YDK Path API" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/capability.html b/docs/api/path/capability.html
deleted file mode 100644
index a8088e2f7..000000000
--- a/docs/api/path/capability.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Capability &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Codec" href="codec.html"/>
-        <link rel="prev" title="Annotation" href="annotation.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Capability</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="capability"></span><h1>Capability<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Capability">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Capability</code><span class="sig-paren">(</span><em>model</em>, <em>revision</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Capability" title="Permalink to this definition">¶</a></dt>
-<dd><p>An instance of Capability is defined by the module name and revision.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>model</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Model name.</li>
-<li><strong>revision</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Model revision.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p>If no revision is provided, use empty string:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Capability</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">cap1</span> <span class="o">=</span> <span class="n">Capability</span><span class="p">(</span><span class="s1">&#39;openconfig-bgp&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">cap2</span> <span class="o">=</span> <span class="n">Capability</span><span class="p">(</span><span class="s1">&#39;openconfig-bgp&#39;</span><span class="p">,</span> <span class="s1">&#39;2015-10-09&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-</div>
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="codec.html" class="btn btn-neutral float-right" title="Codec" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="annotation.html" class="btn btn-neutral" title="Annotation" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/codec.html b/docs/api/path/codec.html
deleted file mode 100644
index fe31f9605..000000000
--- a/docs/api/path/codec.html
+++ /dev/null
@@ -1,290 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Codec &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="DataNode" href="data_node.html"/>
-        <link rel="prev" title="Capability" href="capability.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Codec</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="codec"></span><h1>Codec<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Codec">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Codec</code><a class="headerlink" href="#ydk.path.Codec" title="Permalink to this definition">¶</a></dt>
-<dd><p>YDK Path Codec provides encode and decode translations between string payload and <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>.</p>
-<dl class="method">
-<dt>
-<code class="descname">encode(data_node, encoding, pretty=True):</code></dt>
-<dd><p>Encodes data in <cite>data_node</cite> to string payload.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>data_node</strong> &#8211; <p>(<a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>) for single data node to encode.</p>
-<p>For multiple data nodes encapsulate <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> instances into Python <code class="docutils literal"><span class="pre">list</span></code>.</p>
-</li>
-<li><strong>encoding</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) Encoding format.</li>
-<li><strong>pretty</strong> &#8211; (<code class="docutils literal"><span class="pre">bool</span></code>) Pretty format.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">(<code class="docutils literal"><span class="pre">str</span></code>) encoded payload.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><code class="docutils literal"><span class="pre">RuntimeError</span></code> with <a class="reference internal" href="../errors.html#ydk.errors.YCodecError" title="ydk.errors.YCodecError"><code class="xref py py-exc docutils literal"><span class="pre">YCodecError</span></code></a> prefix, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">decode(root_schema_node, payload, encoding):</code></dt>
-<dd><p>Decodes payload string into <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> instance.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>root_schema_node</strong> &#8211; (<a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a>) An instance of <cite>root_schema_node</cite>.</li>
-<li><strong>payload</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Payload to decode.</li>
-<li><strong>encoding</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) Encoding format.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">(<a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>) instance of a <cite>data-node</cite>.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><code class="docutils literal"><span class="pre">RuntimeError</span></code> with <a class="reference internal" href="../errors.html#ydk.errors.YCodecError" title="ydk.errors.YCodecError"><code class="xref py py-exc docutils literal"><span class="pre">YCodecError</span></code></a> prefix, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="data_node.html" class="btn btn-neutral float-right" title="DataNode" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="capability.html" class="btn btn-neutral" title="Capability" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/data_node.html b/docs/api/path/data_node.html
deleted file mode 100644
index 872c39fc2..000000000
--- a/docs/api/path/data_node.html
+++ /dev/null
@@ -1,468 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>DataNode &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Repository" href="repository.html"/>
-        <link rel="prev" title="Codec" href="codec.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>DataNode</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="datanode"></span><h1>DataNode<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.DataNode">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">DataNode</code><a class="headerlink" href="#ydk.path.DataNode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Class represents a Path API&#8217;s DataNode.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p>The Python DataNode is wrapper for YDK C++ DataNode implementation. No constructor is defined and the user could not instantiate a <code class="docutils literal"><span class="pre">DataNode</span></code> instance. However, the user could get an instance of <code class="docutils literal"><span class="pre">DataNode</span></code> through <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a>:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;127.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="mi">830</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>                               <span class="c1"># &lt;-- root_schema is an instance of RootSchemaNode</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">bgp</span> <span class="o">=</span> <span class="n">root_schema</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;openconfig-bgp:bgp&#39;</span><span class="p">)</span>               <span class="c1"># &lt;-- bgp is an instance of DataNode</span>
-</pre></div>
-</div>
-</div>
-<dl class="method">
-<dt id="ydk.path.DataNode.add_annotation">
-<code class="descname">add_annotation</code><span class="sig-paren">(</span><em>annotation</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.add_annotation" title="Permalink to this definition">¶</a></dt>
-<dd><p>This method adds the annotation to this Datanode.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>annotation</strong> &#8211; (<a class="reference internal" href="annotation.html#ydk.path.Annotation" title="ydk.path.Annotation"><code class="xref py py-class docutils literal"><span class="pre">Annotation</span></code></a>) Annotation to be added.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">YInvalidArgumentError in case the argument is invalid.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.annotations">
-<code class="descname">annotations</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.annotations" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the annotations associated with this data node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of annotations for this data node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">list of <a class="reference internal" href="annotation.html#ydk.path.Annotation" title="ydk.path.Annotation"><code class="xref py py-class docutils literal"><span class="pre">Annotation</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.get_children">
-<code class="descname">get_children</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.get_children" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return list of children for this data node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of data node children.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">list of <a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.create_datanode">
-<code class="descname">create_datanode</code><span class="sig-paren">(</span><em>path</em>, <em>value=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.create_datanode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a DataNode corresponding to the path and set its value, if provided.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The XPath expression identifying the node.</li>
-<li><strong>value</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The value to be set.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">YPathError in case the path is invalid;
-YInvalidArgumentError in case the argument is invalid.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.create_action">
-<code class="descname">create_action</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.create_action" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create a DataNode representing a YANG 1.1 action corresponding to the path and set its value, if provided.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The XPath expression identifying the node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">YPathError in case the path is invalid.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body">YInvalidArgumentError in case the argument is invalid.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.__call__">
-<code class="descname">__call__</code><span class="sig-paren">(</span><em>service_provider</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.__call__" title="Permalink to this definition">¶</a></dt>
-<dd><p>Execute/Invoke the DataNode containing a YANG 1.1 action through the given service provider.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>service_provider</strong> &#8211; (<code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code>) The Service provider.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> instance if succeed.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">None or <a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a></td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">YError in case the path is invalid or DataNode contains no action nodes.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.find">
-<code class="descname">find</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.find" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds nodes that satisfy the given path expression. For details about the path expression see <a class="reference internal" href="../../guides/path.html#howto-path"><span class="std std-ref">How do I use the Path API?</span></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The path expression.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Data node satisfy the path expression supplied.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">list of <a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.get_value">
-<code class="descname">get_value</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.get_value" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns this data node&#8217;s value.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Value of this data node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">A Python string</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.get_path">
-<code class="descname">get_path</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.get_path" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the path expression representing this Node in in the NodeTree.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Path to this data node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">A Python string</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.remove_annotation">
-<code class="descname">remove_annotation</code><span class="sig-paren">(</span><em>annotation</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.remove_annotation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Remove given annotation for this node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>annotation</strong> &#8211; (<a class="reference internal" href="annotation.html#ydk.path.Annotation" title="ydk.path.Annotation"><code class="xref py py-class docutils literal"><span class="pre">Annotation</span></code></a>) Annotation to be removed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">If <code class="docutils literal"><span class="pre">True</span></code> the annotation was found and removed, <code class="docutils literal"><span class="pre">False</span></code> otherwise.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">bool</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.get_root">
-<code class="descname">get_root</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.get_root" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the root data node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Root data node of current data node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.get_schema_node">
-<code class="descname">get_schema_node</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.get_schema_node" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get <a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a> associated with this <a class="reference internal" href="#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.DataNode.set_value">
-<code class="descname">set_value</code><span class="sig-paren">(</span><em>value</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.DataNode.set_value" title="Permalink to this definition">¶</a></dt>
-<dd><div class="admonition note">
-<p class="first admonition-title">Note</p>
-<ul class="last simple">
-<li>The DataNode should represent a <code class="docutils literal"><span class="pre">leaf</span></code> , <code class="docutils literal"><span class="pre">leaf-list</span></code> or <code class="docutils literal"><span class="pre">anyxml</span></code> element for this to work. The value should be the string representation of the type of according to the schema.</li>
-<li>This method does not validate the value being set.</li>
-</ul>
-</div>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>value</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The value to set. This should be the string representation of the YANG type.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">YInvalidArgumentError if the its value cannot be set (for example it represents a container).</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="repository.html" class="btn btn-neutral float-right" title="Repository" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="codec.html" class="btn btn-neutral" title="Codec" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/gnmi_session.html b/docs/api/path/gnmi_session.html
deleted file mode 100644
index b13a42ef4..000000000
--- a/docs/api/path/gnmi_session.html
+++ /dev/null
@@ -1,306 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>gNMISession &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Questions and Answers" href="../../faq.html"/>
-        <link rel="prev" title="RestconfSession" href="restconf_session.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>gNMISession</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.gnmi.path">
-<span id="gnmisession"></span><h1>gNMISession<a class="headerlink" href="#module-ydk.gnmi.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.gnmi.path.gNMISession">
-<em class="property">class </em><code class="descclassname">ydk.gnmi.path.</code><code class="descname">gNMISession</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>port=57400</em>, <em>username</em>, <em>password</em>, <em>server_certificate=&quot;&quot;</em>, <em>private_key=&quot;&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.path.gNMISession" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>repo</strong> &#8211; Instance of <a class="reference internal" href="repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a> with path to local directory containing the the <a class="reference external" href="https://raw.githubusercontent.com/CiscoDevNet/ydk-gen/1344b3f22d746764f17536ac4e666836de4ba84d/sdk/cpp/core/tests/models/ydk%402016-02-26.yang">ydk yang model</a> along with all the yang models supported on the gNMI server.</li>
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Host address of the device supporting a gNMI interface</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>)Port on which the gNMI interface can be accessed on the device. If not specified, the default value of <code class="docutils literal"><span class="pre">57400</span></code> is assigned.</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username.</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password.</li>
-<li><strong>server_certificate</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Full path to a file, which contains server certificate of authorization (public key). If not specified, it is assumed non-secure connection to gNMI server.</li>
-<li><strong>private_key</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Full path to a file, which contains private key of the application host. If not specified and <strong>server_certificate</strong> is defined (secure connection), the GRPC internally defined private key is used.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.gnmi.path.gNMISession.get_root_schema">
-<code class="descname">get_root_schema</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.path.gNMISession.get_root_schema" title="Permalink to this definition">¶</a></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code> for this gNMI session.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.gnmi.path.gNMISession.invoke">
-<code class="descname">invoke</code><span class="sig-paren">(</span><em>rpc</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.path.gNMISession.invoke" title="Permalink to this definition">¶</a></dt>
-<dd><p>Executes gNMI RPCs <strong>gnmi-set</strong>, <strong>gnmi-get</strong>, and <strong>gnmi-caps</strong>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>rpc</strong> &#8211; (<a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>) RPC to be executed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code> for <strong>gnmi-get</strong> RPC, or <code class="docutils literal"><span class="pre">None</span></code> otherwise.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.gnmi.path.gNMISession.subscribe">
-<code class="descname">subscribe</code><span class="sig-paren">(</span><em>rpc</em>, <em>output_callback_function=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.path.gNMISession.subscribe" title="Permalink to this definition">¶</a></dt>
-<dd><p>Executes <strong>gnmi-subscribe</strong> RPC. Returns subscription data over specified callback.</p>
-<blockquote>
-<div><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">param rpc:</th><td class="field-body">(<a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>) RPC to be executed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name" colspan="2">param output_callback_function:</th></tr>
-<tr class="field-even field"><td>&#160;</td><td class="field-body">(<code class="docutils literal"><span class="pre">func(str)</span></code>) Callback function, which is used to process the subscription data.
-The subscription data returned to the user as a string representation of protobuf <strong>SubscribeResponse</strong> message.
-If not specified, the response is printed to system stdout.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">returns:</th><td class="field-body">None.</td>
-</tr>
-</tbody>
-</table>
-</div></blockquote>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="../../faq.html" class="btn btn-neutral float-right" title="Questions and Answers" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="restconf_session.html" class="btn btn-neutral" title="RestconfSession" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/netconf_session.html b/docs/api/path/netconf_session.html
deleted file mode 100644
index d4882dedb..000000000
--- a/docs/api/path/netconf_session.html
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>NetconfSession &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="RestconfSession" href="restconf_session.html"/>
-        <link rel="prev" title="Statement" href="statement.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>NetconfSession</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="netconfsession"></span><h1>NetconfSession<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.NetconfSession">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">NetconfSession</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>username</em>, <em>password</em>, <em>port=830</em>, <em>protocol=&quot;ssh&quot;</em>, <em>on_demand=True</em>, <em>common_cache=False</em>, <em>int timeout=None</em>, <em>repo=None</em>, <em>private_key_path=&quot;&quot;</em>, <em>public_key_path=&quot;&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.NetconfSession" title="Permalink to this definition">¶</a></dt>
-<dd><p>Constructs an instance of the <cite>NetconfSession</cite> class and connects to Netconf server, which <strong>must</strong> support model download.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) IP address or DNS name of device, which supports Netconf server; required parameter.</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username to log in to the device; required parameter.</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password to log in to the device; not required, if <cite>public_key_path</cite> specified.</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) Device port number, which is used to access the Netconf interface; default value is 830.</li>
-<li><strong>protocol</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Currently supported &#8220;ssh&#8221; for secure connection and &#8220;tcp&#8221; for insecure connection; default - &#8220;ssh&#8221;.</li>
-<li><strong>on_demand</strong> &#8211; (<code class="docutils literal"><span class="pre">bool</span></code>) On demand model downloading by default.</li>
-<li><strong>common_cache</strong> &#8211; (<code class="docutils literal"><span class="pre">bool</span></code>) Use common cache directory, if enabled.</li>
-<li><strong>timeout</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) The timeout in microseconds: None or -1 for infinite timeout, 0 - for non-blocking.</li>
-<li><strong>repo</strong> &#8211; (<a class="reference internal" href="repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) User provided repository - directory, which stores cached YANG models.
-If not specified, the temporary repository at &#8220;~/.ydk/&lt;address&gt;&#8221; is created.</li>
-<li><strong>private_key_path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Path to private key file. This is optional parameter, which requires <cite>public_key_path</cite> field.</li>
-<li><strong>public_key_path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Path to public key file. This is optional parameter.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.path.NetconfSession.get_root_schema">
-<code class="descname">get_root_schema</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.NetconfSession.get_root_schema" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> for this Netconf session.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> for this Netconf session.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.NetconfSession.invoke">
-<code class="descname">invoke</code><span class="sig-paren">(</span><em>rpc</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.NetconfSession.invoke" title="Permalink to this definition">¶</a></dt>
-<dd><p>Invokes or executes the given RPC and returns a <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> pointer, if the RPC has an output modeled in YANG.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>rpc</strong> &#8211; (<a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>) Given RPC to be executed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">invoke</code><span class="sig-paren">(</span><em>datanode</em><span class="sig-paren">)</span></dt>
-<dd><p>Invokes or executes the given DataNode and returns a <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> pointer if the action has an output modeled in YANG.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>datanode</strong> &#8211; (<a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>) Given DataNode containing YANG 1.1 action to be executed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.NetconfSession.execute_netconf_operation">
-<code class="descname">execute_netconf_operation</code><span class="sig-paren">(</span><em>rpc</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.NetconfSession.execute_netconf_operation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Sends specified RPC to device (similar to <cite>invoke</cite> function) and returns device response as XML encoded string.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>rpc</strong> &#8211; (<a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>) The RPC to be executed.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">str</span></code> - reply from device in XML encoded string.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.NetconfSession.get_capabilities">
-<code class="descname">get_capabilities</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.NetconfSession.get_capabilities" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of capabilities for the Netconf server.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A list of <code class="docutils literal"><span class="pre">str</span></code> representing the Netconf server capabilities.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="restconf_session.html" class="btn btn-neutral float-right" title="RestconfSession" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="statement.html" class="btn btn-neutral" title="Statement" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/path.html b/docs/api/path/path.html
deleted file mode 100644
index e5dab2f44..000000000
--- a/docs/api/path/path.html
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>YDK Path API &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="API Guide" href="../../api_guide.html"/>
-        <link rel="next" title="Annotation" href="annotation.html"/>
-        <link rel="prev" title="Errors" href="../errors.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">YDK Path API</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-    <li>YDK Path API</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="ydk-path-api"></span><span id="path-api-guide"></span><h1>YDK Path API<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<p>This module contains details about the YDK Python Path API.</p>
-<p>YDK Python provides a new interface in the form of Path API, which can be used to write apps using a generic API, using xpath-like path expressions to create and access YANG data nodes. As a related note, the nodes created using the YDK model API are converted to Path API data nodes for validation and encoding to respective protocol payloads.</p>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l1"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l1"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l1"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l1"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l1"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l1"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l1"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l1"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l1"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l1"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="annotation.html" class="btn btn-neutral float-right" title="Annotation" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../errors.html" class="btn btn-neutral" title="Errors" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/repository.html b/docs/api/path/repository.html
deleted file mode 100644
index 530e954cd..000000000
--- a/docs/api/path/repository.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Repository &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="RootSchemaNode" href="root_schema_node.html"/>
-        <link rel="prev" title="DataNode" href="data_node.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Repository</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="repository"></span><h1>Repository<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Repository">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Repository</code><span class="sig-paren">(</span><em>*args</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Repository" title="Permalink to this definition">¶</a></dt>
-<dd><p>Repository is used to create a <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> given a set of Capabilities. Behind the scenes the repository is responsible for loading and parsing the YANG modules and creating the <a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a> tree. Service provider is expected to use the method <a class="reference internal" href="#ydk.path.Repository.create_root_schema" title="ydk.path.Repository.create_root_schema"><code class="xref py py-meth docutils literal"><span class="pre">create_root_schema</span></code></a> to generate the <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>args</strong> &#8211; Search directory of type <code class="docutils literal"><span class="pre">str</span></code> or nothing.</td>
-</tr>
-</tbody>
-</table>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p>If a directory path of type <code class="docutils literal"><span class="pre">str</span></code> is provided, model search path will be located in this path, otherwise, default location <code class="docutils literal"><span class="pre">~/.cache/ydk</span></code> will be used. Example usage:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">os</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">repo_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">expanduser</span><span class="p">(</span><span class="s1">&#39;~&#39;</span><span class="p">),</span> <span class="s1">&#39;Cisco&#39;</span><span class="p">,</span> <span class="s1">&#39;yang&#39;</span><span class="p">)</span> <span class="c1"># this directory should exist</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">default_repo</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">()</span>                                        <span class="c1"># repository using default location</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">custom_repo</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="n">repo_path</span><span class="p">)</span>                                <span class="c1"># custom repository</span>
-</pre></div>
-</div>
-</div>
-<dl class="method">
-<dt id="ydk.path.Repository.create_root_schema">
-<code class="descname">create_root_schema</code><span class="sig-paren">(</span><em>capabilities</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Repository.create_root_schema" title="Permalink to this definition">¶</a></dt>
-<dd><p>Creates the root schema based on the capabilities passed in.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>capabilities</strong> &#8211; (list of <a class="reference internal" href="capability.html#ydk.path.Capability" title="ydk.path.Capability"><code class="xref py py-class docutils literal"><span class="pre">Capability</span></code></a>) Enabled capabilities.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">create_root_schema</code><span class="sig-paren">(</span><em>lookup_tables</em>, <em>capabilities</em><span class="sig-paren">)</span></dt>
-<dd><p>Creates the root schema based on capability lookup tables and capabilities passed in.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>lookup_tables</strong> &#8211; (list of map of string and <a class="reference internal" href="capability.html#ydk.path.Capability" title="ydk.path.Capability"><code class="xref py py-class docutils literal"><span class="pre">Capability</span></code></a>) Lookup tables.</li>
-<li><strong>capabilities</strong> &#8211; (list of <a class="reference internal" href="capability.html#ydk.path.Capability" title="ydk.path.Capability"><code class="xref py py-class docutils literal"><span class="pre">Capability</span></code></a>) Enabled capabilities.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="root_schema_node.html" class="btn btn-neutral float-right" title="RootSchemaNode" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="data_node.html" class="btn btn-neutral" title="DataNode" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/restconf_session.html b/docs/api/path/restconf_session.html
deleted file mode 100644
index 6701ef1c7..000000000
--- a/docs/api/path/restconf_session.html
+++ /dev/null
@@ -1,307 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>RestconfSession &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="gNMISession" href="gnmi_session.html"/>
-        <link rel="prev" title="NetconfSession" href="netconf_session.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>RestconfSession</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="restconfsession"></span><h1>RestconfSession<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.RestconfSession">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">RestconfSession</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>username</em>, <em>password</em>, <em>port=80</em>, <em>encoding=EncodingFormat.JSON</em>, <em>config_url_root=&quot;/data&quot;</em>, <em>state_url_root=&quot;/data&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RestconfSession" title="Permalink to this definition">¶</a></dt>
-<dd><blockquote>
-<div><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">param repo:</th><td class="field-body">(<a class="reference internal" href="repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) Defines location of YANG model repository.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">param address:</th><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) IP address or DNC name of the device supporting Netconf interface.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">param username:</th><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) Username to log in to the device.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">param password:</th><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) Password to log in to the device.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">param port:</th><td class="field-body">(<code class="docutils literal"><span class="pre">int</span></code>) Type of encoding to be used for the payload. Default is 80.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">param encoding:</th><td class="field-body">(<a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) Encoding Format, default is <a class="reference internal" href="../types.html#ydk.types.EncodingFormat.JSON" title="ydk.types.EncodingFormat.JSON"><code class="xref py py-attr docutils literal"><span class="pre">JSON</span></code></a>.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name" colspan="2">param config_url_root:</th></tr>
-<tr class="field-odd field"><td>&#160;</td><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) To provider backwards compatibility with older drafts of Restconf RFC, this can be &#8220;/config&#8221; or &#8220;/data&#8221; (which is the default).</td>
-</tr>
-<tr class="field-even field"><th class="field-name" colspan="2">param state_url_root:</th></tr>
-<tr class="field-even field"><td>&#160;</td><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) To provider backwards compatibility with older drafts of Restconf RFC, this can be &#8220;/operational&#8221; or &#8220;/data&#8221; (which is the default)</td>
-</tr>
-</tbody>
-</table>
-</div></blockquote>
-<dl class="method">
-<dt id="ydk.path.RestconfSession.get_root_schema">
-<code class="descname">get_root_schema</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RestconfSession.get_root_schema" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> tree supported by this instance of the <a class="reference internal" href="#ydk.path.RestconfSession" title="ydk.path.RestconfSession"><code class="xref py py-class docutils literal"><span class="pre">RestconfSession</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Pointer to the <a class="reference internal" href="root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> or <code class="docutils literal"><span class="pre">None</span></code>, if one was not created.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RestconfSession.invoke">
-<code class="descname">invoke</code><span class="sig-paren">(</span><em>rpc</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RestconfSession.invoke" title="Permalink to this definition">¶</a></dt>
-<dd><p>Invokes or executes the given rpc and returns a <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> pointer if the <a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a> has an output modelled in YANG.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>rpc</strong> &#8211; (<a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>)</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Pointer to the <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> representing the output.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RestconfSession.get_capabilities">
-<code class="descname">get_capabilities</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RestconfSession.get_capabilities" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of capabilities for the Restconf server.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A list of <code class="docutils literal"><span class="pre">str</span></code> representing the Restconf server capabilities.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="gnmi_session.html" class="btn btn-neutral float-right" title="gNMISession" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="netconf_session.html" class="btn btn-neutral" title="NetconfSession" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/root_schema_node.html b/docs/api/path/root_schema_node.html
deleted file mode 100644
index 063131cd1..000000000
--- a/docs/api/path/root_schema_node.html
+++ /dev/null
@@ -1,355 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>RootSchemaNode &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Rpc" href="rpc.html"/>
-        <link rel="prev" title="Repository" href="repository.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>RootSchemaNode</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="rootschemanode"></span><h1>RootSchemaNode<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.RootSchemaNode">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">RootSchemaNode</code><a class="headerlink" href="#ydk.path.RootSchemaNode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Instances of this class represent the <code class="docutils literal"><span class="pre">Root</span></code> of the <code class="docutils literal"><span class="pre">SchemaTree</span></code>. A <code class="docutils literal"><span class="pre">RootSchemaNode</span></code> can be used to instantiate a <code class="docutils literal"><span class="pre">DataNode</span></code> tree or an <code class="docutils literal"><span class="pre">Rpc</span></code> object. The children of the <code class="docutils literal"><span class="pre">RootSchemaNode</span></code> represent the top level <code class="docutils literal"><span class="pre">SchemaNode</span></code> in the YANG module submodules.</p>
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.create_datanode">
-<code class="descname">create_datanode</code><span class="sig-paren">(</span><em>path</em>, <em>value=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.create_datanode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create data node with path and value.
-This methods creates a <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> tree based on the path passed in. The path expression must identify a single node. If the last node created is of schema type <code class="docutils literal"><span class="pre">list</span></code>, <code class="docutils literal"><span class="pre">leaf-list</span></code> or <code class="docutils literal"><span class="pre">anyxml</span></code> that value is also set in the node.</p>
-<p>The returned <code class="docutils literal"><span class="pre">DataNode</span></code> is the last node created (the terminal part of the path).</p>
-<p>Note in the case of YANG <code class="docutils literal"><span class="pre">list</span></code> nodes the keys must be present in the path expression in the form of predicates.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The XPath expression identifying the node relative to the root of the schema tree.</li>
-<li><strong>value</strong> &#8211; The string representation of the value to set.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.find">
-<code class="descname">find</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.find" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds descendant nodes that match the given xpath expression.</p>
-<p>This API finds descendant nodes in the <code class="docutils literal"><span class="pre">SchemaNode</span></code> tree that satisfy the given path expression. See <a class="reference internal" href="../../guides/path.html#howto-path"><span class="std std-ref">How do I use the Path API?</span></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The path expression.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">List of schema node satisfies the criterion.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">list of <a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.get_parent">
-<code class="descname">get_parent</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.get_parent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get parent.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">RootSchemaNode</span></code>&#8216;s parent, which is <code class="docutils literal"><span class="pre">None</span></code>.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">None</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.get_path">
-<code class="descname">get_path</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.get_path" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get path.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">RootSchemaNode</span></code>&#8216;s path, which is <code class="docutils literal"><span class="pre">\</span></code>.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">A Python string</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.get_root">
-<code class="descname">get_root</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.get_root" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the root schema node for <code class="docutils literal"><span class="pre">RootSchemaNode</span></code>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">RootSchemaNode</span></code>&#8216;s Root schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.RootSchemaNode.create_rpc">
-<code class="descname">create_rpc</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.RootSchemaNode.create_rpc" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create an Rpc instance.</p>
-<p>The path expression should point to a <a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a> that represents the <a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The path to the rpc schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Rpc instance if it could be created.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">None or <a class="reference internal" href="rpc.html#ydk.path.Rpc" title="ydk.path.Rpc"><code class="xref py py-class docutils literal"><span class="pre">Rpc</span></code></a></td>
-</tr>
-</tbody>
-</table>
-<p>Excample usage for creating a <code class="docutils literal"><span class="pre">ydk:create</span></code> rpc:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;127.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-<span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>
-<span class="n">root_schema</span><span class="o">.</span><span class="n">create_rpc</span><span class="p">(</span><span class="s1">&#39;ydk:create&#39;</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="rpc.html" class="btn btn-neutral float-right" title="Rpc" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="repository.html" class="btn btn-neutral" title="Repository" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/rpc.html b/docs/api/path/rpc.html
deleted file mode 100644
index 92a1ca18b..000000000
--- a/docs/api/path/rpc.html
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Rpc &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="SchemaNode" href="schema_node.html"/>
-        <link rel="prev" title="RootSchemaNode" href="root_schema_node.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Rpc</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="rpc"></span><h1>Rpc<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Rpc">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Rpc</code><a class="headerlink" href="#ydk.path.Rpc" title="Permalink to this definition">¶</a></dt>
-<dd><p>Instances of this class represent a YANG rpc and are modelled as Callables. The input data node tree is used to populate the input parameters to the rpc if any. The Callable takes as a parameter the <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> that can execute this rpc as its parameter returning a <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> instance if output is available.</p>
-<dl class="method">
-<dt id="ydk.path.Rpc.__call__">
-<code class="descname">__call__</code><span class="sig-paren">(</span><em>service_provider</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Rpc.__call__" title="Permalink to this definition">¶</a></dt>
-<dd><p>Execute/Invoke the rpc through the given service provider.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>service_provider</strong> &#8211; (<code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code>) The Service provider.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> instance if succeed.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">None or <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.Rpc.get_input_node">
-<code class="descname">get_input_node</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Rpc.get_input_node" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the input data tree.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> representing the input data tree or <code class="docutils literal"><span class="pre">None</span></code> if the rpc does not have an input element in the schema.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a> or <code class="docutils literal"><span class="pre">None</span></code></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.Rpc.get_schema_node">
-<code class="descname">get_schema_node</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Rpc.get_schema_node" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get schema node for this rpc.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Schema node associated with this rpc.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="schema_node.html#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="schema_node.html" class="btn btn-neutral float-right" title="SchemaNode" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="root_schema_node.html" class="btn btn-neutral" title="RootSchemaNode" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/schema_node.html b/docs/api/path/schema_node.html
deleted file mode 100644
index 73380755a..000000000
--- a/docs/api/path/schema_node.html
+++ /dev/null
@@ -1,353 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>SchemaNode &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="Statement" href="statement.html"/>
-        <link rel="prev" title="Rpc" href="rpc.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">SchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="statement.html">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>SchemaNode</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="schemanode"></span><h1>SchemaNode<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.SchemaNode">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">SchemaNode</code><a class="headerlink" href="#ydk.path.SchemaNode" title="Permalink to this definition">¶</a></dt>
-<dd><blockquote>
-<div><p>Class represents a Node in the SchemaTree.</p>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p>The Python SchemaNode is wrapper for YDK C++ SchemaNode implementation. No constructor is defined and the user could not instantiate a <code class="docutils literal"><span class="pre">SchemaNode</span></code> instance. However, the user could get an instance of <code class="docutils literal"><span class="pre">SchemaNode</span></code> through <a class="reference internal" href="data_node.html#ydk.path.DataNode" title="ydk.path.DataNode"><code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code></a>:</p>
-<div class="last highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;127.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="mi">830</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>                               <span class="c1"># &lt;-- root_schema is an instance of RootSchemaNode</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">bgp</span> <span class="o">=</span> <span class="n">root_schema</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;openconfig-bgp:bgp&#39;</span><span class="p">)</span>               <span class="c1"># &lt;-- bgp is an instance of DataNode</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">schema_node</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">get_schema_node</span><span class="p">()</span>                                   <span class="c1"># &lt;-- schema node for bgp</span>
-</pre></div>
-</div>
-</div>
-<dl class="method">
-<dt id="ydk.path.SchemaNode.find">
-<code class="descname">find</code><span class="sig-paren">(</span><em>path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.find" title="Permalink to this definition">¶</a></dt>
-<dd><p>Finds descendant nodes that match the given xpath expression. This API finds descendant nodes in the schema node tree that satisfy the given path expression. See <a class="reference internal" href="../../guides/path.html#howto-path"><span class="std std-ref">How do I use the Path API?</span></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The path expression.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">List of schema node satisfies the criterion.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Return type:</th><td class="field-body">list of <a class="reference internal" href="#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">YPathError, if the path expression in invalid, see error code for details.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body">YInvalidArgumentError, if the argument is invalid.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</div></blockquote>
-<dl class="method">
-<dt id="ydk.path.SchemaNode.get_keys">
-<code class="descname">get_keys</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.get_keys" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns vector of YANG <a class="reference internal" href="statement.html#ydk.path.Statement" title="ydk.path.Statement"><code class="xref py py-class docutils literal"><span class="pre">Statement</span></code></a>, which represents keys for the list node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of statements of type <code class="xref cpp cpp-class docutils literal"><span class="pre">Statement</span></code>, which represents list node keys.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.SchemaNode.get_parent">
-<code class="descname">get_parent</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.get_parent" title="Permalink to this definition">¶</a></dt>
-<dd><blockquote>
-<div><p>Get the parent node of this schema node in the tree.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">return:</th><td class="field-body">Parent schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">rtype:</th><td class="field-body"><a class="reference internal" href="#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</div></blockquote>
-<dl class="method">
-<dt id="ydk.path.SchemaNode.get_path">
-<code class="descname">get_path</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.get_path" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the path expression representing this schema node in in the schema node tree.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Path to this schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body">A Python string</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.SchemaNode.get_root">
-<code class="descname">get_root</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.get_root" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get the root schema node of current schema node.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">Root schema node of current schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="#ydk.path.SchemaNode" title="ydk.path.SchemaNode"><code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.path.SchemaNode.get_statement">
-<code class="descname">get_statement</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.SchemaNode.get_statement" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get current schema node&#8217;s YANG statement.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">YANG statements for this schema node.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><a class="reference internal" href="statement.html#ydk.path.Statement" title="ydk.path.Statement"><code class="xref py py-class docutils literal"><span class="pre">Statement</span></code></a></td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="statement.html" class="btn btn-neutral float-right" title="Statement" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="rpc.html" class="btn btn-neutral" title="Rpc" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/path/statement.html b/docs/api/path/statement.html
deleted file mode 100644
index 4231be606..000000000
--- a/docs/api/path/statement.html
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Statement &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK Path API" href="path.html"/>
-        <link rel="next" title="NetconfSession" href="netconf_session.html"/>
-        <link rel="prev" title="SchemaNode" href="schema_node.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="../class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2 current"><a class="reference internal" href="path.html">YDK Path API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="annotation.html">Annotation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="capability.html">Capability</a></li>
-<li class="toctree-l3"><a class="reference internal" href="codec.html">Codec</a></li>
-<li class="toctree-l3"><a class="reference internal" href="data_node.html">DataNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="repository.html">Repository</a></li>
-<li class="toctree-l3"><a class="reference internal" href="root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l3"><a class="reference internal" href="rpc.html">Rpc</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema_node.html">SchemaNode</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Statement</a></li>
-<li class="toctree-l3"><a class="reference internal" href="netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l3"><a class="reference internal" href="gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="path.html">YDK Path API</a> &raquo;</li>
-      
-    <li>Statement</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.path">
-<span id="statement"></span><h1>Statement<a class="headerlink" href="#module-ydk.path" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.path.Statement">
-<em class="property">class </em><code class="descclassname">ydk.path.</code><code class="descname">Statement</code><span class="sig-paren">(</span><em>keyword</em>, <em>arg</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.path.Statement" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents the YANG Statement.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>keyword</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) YANG keyword.</li>
-<li><strong>arg</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) YANG argument.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="attribute">
-<dt id="ydk.path.Statement.keyword">
-<code class="descname">keyword</code><a class="headerlink" href="#ydk.path.Statement.keyword" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read only attribute for YANG keyword.</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.path.Statement.arg">
-<code class="descname">arg</code><a class="headerlink" href="#ydk.path.Statement.arg" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read only attribute for YANG argument.</p>
-</dd></dl>
-
-<p>Example usage for creating a statement:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Statement</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">s</span> <span class="o">=</span> <span class="n">Statement</span><span class="p">(</span><span class="s1">&#39;container&#39;</span><span class="p">,</span> <span class="s1">&#39;bgp&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-<p>Example usage for getting statement from schema node:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;127.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="mi">830</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>                               <span class="c1"># &lt;-- root_schema is an instance of RootSchemaNode</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">bgp</span> <span class="o">=</span> <span class="n">root_schema</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;openconfig-bgp:bgp&#39;</span><span class="p">)</span>               <span class="c1"># &lt;-- bgp is an instance of DataNode</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">schema_node</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">get_schema_node</span><span class="p">()</span>                                   <span class="c1"># &lt;-- schema node for bgp</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">statement</span> <span class="o">=</span> <span class="n">schema_node</span><span class="o">.</span><span class="n">get_statement</span><span class="p">()</span>                               <span class="c1"># &lt;-- YANG statement for this schema node</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">statement</span><span class="o">.</span><span class="n">keyword</span>
-<span class="go">&#39;container&#39;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">statement</span><span class="o">.</span><span class="n">arg</span>
-<span class="go">&#39;bgp&#39;</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="netconf_session.html" class="btn btn-neutral float-right" title="NetconfSession" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="schema_node.html" class="btn btn-neutral" title="SchemaNode" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/codec_provider.html b/docs/api/providers/codec_provider.html
deleted file mode 100644
index 04cb861ab..000000000
--- a/docs/api/providers/codec_provider.html
+++ /dev/null
@@ -1,287 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Codec Service Provider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="NETCONF Service Provider" href="netconf_provider.html"/>
-        <link rel="prev" title="ServiceProvider" href="service_provider.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>Codec Service Provider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="codec-service-provider">
-<h1>Codec Service Provider<a class="headerlink" href="#codec-service-provider" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.providers.CodecServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.providers.</code><code class="descname">CodecServiceProvider</code><span class="sig-paren">(</span><em>type=EncodingFormat.XML</em>, <em>repo=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.CodecServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>A provider to be used with <a class="reference internal" href="../services/codec_service.html#ydk.services.CodecService" title="ydk.services.CodecService"><code class="xref py py-class docutils literal"><span class="pre">CodecService</span></code></a> for performing encoding and decoding.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>type</strong> (<code class="docutils literal"><span class="pre">string</span></code> or <a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) &#8211; An argument specifies encoding format, could be a Python string (<code class="docutils literal"><span class="pre">xml</span></code> or <code class="docutils literal"><span class="pre">json</span></code>) or an instance of <a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>.</li>
-<li><strong>repo</strong> (<a class="reference internal" href="../path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) &#8211; User provided repository stores cached models.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.providers.CodecServiceProvider.get_root_schema">
-<code class="descname">get_root_schema</code><span class="sig-paren">(</span><em>bundle_name</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.CodecServiceProvider.get_root_schema" title="Permalink to this definition">¶</a></dt>
-<dd><p>Return root schema node for bundle_name defined in the &#8216;initialize&#8217; method.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>bundle_name</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Bundle name.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="../path/root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a> for this bundle.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.providers.CodecServiceProvider.initialize">
-<code class="descname">initialize</code><span class="sig-paren">(</span><em>bundle_name</em>, <em>models_path</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.CodecServiceProvider.initialize" title="Permalink to this definition">¶</a></dt>
-<dd><p>Initializes root schema in the user defined location of YANG models.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>bundle_name</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>): user defined bundle name.</li>
-<li><strong>models_path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>): location (directory) for local YANG models.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="netconf_provider.html" class="btn btn-neutral float-right" title="NETCONF Service Provider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="service_provider.html" class="btn btn-neutral" title="ServiceProvider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/gnmi_provider.html b/docs/api/providers/gnmi_provider.html
deleted file mode 100644
index f46a9311a..000000000
--- a/docs/api/providers/gnmi_provider.html
+++ /dev/null
@@ -1,326 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>gNMI Service Provider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="Opendaylight Service Provider" href="odl_provider.html"/>
-        <link rel="prev" title="NETCONF Service Provider" href="netconf_provider.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>gNMI Service Provider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="gnmi-service-provider">
-<h1>gNMI Service Provider<a class="headerlink" href="#gnmi-service-provider" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.gnmi.providers.gNMIServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.gnmi.providers.</code><code class="descname">gNMIServiceProvider</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>port=57400</em>, <em>username</em>, <em>password</em>, <em>server_certificate=&quot;&quot;</em>, <em>private_key=&quot;&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.providers.gNMIServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>A service provider, which allows YDK connect to a <a class="reference external" href="https://github.com/openconfig/gnmi">gNMI</a> server. By default, the provider works in non-secure mode (tls is off). In order to enable secure mode connection the user must provide the gNMI server certificate of authorization (public key) and optionally the client (YDK application host) private key.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>repo</strong> &#8211; Instance of <a class="reference internal" href="../path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a> with path to local directory containing the the <a class="reference external" href="https://raw.githubusercontent.com/CiscoDevNet/ydk-gen/1344b3f22d746764f17536ac4e666836de4ba84d/sdk/cpp/core/tests/models/ydk%402016-02-26.yang">ydk yang model</a> along with all the yang models supported on the gNMI server.</li>
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Host address of the device supporting a gNMI interface</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>)Port on which the gNMI interface can be accessed on the device. If not specified, the default value of <code class="docutils literal"><span class="pre">57400</span></code> is assigned.</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username.</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password.</li>
-<li><strong>server_certificate</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Full path to a file, which contains server certificate of authorization (public key). If not specified, it is assumed non-secure connection to gNMI server.</li>
-<li><strong>private_key</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Full path to a file, which contains private key of the application host. If not specified and <strong>server_certificate</strong> is defined (secure connection), the GRPC internally defined private key is used.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<div class="section" id="examples">
-<h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>To enable YDK logging include the following code:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span>
-<span class="normal">7</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">logging</span>
-<span class="n">logger</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="s2">&quot;ydk&quot;</span><span class="p">)</span>
-<span class="n">logger</span><span class="o">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">)</span>
-<span class="n">handler</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">StreamHandler</span><span class="p">()</span>
-<span class="n">formatter</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">Formatter</span><span class="p">((</span><span class="s2">&quot;</span><span class="si">%(asctime)s</span><span class="s2"> - </span><span class="si">%(name)s</span><span class="s2"> - </span><span class="si">%(levelname)s</span><span class="s2"> - </span><span class="si">%(message)s</span><span class="s2">&quot;</span><span class="p">))</span>
-<span class="n">handler</span><span class="o">.</span><span class="n">setFormatter</span><span class="p">(</span><span class="n">formatter</span><span class="p">)</span>
-<span class="n">logger</span><span class="o">.</span><span class="n">addHandler</span><span class="p">(</span><span class="n">handler</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>To enable GRPC trace set environment variables as followed:</p>
-<div class="highlight-shell"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">GRPC_VERBOSITY</span><span class="o">=</span>debug
-<span class="nb">export</span> <span class="nv">GRPC_TRACE</span><span class="o">=</span>transport_security
-</pre></div>
-</td></tr></table></div>
-<p>To get server certificate, you need to retrieve the <strong>ems.pem</strong> file from the IOS XR device (after enabling gRPC/TLS)
-and put it to YDK application host in a folder, which is specific to the device.
-You can find the <strong>ems.pem</strong> file on the router in either <strong>/misc/config/grpc/</strong> or <strong>/var/xr/config/grpc</strong> folder.</p>
-<p>Example of instantiating and using objects of <code class="docutils literal"><span class="pre">gNMIServiceProvider</span></code> is shown below (assuming you have <code class="docutils literal"><span class="pre">openconfig</span></code> bundle installed).</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.providers</span> <span class="kn">import</span> <span class="n">gNMIServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CRUDService</span>
-
-<span class="c1"># Create repository with location of directory where yang models from the server are downloaded</span>
-<span class="n">repository</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s1">&#39;/Users/test/yang_models_location&#39;</span><span class="p">)</span>
-<span class="n">ca_file_path</span> <span class="o">=</span> <span class="s1">&#39;/Users/test/device-ip/ems.pem&#39;</span>
-
-<span class="c1"># Instantiate provider with non-secure connection to gNMI server</span>
-<span class="n">provider</span> <span class="o">=</span> <span class="n">gNMIServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="o">=</span><span class="n">repository</span><span class="p">,</span> <span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="mi">57400</span><span class="p">,</span>
-                               <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">server_certificate</span><span class="o">=</span><span class="n">ca_file_path</span><span class="p">)</span>
-
-<span class="c1"># Define filter</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># Run CRUD read opearaion</span>
-<span class="n">crud</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-<span class="n">bgp_read</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span> <span class="c1"># Perform read operation</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="odl_provider.html" class="btn btn-neutral float-right" title="Opendaylight Service Provider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="netconf_provider.html" class="btn btn-neutral" title="NETCONF Service Provider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/netconf_provider.html b/docs/api/providers/netconf_provider.html
deleted file mode 100644
index 26d29b8b9..000000000
--- a/docs/api/providers/netconf_provider.html
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>NETCONF Service Provider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="gNMI Service Provider" href="gnmi_provider.html"/>
-        <link rel="prev" title="Codec Service Provider" href="codec_provider.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>NETCONF Service Provider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="netconf-service-provider">
-<h1>NETCONF Service Provider<a class="headerlink" href="#netconf-service-provider" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.providers.NetconfServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.providers.</code><code class="descname">NetconfServiceProvider</code><span class="sig-paren">(</span><em>address</em>, <em>username</em>, <em>password=None</em>, <em>port=830</em>, <em>protocol='ssh'</em>, <em>timeout=-1</em>, <em>repo=None</em>, <em>private_key_path=&quot;&quot;</em>, <em>public_key_path=&quot;&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.NetconfServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>Constructs an instance of the <cite>NetconfServiceProvider</cite> class and connects to Netconf server via <a class="reference internal" href="../path/netconf_session.html#ydk.path.NetconfSession" title="ydk.path.NetconfSession"><code class="xref py py-class docutils literal"><span class="pre">NetconfSession</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) IP address or DNS name of device, which supports Netconf server; required parameter</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username to log in to the device; required parameter</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password to log in to the device</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) The Netconf server access port; defaults to 830</li>
-<li><strong>protocol</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Currently supported <cite>ssh</cite> for secure connection and <cite>tcp</cite> for insecure connection; default - <cite>ssh</cite></li>
-<li><strong>timeout</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking</li>
-<li><strong>repo</strong> &#8211; (<a class="reference internal" href="../path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) User provided repository - directory, which stores cached Yang models</li>
-<li><strong>private_key_path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Path to private key file. Requires public_key_path field.</li>
-<li><strong>public_key_path</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Path to public key file. Does not allow password field.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.providers.NetconfServiceProvider.get_encoding">
-<code class="descname">get_encoding</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.NetconfServiceProvider.get_encoding" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the type of encoding supported by the service provider.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.providers.NetconfServiceProvider.get_session">
-<code class="descname">get_session</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.NetconfServiceProvider.get_session" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the instance of the <a class="reference internal" href="../path/netconf_session.html#ydk.path.NetconfSession" title="ydk.path.NetconfSession"><code class="xref py py-class docutils literal"><span class="pre">NetconfSession</span></code></a> used to connect to the Netconf server</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A <a class="reference internal" href="../path/netconf_session.html#ydk.path.NetconfSession" title="ydk.path.NetconfSession"><code class="xref py py-class docutils literal"><span class="pre">NetconfSession</span></code></a> instance.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.providers.NetconfServiceProvider.get_capabilities">
-<code class="descname">get_capabilities</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.NetconfServiceProvider.get_capabilities" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of capabilities of the Netconf server</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A list of <code class="docutils literal"><span class="pre">str</span></code> representing the client&#8217;s/server&#8217;s capabilities</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="gnmi_provider.html" class="btn btn-neutral float-right" title="gNMI Service Provider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="codec_provider.html" class="btn btn-neutral" title="Codec Service Provider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/odl_provider.html b/docs/api/providers/odl_provider.html
deleted file mode 100644
index 124543f01..000000000
--- a/docs/api/providers/odl_provider.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Opendaylight Service Provider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="RESTCONF Service Provider" href="restconf_provider.html"/>
-        <link rel="prev" title="gNMI Service Provider" href="gnmi_provider.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>Opendaylight Service Provider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="opendaylight-service-provider">
-<h1>Opendaylight Service Provider<a class="headerlink" href="#opendaylight-service-provider" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.providers.OpendaylightServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.providers.</code><code class="descname">OpendaylightServiceProvider</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>username</em>, <em>password</em>, <em>port</em>, <em>encoding</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.OpendaylightServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>A service provider to be used to communicate with an OpenDaylight instance.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>repo</strong> &#8211; (<a class="reference internal" href="../path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) User provided repository stores cached models.</li>
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) IP address of the ODL instance</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username to log in to the instance</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password to log in to the instance</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) Device port used to access the ODL instance.</li>
-<li><strong>encoding</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) Type of encoding to be used for the payload. Default is <a class="reference internal" href="../types.html#ydk.types.EncodingFormat.JSON" title="ydk.types.EncodingFormat.JSON"><code class="xref py py-attr docutils literal"><span class="pre">JSON</span></code></a></li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.providers.OpendaylightServiceProvider.get_node_provider">
-<code class="descname">get_node_provider</code><span class="sig-paren">(</span><em>node_id</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.OpendaylightServiceProvider.get_node_provider" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the ServiceProvider instance corresponding to the device being controlled by the OpenDaylight instance, indicated by <code class="docutils literal"><span class="pre">node_id</span></code></p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>node_id</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) The name of the device being controlled by the OpenDaylight instance.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">One of supported service provider instance.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a> if no such service provider could be found.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.providers.OpendaylightServiceProvider.get_node_ids">
-<code class="descname">get_node_ids</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.OpendaylightServiceProvider.get_node_ids" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns a list of node ID’s of the devices being controlled by this OpenDaylight instance.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of node ID’s of the devices being controlled by this OpenDaylight instance.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="restconf_provider.html" class="btn btn-neutral float-right" title="RESTCONF Service Provider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="gnmi_provider.html" class="btn btn-neutral" title="gNMI Service Provider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/providers.html b/docs/api/providers/providers.html
deleted file mode 100644
index a0d13b986..000000000
--- a/docs/api/providers/providers.html
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Service Providers &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK API" href="../class_hierarchy.html"/>
-        <link rel="next" title="ServiceProvider" href="service_provider.html"/>
-        <link rel="prev" title="gNMI Service API" href="../services/gnmi_service.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Service Providers</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-    <li>Service Providers</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="service-providers">
-<span id="ydk-providers"></span><h1>Service Providers<a class="headerlink" href="#service-providers" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l1"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l1"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l1"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l1"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l1"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="service_provider.html" class="btn btn-neutral float-right" title="ServiceProvider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../services/gnmi_service.html" class="btn btn-neutral" title="gNMI Service API" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/restconf_provider.html b/docs/api/providers/restconf_provider.html
deleted file mode 100644
index 21439c4c9..000000000
--- a/docs/api/providers/restconf_provider.html
+++ /dev/null
@@ -1,277 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>RESTCONF Service Provider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="Filters" href="../filters.html"/>
-        <link rel="prev" title="Opendaylight Service Provider" href="odl_provider.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>RESTCONF Service Provider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="restconf-service-provider">
-<h1>RESTCONF Service Provider<a class="headerlink" href="#restconf-service-provider" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.providers.RestconfServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.providers.</code><code class="descname">RestconfServiceProvider</code><span class="sig-paren">(</span><em>repo</em>, <em>address</em>, <em>username</em>, <em>password</em>, <em>port</em>, <em>encoding</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.RestconfServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>Constructs an instance of the <code class="docutils literal"><span class="pre">RestconfServiceProvider</span></code> to connect to a server which has to support model download. Since the class is a Python wrapper for C++ <code class="docutils literal"><span class="pre">RestconfServiceProvider</span></code> class, which has clean up methods implemented in its destructor. The user does not need to worry about close RESTCONF session.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>repo</strong> &#8211; (<a class="reference internal" href="../path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a>) User provided repository stores cached models</li>
-<li><strong>address</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) IP address of the device supporting a restconf interface</li>
-<li><strong>username</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Username to log in to the device</li>
-<li><strong>password</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Password to log in to the device</li>
-<li><strong>port</strong> &#8211; (<code class="docutils literal"><span class="pre">int</span></code>) Device port used to access the restconf interface, the default value being 80</li>
-<li><strong>encoding</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.EncodingFormat" title="ydk.types.EncodingFormat"><code class="xref py py-class docutils literal"><span class="pre">EncodingFormat</span></code></a>) Type of encoding to be used for the payload, the default being <a class="reference internal" href="../types.html#ydk.types.EncodingFormat.JSON" title="ydk.types.EncodingFormat.JSON"><code class="xref py py-attr docutils literal"><span class="pre">JSON</span></code></a></li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt id="ydk.providers.RestconfServiceProvider.get_encoding">
-<code class="descname">get_encoding</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.RestconfServiceProvider.get_encoding" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the type of encoding supported by the service provider.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.providers.RestconfServiceProvider.get_session">
-<code class="descname">get_session</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.providers.RestconfServiceProvider.get_session" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns the instance of the <a class="reference internal" href="../path/netconf_session.html#ydk.path.NetconfSession" title="ydk.path.NetconfSession"><code class="xref py py-class docutils literal"><span class="pre">NetconfSession</span></code></a> used to connect to the netconf server</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">A <a class="reference internal" href="../path/netconf_session.html#ydk.path.NetconfSession" title="ydk.path.NetconfSession"><code class="xref py py-class docutils literal"><span class="pre">NetconfSession</span></code></a> instance.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="../filters.html" class="btn btn-neutral float-right" title="Filters" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="odl_provider.html" class="btn btn-neutral" title="Opendaylight Service Provider" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/providers/service_provider.html b/docs/api/providers/service_provider.html
deleted file mode 100644
index 7921b179e..000000000
--- a/docs/api/providers/service_provider.html
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>ServiceProvider &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Service Providers" href="providers.html"/>
-        <link rel="next" title="Codec Service Provider" href="codec_provider.html"/>
-        <link rel="prev" title="Service Providers" href="providers.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="../services/services.html">Services</a></li>
-<li class="toctree-l3 current"><a class="reference internal" href="providers.html">Service Providers</a><ul class="current">
-<li class="toctree-l4 current"><a class="current reference internal" href="#">ServiceProvider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l4"><a class="reference internal" href="restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="providers.html">Service Providers</a> &raquo;</li>
-      
-    <li>ServiceProvider</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.providers">
-<span id="serviceprovider"></span><h1>ServiceProvider<a class="headerlink" href="#module-ydk.providers" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.providers.ServiceProvider">
-<em class="property">class </em><code class="descclassname">ydk.providers.</code><code class="descname">ServiceProvider</code><a class="headerlink" href="#ydk.providers.ServiceProvider" title="Permalink to this definition">¶</a></dt>
-<dd><p>Base class for supported service providers, see <a class="reference internal" href="providers.html#ydk-providers"><span class="std std-ref">Service Providers</span></a>.</p>
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="codec_provider.html" class="btn btn-neutral float-right" title="Codec Service Provider" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="providers.html" class="btn btn-neutral" title="Service Providers" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/codec_service.html b/docs/api/services/codec_service.html
deleted file mode 100644
index 6b3a6e59b..000000000
--- a/docs/api/services/codec_service.html
+++ /dev/null
@@ -1,474 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Codec Services &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Services" href="services.html"/>
-        <link rel="next" title="CRUD Service" href="crud_service.html"/>
-        <link rel="prev" title="Services" href="services.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="reference internal" href="services.html">Services</a><ul class="current">
-<li class="toctree-l4 current"><a class="current reference internal" href="#">Codec Services</a></li>
-<li class="toctree-l4"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="services.html">Services</a> &raquo;</li>
-      
-    <li>Codec Services</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="codec-services">
-<h1>Codec Services<a class="headerlink" href="#codec-services" title="Permalink to this headline">¶</a></h1>
-<div class="section" id="codec-service">
-<h2>Codec Service<a class="headerlink" href="#codec-service" title="Permalink to this headline">¶</a></h2>
-<p>YDK CodecService class provides API for encoding and decoding of payload strings in XML or JSON format to/from instances of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>,
-which represent containers in the device supported YANG models.</p>
-<dl class="class">
-<dt id="ydk.services.CodecService">
-<em class="property">class </em><code class="descclassname">ydk.services.</code><code class="descname">CodecService</code><a class="headerlink" href="#ydk.services.CodecService" title="Permalink to this definition">¶</a></dt>
-<dd><dl class="method">
-<dt id="ydk.services.CodecService.encode">
-<code class="descname">encode</code><span class="sig-paren">(</span><em>provider</em>, <em>entity</em>, <em>pretty=True</em>, <em>subtree=False</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CodecService.encode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Encodes <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> into payload string in XML or JSON format.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/codec_provider.html#ydk.providers.CodecServiceProvider" title="ydk.providers.CodecServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">CodecServiceProvider</span></code></a> - Codec Provider instance.</li>
-<li><strong>entity</strong> &#8211; <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance or collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances of type <code class="docutils literal"><span class="pre">list</span></code> or <code class="docutils literal"><span class="pre">dict</span></code>
-or <a class="reference internal" href="../types.html#ydk.types.EntityCollection" title="ydk.types.EntityCollection"><code class="xref py py-class docutils literal"><span class="pre">EntityCollection</span></code></a>.</li>
-<li><strong>pretty</strong> &#8211; <code class="docutils literal"><span class="pre">bool</span></code> flag, which specifies if resulting string must be in human readable way with indentation.</li>
-<li><strong>subtree</strong> &#8211; <code class="docutils literal"><span class="pre">bool</span></code> flag, which directs to encode entity to XML or JSON subtree. When set to <cite>true</cite>,
-the <a class="reference internal" href="#ydk.entity_utils.XmlSubtreeCodec" title="ydk.entity_utils.XmlSubtreeCodec"><code class="xref py py-class docutils literal"><span class="pre">XmlSubtreeCodec</span></code></a>
-or <a class="reference internal" href="#ydk.entity_utils.JsonSubtreeCodec" title="ydk.entity_utils.JsonSubtreeCodec"><code class="xref py py-class docutils literal"><span class="pre">JsonSubtreeCodec</span></code></a> is called accordingly.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">Type of returned object corresponds to the type of <strong>entity</strong>: single payload <code class="docutils literal"><span class="pre">str</span></code>, or <code class="docutils literal"><span class="pre">list</span></code> of <code class="docutils literal"><span class="pre">str</span></code>, or a <code class="docutils literal"><span class="pre">dictionary</span></code> of <code class="docutils literal"><span class="pre">str</span></code>.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceError" title="ydk.errors.YServiceError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.CodecService.decode">
-<code class="descname">decode</code><span class="sig-paren">(</span><em>provider</em>, <em>payload</em>, <em>subtree=False</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CodecService.decode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Decodes <strong>payload</strong> string in XML or JSON format to instances of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/codec_provider.html#ydk.providers.CodecServiceProvider" title="ydk.providers.CodecServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">CodecServiceProvider</span></code></a> - Codec Provider instance.</li>
-<li><strong>payload</strong> &#8211; <code class="docutils literal"><span class="pre">str</span></code> or collection of <code class="docutils literal"><span class="pre">str</span></code> Either a single encoded payload or a collection of payloads encapsulated to <code class="docutils literal"><span class="pre">list</span></code> or <code class="docutils literal"><span class="pre">dict</span></code>.</li>
-<li><strong>subtree</strong> &#8211; <code class="docutils literal"><span class="pre">bool</span></code> flag, which directs to encode entity to XML or JSON subtree. When set to <cite>true</cite>,
-the <a class="reference internal" href="#ydk.entity_utils.XmlSubtreeCodec" title="ydk.entity_utils.XmlSubtreeCodec"><code class="xref py py-class docutils literal"><span class="pre">XmlSubtreeCodec</span></code></a>
-or <a class="reference internal" href="#ydk.entity_utils.JsonSubtreeCodec" title="ydk.entity_utils.JsonSubtreeCodec"><code class="xref py py-class docutils literal"><span class="pre">JsonSubtreeCodec</span></code></a> is called accordingly.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">Type of returned object corresponds to the type of <strong>payload</strong>. It is either an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>,
-or a collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances of type <code class="docutils literal"><span class="pre">list</span></code> or <code class="docutils literal"><span class="pre">dict</span></code>.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceError" title="ydk.errors.YServiceError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-<div class="section" id="xmlsubtreecodec">
-<h2>XmlSubtreeCodec<a class="headerlink" href="#xmlsubtreecodec" title="Permalink to this headline">¶</a></h2>
-<dl class="class">
-<dt id="ydk.entity_utils.XmlSubtreeCodec">
-<em class="property">class </em><code class="descclassname">ydk.entity_utils.</code><code class="descname">XmlSubtreeCodec</code><a class="headerlink" href="#ydk.entity_utils.XmlSubtreeCodec" title="Permalink to this definition">¶</a></dt>
-<dd><p>XmlSubtreeCodec class designed to provide encoding and decoding Python model API objects of type <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> to/from XML encoded string.
-Compared to <a class="reference internal" href="#ydk.services.CodecService" title="ydk.services.CodecService"><code class="xref py py-class docutils literal"><span class="pre">CodecService</span></code></a> the class does not validate encoded data for their types and values.
-It is also can be used to encode/decode non-top level entities.</p>
-<dl class="method">
-<dt id="ydk.entity_utils.XmlSubtreeCodec.XmlSubtreeCodec">
-<code class="descname">XmlSubtreeCodec</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.XmlSubtreeCodec.XmlSubtreeCodec" title="Permalink to this definition">¶</a></dt>
-<dd><p>Constructs an instance of <cite>XmlSubtreeCodec</cite> class.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.entity_utils.XmlSubtreeCodec.encode">
-<code class="descname">encode</code><span class="sig-paren">(</span><em>entity</em>, <em>root_schema</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.XmlSubtreeCodec.encode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Performs encoding of Python model API objects of type <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> to well formatted XML encoded string.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>entity</strong> &#8211; An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class defined under a bundle.</li>
-<li><strong>root_schema</strong> &#8211; An instance of <a class="reference internal" href="../path/root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code></a>, which includes the model bundle.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">str</span></code>, encoded well formatted multi-line XML payload string.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceError" title="ydk.errors.YServiceError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceError</span></code></a>, if an error has occurred; usually appears when model is not present in the bundle.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.entity_utils.XmlSubtreeCodec.decode">
-<code class="descname">decode</code><span class="sig-paren">(</span><em>payload</em>, <em>entity</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.XmlSubtreeCodec.decode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Decodes the XML encoded string to produce corresponding instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>payload</strong> &#8211; <code class="docutils literal"><span class="pre">str</span></code>, XML encoded string to be decoded.</li>
-<li><strong>entity</strong> &#8211; <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, instance of shared pointer to expected top level <cite>Entity</cite> class.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, shared pointer to the decoded <cite>Entity</cite>.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YInvalidArgumentError" title="ydk.errors.YInvalidArgumentError"><code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code></a>, if an error has occurred; usually appears when payload does not correspond to <cite>Entity</cite> model.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-<div class="section" id="jsonsubtreecodec">
-<h2>JsonSubtreeCodec<a class="headerlink" href="#jsonsubtreecodec" title="Permalink to this headline">¶</a></h2>
-<dl class="class">
-<dt id="ydk.entity_utils.JsonSubtreeCodec">
-<em class="property">class </em><code class="descclassname">ydk.entity_utils.</code><code class="descname">JsonSubtreeCodec</code><a class="headerlink" href="#ydk.entity_utils.JsonSubtreeCodec" title="Permalink to this definition">¶</a></dt>
-<dd><p>JsonSubtreeCodec class designed to provide encoding and decoding Python model API objects of type <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> to/from JSON encoded string.
-Compared to <a class="reference internal" href="#ydk.services.CodecService" title="ydk.services.CodecService"><code class="xref py py-class docutils literal"><span class="pre">CodecService</span></code></a> the class does not validate encoded data for their types and values.
-It is also can be used to encode/decode non-top level entities.</p>
-<dl class="method">
-<dt id="ydk.entity_utils.JsonSubtreeCodec.JsonSubtreeCodec">
-<code class="descname">JsonSubtreeCodec</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.JsonSubtreeCodec.JsonSubtreeCodec" title="Permalink to this definition">¶</a></dt>
-<dd><p>Constructs an instance of <cite>JsonSubtreeCodec</cite> class.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.entity_utils.JsonSubtreeCodec.encode">
-<code class="descname">encode</code><span class="sig-paren">(</span><em>entity</em>, <em>root_schema</em>, <em>pretty</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.JsonSubtreeCodec.encode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Performs encoding of Python model API objects of type <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> to JSON encoded string.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>entity</strong> &#8211; An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class defined under a bundle.</li>
-<li><strong>root_schema</strong> &#8211; An instance of <code class="xref py py-class docutils literal"><span class="pre">RootSchemaNode</span></code>, which includes the model bundle.</li>
-<li><strong>pretty</strong> &#8211; <code class="docutils literal"><span class="pre">bool</span></code>. If set to <cite>True</cite>, the function produces well formatted multi-line JSON string. If set to <cite>False</cite> - one line string.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">str</span></code>, encoded JSON payload string.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceError" title="ydk.errors.YServiceError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceError</span></code></a>, if an error has occurred; usually appears when model is not present in the bundle.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.entity_utils.JsonSubtreeCodec.decode">
-<code class="descname">decode</code><span class="sig-paren">(</span><em>payload</em>, <em>entity</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.entity_utils.JsonSubtreeCodec.decode" title="Permalink to this definition">¶</a></dt>
-<dd><p>Decodes the JSON encoded string to produce corresponding instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>payload</strong> &#8211; <code class="docutils literal"><span class="pre">str</span></code>, JSON encoded string to be decoded.</li>
-<li><strong>entity</strong> &#8211; <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, instance of shared pointer to expected top level <cite>Entity</cite> class.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, shared pointer to the decoded <cite>Entity</cite>.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YInvalidArgumentError" title="ydk.errors.YInvalidArgumentError"><code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code></a>, if an error has occurred; usually appears when payload does not correspond to <cite>Entity</cite> model.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-<div class="section" id="example-of-jsonsubtreecodec-usage">
-<h3>Example of JsonSubtreeCodec usage<a class="headerlink" href="#example-of-jsonsubtreecodec-usage" title="Permalink to this headline">¶</a></h3>
-<p>In this example we use <a class="reference internal" href="../providers/gnmi_provider.html#ydk.gnmi.providers.gNMIServiceProvider" title="ydk.gnmi.providers.gNMIServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">gNMIServiceProvider</span></code></a> and
-<a class="reference internal" href="crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> to get interface configuration from IOS XR device and
-then print it using <a class="reference internal" href="#ydk.entity_utils.JsonSubtreeCodec" title="ydk.entity_utils.JsonSubtreeCodec"><code class="xref py py-class docutils literal"><span class="pre">JsonSubtreeCodec</span></code></a>:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CRUDService</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.providers</span> <span class="kn">import</span> <span class="n">gNMIServiceProvider</span>
-
-<span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ifmgr_cfg</span> <span class="k">as</span> <span class="n">ifmgr</span>
-
-<span class="c1"># Create gNMI service provider</span>
-<span class="n">repo</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s2">&quot;/home/yan/ydk-gen/scripts/repository/10.30.110.84&quot;</span><span class="p">)</span>
-<span class="n">provider</span> <span class="o">=</span> <span class="n">gNMIServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="o">=</span><span class="n">repo</span><span class="p">,</span>
-                           <span class="n">address</span><span class="o">=</span><span class="mf">10.20.30.40</span><span class="p">,</span>
-                           <span class="n">port</span><span class="o">=</span><span class="mi">57400</span><span class="p">,</span>
-                           <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span>
-                           <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-<span class="c1"># Create CRUD service</span>
-<span class="n">crud</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-
-<span class="c1"># Build filter for interface configuration</span>
-<span class="n">ifc_filter</span> <span class="o">=</span> <span class="n">ifmgr</span><span class="o">.</span><span class="n">InterfaceConfigurations</span><span class="p">()</span>
-<span class="n">ifc</span> <span class="o">=</span> <span class="n">ifmgr</span><span class="o">.</span><span class="n">InterfaceConfigurations</span><span class="o">.</span><span class="n">InterfaceConfiguration</span><span class="p">()</span>
-<span class="n">ifc</span><span class="o">.</span><span class="n">active</span> <span class="o">=</span> <span class="s1">&#39;&quot;act&quot;&#39;</span>
-<span class="n">ifc</span><span class="o">.</span><span class="n">interface_name</span> <span class="o">=</span> <span class="s1">&#39;&quot;Loopback0&quot;&#39;</span>
-<span class="n">ifc_filter</span><span class="o">.</span><span class="n">interface_configuration</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">ifc</span><span class="p">)</span>
-
-<span class="c1"># Read interface configuration</span>
-<span class="n">ifc_read</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">ifc_filter</span><span class="p">)</span>
-
-<span class="c1"># Print interface configuration</span>
-<span class="k">if</span> <span class="n">ifc_read</span><span class="p">:</span>
-    <span class="kn">from</span> <span class="nn">ydk.entity_utils</span> <span class="kn">import</span> <span class="n">JsonSubtreeCodec</span>
-    <span class="n">jcodec</span> <span class="o">=</span> <span class="n">JsonSubtreeCodec</span><span class="p">()</span>
-    <span class="n">payload</span> <span class="o">=</span> <span class="n">jcodec</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">ifc_read</span><span class="p">,</span> <span class="n">provider</span><span class="o">.</span><span class="n">get_session</span><span class="p">()</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">(),</span> <span class="kc">True</span><span class="p">)</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s1">&#39;CREATED INTERFACE CONFIGURATION:&#39;</span><span class="p">)</span>
-    <span class="nb">print</span><span class="p">(</span><span class="n">payload</span><span class="p">)</span>
-</pre></div>
-</div>
-</div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="crud_service.html" class="btn btn-neutral float-right" title="CRUD Service" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="services.html" class="btn btn-neutral" title="Services" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/crud_service.html b/docs/api/services/crud_service.html
deleted file mode 100644
index f4ce9efa9..000000000
--- a/docs/api/services/crud_service.html
+++ /dev/null
@@ -1,377 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>CRUD Service &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Services" href="services.html"/>
-        <link rel="next" title="Executor Service" href="executor_service.html"/>
-        <link rel="prev" title="Codec Services" href="codec_service.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="reference internal" href="services.html">Services</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">CRUD Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="services.html">Services</a> &raquo;</li>
-      
-    <li>CRUD Service</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="crud-service">
-<h1>CRUD Service<a class="headerlink" href="#crud-service" title="Permalink to this headline">¶</a></h1>
-<p>YDK CrudService class provides API for Create/Read/Update/Delete operations on device configuration.</p>
-<p>All CRUD operations performed on entities, where <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance represents single container in one of the device supported models.</p>
-<dl class="class">
-<dt id="ydk.services.CRUDService">
-<em class="property">class </em><code class="descclassname">ydk.services.</code><code class="descname">CRUDService</code><a class="headerlink" href="#ydk.services.CRUDService" title="Permalink to this definition">¶</a></dt>
-<dd><p>Supports CRUD operations on model API entities.</p>
-<dl class="method">
-<dt id="ydk.services.CRUDService.create">
-<code class="descname">create</code><span class="sig-paren">(</span><em>provider</em>, <em>entities</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CRUDService.create" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create one or more entities in device configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> - Provider instance.</li>
-<li><strong>entities</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance for single container in device model.</p>
-<p>For multiple entities encapsulate <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code>, if configuration created successfully; <code class="docutils literal"><span class="pre">False</span></code> otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.CRUDService.read">
-<code class="descname">read</code><span class="sig-paren">(</span><em>provider</em>, <em>filter</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CRUDService.read" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read one or more entities from device (configuration and state).</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> - Provider instance.</li>
-<li><strong>filter</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance for single container in device model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Filter" title="ydk.types.Filter"><code class="xref py py-class docutils literal"><span class="pre">Filter</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><p>For single entity filter - an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> as identified by the <strong>filter</strong> or <code class="docutils literal"><span class="pre">None</span></code>, if operation fails.</p>
-<p>For multiple filters - collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a> accordingly to the type of <strong>filter</strong>.</p>
-</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.CRUDService.read_config">
-<code class="descname">read_config</code><span class="sig-paren">(</span><em>provider</em>, <em>filter</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CRUDService.read_config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read one or more entities from device running configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> - Provider instance.</li>
-<li><strong>filter</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance for single container in device model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Filter" title="ydk.types.Filter"><code class="xref py py-class docutils literal"><span class="pre">Filter</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><p>For single entity filter - an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> as identified by the <strong>filter</strong> or <code class="docutils literal"><span class="pre">None</span></code>, if operation fails.</p>
-<p>For multiple filters - collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a> accordingly to the type of <strong>filter</strong>.</p>
-</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.CRUDService.update">
-<code class="descname">update</code><span class="sig-paren">(</span><em>provider</em>, <em>entities</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CRUDService.update" title="Permalink to this definition">¶</a></dt>
-<dd><p>Update one or more entities in device configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> - Provider instance.</li>
-<li><strong>entities</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance for single container in device model.</p>
-<p>For multiple containers encapsulate <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if successful, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.CRUDService.delete">
-<code class="descname">delete</code><span class="sig-paren">(</span><em>provider</em>, <em>entities</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.CRUDService.delete" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete one or more entities in device configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> - Provider instance.</li>
-<li><strong>entities</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance for single container in device model.</p>
-<p>For multiple containers encapsulate <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if successful, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="executor_service.html" class="btn btn-neutral float-right" title="Executor Service" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="codec_service.html" class="btn btn-neutral" title="Codec Services" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/executor_service.html b/docs/api/services/executor_service.html
deleted file mode 100644
index f00aad270..000000000
--- a/docs/api/services/executor_service.html
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Executor Service &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Services" href="services.html"/>
-        <link rel="next" title="NETCONF Service" href="netconf_service.html"/>
-        <link rel="prev" title="CRUD Service" href="crud_service.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="reference internal" href="services.html">Services</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l4"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">Executor Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="services.html">Services</a> &raquo;</li>
-      
-    <li>Executor Service</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="executor-service">
-<h1>Executor Service<a class="headerlink" href="#executor-service" title="Permalink to this headline">¶</a></h1>
-<dl class="class">
-<dt id="ydk.services.ExecutorService">
-<em class="property">class </em><code class="descclassname">ydk.services.</code><code class="descname">ExecutorService</code><a class="headerlink" href="#ydk.services.ExecutorService" title="Permalink to this definition">¶</a></dt>
-<dd><p>Provides the functionality to execute RPCs</p>
-<dl class="method">
-<dt id="ydk.services.ExecutorService.execute_rpc">
-<code class="descname">execute_rpc</code><span class="sig-paren">(</span><em>self</em>, <em>provider</em>, <em>rpc_entity</em>, <em>top_entity=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.ExecutorService.execute_rpc" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create the entity</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; (<code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code>.) Provider instance.</li>
-<li><strong>rpc_entity</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>) An instance of an RPC class defined under the ydk.models package or any of its subpackages.</li>
-<li><strong>top_entity</strong> &#8211; (<a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> optional)  Provide an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> only when expecting data to be returned.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> when provided top_entity or None otherwise</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<p>Possible Errors:</p>
-<blockquote>
-<div><ul class="simple">
-<li>a server side error</li>
-<li>there isn&#8217;t enough information in the entity to prepare the message (eg. missing keys)</li>
-</ul>
-</div></blockquote>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="netconf_service.html" class="btn btn-neutral float-right" title="NETCONF Service" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="crud_service.html" class="btn btn-neutral" title="CRUD Service" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/gnmi_service.html b/docs/api/services/gnmi_service.html
deleted file mode 100644
index 32eb93bc8..000000000
--- a/docs/api/services/gnmi_service.html
+++ /dev/null
@@ -1,583 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>gNMI Service API &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Services" href="services.html"/>
-        <link rel="next" title="Service Providers" href="../providers/providers.html"/>
-        <link rel="prev" title="NETCONF Service" href="netconf_service.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="reference internal" href="services.html">Services</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l4"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="services.html">Services</a> &raquo;</li>
-      
-    <li>gNMI Service API</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="gnmi-service-api">
-<span id="gnmi-service"></span><h1><a class="toc-backref" href="#toc-entry-1">gNMI Service API</a><a class="headerlink" href="#gnmi-service-api" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#gnmi-service-api" id="toc-entry-1">gNMI Service API</a></li>
-<li><a class="reference internal" href="#gnmi-service-examples" id="toc-entry-2">gNMI Service Examples</a><ul>
-<li><a class="reference internal" href="#gnmi-set-example" id="toc-entry-3">gNMI &#8216;set&#8217; example</a></li>
-<li><a class="reference internal" href="#gnmi-get-example" id="toc-entry-4">gNMI &#8216;get&#8217; example</a></li>
-<li><a class="reference internal" href="#gnmi-subscribe-example" id="toc-entry-5">gNMI &#8216;subscribe&#8217; example</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<dl class="class">
-<dt id="ydk.gnmi.services.gNMIService">
-<em class="property">class </em><code class="descclassname">ydk.gnmi.services.</code><code class="descname">gNMIService</code><a class="headerlink" href="#ydk.gnmi.services.gNMIService" title="Permalink to this definition">¶</a></dt>
-<dd><p>Supports gNMI Set/Get/Subscribe operations on model API entities. It also allows to get gNMI server capabilities.</p>
-<dl class="method">
-<dt id="ydk.gnmi.services.gNMIService.set">
-<code class="descname">set</code><span class="sig-paren">(</span><em>provider</em>, <em>entity</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.services.gNMIService.set" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create, update, or delete single entity or multiple entities in the server configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; (<a class="reference internal" href="../providers/gnmi_provider.html#ydk.gnmi.providers.gNMIServiceProvider" title="ydk.gnmi.providers.gNMIServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">gNMIServiceProvider</span></code></a>) Provider instance.</li>
-<li><strong>entity</strong> &#8211; <p>(<a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>) instance, which represents single container in device supported model.
-Each <strong>Entity</strong> instance must be annotated with <a class="reference internal" href="../filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">YFilter</span></code></a>, which defines set operation:</p>
-<ul>
-<li>YFilter.replace - add new configuration or replace the whole configuration tree</li>
-<li>YFilter.update  - update or create configuration in existing tree</li>
-<li>YFilter.delete  - delete part or entire configuration tree</li>
-</ul>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or YDK <code class="docutils literal"><span class="pre">EntityCollection</span></code> <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if successful, <code class="docutils literal"><span class="pre">False</span></code> if not.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a> if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.gnmi.services.gNMIService.get">
-<code class="descname">get</code><span class="sig-paren">(</span><em>provider</em>, <em>read_filter</em>, <em>read_mode='CONFIG'</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.services.gNMIService.get" title="Permalink to this definition">¶</a></dt>
-<dd><p>Read the entity.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; (<a class="reference internal" href="../providers/gnmi_provider.html#ydk.gnmi.providers.gNMIServiceProvider" title="ydk.gnmi.providers.gNMIServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">gNMIServiceProvider</span></code></a>) Provider instance.</li>
-<li><strong>read_filter</strong> &#8211; <p>(<a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>) instance, which represents single container in device supported model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or YDK <code class="docutils literal"><span class="pre">EntityCollection</span></code> <a class="reference internal" href="../types.html#ydk.types.Filter" title="ydk.types.Filter"><code class="xref py py-class docutils literal"><span class="pre">Filter</span></code></a>.</p>
-</li>
-<li><strong>read_mode</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) One of the values: <code class="docutils literal"><span class="pre">CONFIG</span></code>, <code class="docutils literal"><span class="pre">STATE</span></code>, <code class="docutils literal"><span class="pre">OPERATIONAL</span></code>, or <code class="docutils literal"><span class="pre">ALL</span></code>.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><p>For single entity filter - an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> as identified by the <strong>read_filter</strong> or <code class="docutils literal"><span class="pre">None</span></code>, if operation fails.</p>
-<p>For multiple filters - collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or YDK <code class="docutils literal"><span class="pre">EntityCollection</span></code> <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a> accordingly to the type of <strong>read_filter</strong>.</p>
-</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a> if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.gnmi.services.gNMIService.subscribe">
-<code class="descname">subscribe</code><span class="sig-paren">(</span><em>provider</em>, <em>subscription</em>, <em>qos=0</em>, <em>mode='ONCE</em>, <em>encoding='PROTO'</em>, <em>callback_function=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.services.gNMIService.subscribe" title="Permalink to this definition">¶</a></dt>
-<dd><p>Subscribe to telemetry updates.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; (<a class="reference internal" href="../providers/gnmi_provider.html#ydk.gnmi.providers.gNMIServiceProvider" title="ydk.gnmi.providers.gNMIServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">gNMIServiceProvider</span></code></a>) Provider instance.</li>
-<li><strong>subscription</strong> &#8211; (<a class="reference internal" href="#ydk.gnmi.services.gNMISubscription" title="ydk.gnmi.services.gNMISubscription"><code class="xref py py-class docutils literal"><span class="pre">gNMISubscription</span></code></a>) Single instance or Python <code class="docutils literal"><span class="pre">list</span></code> of instances of objects, which represent the subscription.</li>
-<li><strong>qos</strong> &#8211; (<code class="docutils literal"><span class="pre">long</span></code>) QOS indicating the packet marking.</li>
-<li><strong>mode</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Subscription mode: one of <code class="docutils literal"><span class="pre">STREAM</span></code>, <code class="docutils literal"><span class="pre">ONCE</span></code> or <code class="docutils literal"><span class="pre">POLL</span></code>.</li>
-<li><strong>encoding</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) Encoding method for the output: one of <code class="docutils literal"><span class="pre">JSON</span></code>, <code class="docutils literal"><span class="pre">BYTES</span></code>, <code class="docutils literal"><span class="pre">PROTO</span></code>, <code class="docutils literal"><span class="pre">ASCII</span></code>, or <code class="docutils literal"><span class="pre">JSON_IETF</span></code>.</li>
-<li><strong>callback_function</strong> &#8211; (<code class="docutils literal"><span class="pre">func(str)</span></code>) Callback function, which is used to process the subscription data.
-The subscription data returned to the user as a string representation of protobuf <strong>SubscribeResponse</strong> message.
-If not specified, the response is printed to system stdout.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a> if an error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.gnmi.services.gNMIService.capabilities">
-<code class="descname">capabilities</code><span class="sig-paren">(</span><em>provider</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.gnmi.services.gNMIService.capabilities" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get gNMI server capabilities</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>provider</strong> &#8211; (<a class="reference internal" href="../providers/gnmi_provider.html#ydk.gnmi.providers.gNMIServiceProvider" title="ydk.gnmi.providers.gNMIServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">gNMIServiceProvider</span></code></a>) Provider instance.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">(<code class="docutils literal"><span class="pre">str</span></code>) JSON encoded string, which represents gNMI server capabilities.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.gnmi.services.gNMISubscription">
-<em class="property">class </em><code class="descclassname">ydk.gnmi.services.</code><code class="descname">gNMISubscription</code><a class="headerlink" href="#ydk.gnmi.services.gNMISubscription" title="Permalink to this definition">¶</a></dt>
-<dd><p>Instance of this class defines subscription for a single entity. Members of the class are:</p>
-<ul class="simple">
-<li>entity: (<a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>) Instance of the subscription entity. This parameter must be set by the user.</li>
-<li>subscription_mode: (<code class="docutils literal"><span class="pre">str</span></code>) Expected one of the following string values: <code class="docutils literal"><span class="pre">TARGET_DEFINED</span></code>, <code class="docutils literal"><span class="pre">ON_CHANGE</span></code>, or <code class="docutils literal"><span class="pre">SAMPLE</span></code>; default value is <code class="docutils literal"><span class="pre">ON_CHANGE</span></code>.</li>
-<li>sample_interval: (<code class="docutils literal"><span class="pre">long</span></code>) Time interval in nanoseconds between samples in <code class="docutils literal"><span class="pre">STREAM</span></code> mode; default value is 60000000000 (1 minute).</li>
-<li>suppress_redundant: (<code class="docutils literal"><span class="pre">bool</span></code>) Indicates whether values that not changed should be sent in a <code class="docutils literal"><span class="pre">STREAM</span></code> subscription; default value is <code class="docutils literal"><span class="pre">False</span></code></li>
-<li>heartbeat_interval: (<code class="docutils literal"><span class="pre">long</span></code>) Specifies the maximum allowable silent period in nanoseconds when <strong>suppress_redundant</strong> is True. If not specified, the <strong>heartbeat_interval</strong> is set to 360000000000 (10 minutes) or <strong>sample_interval</strong> whatever is bigger.</li>
-</ul>
-</dd></dl>
-
-</div>
-<div class="section" id="gnmi-service-examples">
-<h1><a class="toc-backref" href="#toc-entry-2">gNMI Service Examples</a><a class="headerlink" href="#gnmi-service-examples" title="Permalink to this headline">¶</a></h1>
-<p>To enable YDK logging include the following code:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span>
-<span class="normal">7</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">logging</span>
-<span class="n">logger</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="s2">&quot;ydk&quot;</span><span class="p">)</span>
-<span class="n">logger</span><span class="o">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">)</span>
-<span class="n">handler</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">StreamHandler</span><span class="p">()</span>
-<span class="n">formatter</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">Formatter</span><span class="p">((</span><span class="s2">&quot;</span><span class="si">%(asctime)s</span><span class="s2"> - </span><span class="si">%(name)s</span><span class="s2"> - </span><span class="si">%(levelname)s</span><span class="s2"> - </span><span class="si">%(message)s</span><span class="s2">&quot;</span><span class="p">))</span>
-<span class="n">handler</span><span class="o">.</span><span class="n">setFormatter</span><span class="p">(</span><span class="n">formatter</span><span class="p">)</span>
-<span class="n">logger</span><span class="o">.</span><span class="n">addHandler</span><span class="p">(</span><span class="n">handler</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>To enable GRPC trace set environment variables as followed:</p>
-<div class="highlight-shell"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">GRPC_VERBOSITY</span><span class="o">=</span>debug
-<span class="nb">export</span> <span class="nv">GRPC_TRACE</span><span class="o">=</span>transport_security
-</pre></div>
-</td></tr></table></div>
-<div class="section" id="gnmi-set-example">
-<h2><a class="toc-backref" href="#toc-entry-3">gNMI &#8216;set&#8217; example</a><a class="headerlink" href="#gnmi-set-example" title="Permalink to this headline">¶</a></h2>
-<p>Example of instantiating and using objects of <code class="docutils literal"><span class="pre">gNMIServiceProvider</span></code> with <code class="docutils literal"><span class="pre">gNMIService</span></code> is shown below (assuming you have <code class="docutils literal"><span class="pre">openconfig</span></code> bundle installed).</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.providers</span> <span class="kn">import</span> <span class="n">gNMIServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.services</span> <span class="kn">import</span> <span class="n">gNMIService</span>
-
-<span class="n">repository</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s1">&#39;/Users/test/yang_models_location&#39;</span><span class="p">)</span>
-<span class="n">provider</span> <span class="o">=</span> <span class="n">gNMIServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="o">=</span><span class="n">repository</span><span class="p">,</span> <span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="mi">57400</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-<span class="n">gnmi_service</span> <span class="o">=</span> <span class="n">gNMIService</span><span class="p">()</span>
-
-<span class="c1"># Create entire BGP configuration</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65172</span>
-<span class="n">neighbor</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">Neighbors</span><span class="o">.</span><span class="n">Neighbor</span><span class="p">()</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">neighbor_address</span> <span class="o">=</span> <span class="s1">&#39;172.16.255.2&#39;</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">neighbor_address</span> <span class="o">=</span> <span class="s1">&#39;172.16.255.2&#39;</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">peer_as</span> <span class="o">=</span> <span class="mi">65172</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">neighbors</span><span class="o">.</span><span class="n">neighbor</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">neighbor</span><span class="p">)</span>
-
-<span class="n">bgp</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">replace</span>       <span class="c1"># Define set/create operation</span>
-
-<span class="n">ok</span> <span class="o">=</span> <span class="n">gnmi_service</span><span class="o">.</span><span class="n">set</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span> <span class="c1"># Perform create operation</span>
-
-<span class="c1"># Delete one neighbor</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-<span class="n">neighbor</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">Neighbors</span><span class="o">.</span><span class="n">Neighbor</span><span class="p">()</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">neighbor_address</span> <span class="o">=</span> <span class="s1">&#39;172.16.255.2&#39;</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">neighbors</span><span class="o">.</span><span class="n">neighbor</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">neighbor</span><span class="p">)</span>
-
-<span class="n">bgp</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">delete</span>        <span class="c1"># Define set/delete operation</span>
-
-<span class="n">ok</span> <span class="o">=</span> <span class="n">gnmi_service</span><span class="o">.</span><span class="n">set</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span> <span class="c1"># Perform delete operation</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="gnmi-get-example">
-<h2><a class="toc-backref" href="#toc-entry-4">gNMI &#8216;get&#8217; example</a><a class="headerlink" href="#gnmi-get-example" title="Permalink to this headline">¶</a></h2>
-<p>Example of instantiating and using objects of <code class="docutils literal"><span class="pre">gNMIServiceProvider</span></code> with <code class="docutils literal"><span class="pre">gNMIService</span></code> is shown below (assuming you have <code class="docutils literal"><span class="pre">openconfig</span></code> bundle installed).</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.providers</span> <span class="kn">import</span> <span class="n">gNMIServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.services</span> <span class="kn">import</span> <span class="n">gNMIService</span>
-
-<span class="n">repository</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s1">&#39;/Users/test/yang_models_location&#39;</span><span class="p">)</span>
-<span class="n">provider</span> <span class="o">=</span> <span class="n">gNMIServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="o">=</span><span class="n">repository</span><span class="p">,</span> <span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="mi">57400</span><span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-<span class="n">gnmi_service</span> <span class="o">=</span> <span class="n">gNMIService</span><span class="p">()</span>
-
-<span class="n">capabilities</span> <span class="o">=</span> <span class="n">provider</span><span class="o">.</span><span class="n">get_capabilities</span><span class="p">()</span> <span class="c1"># Get list of capabilities</span>
-
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="n">bgp_read</span> <span class="o">=</span> <span class="n">gnmi_service</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span> <span class="c1"># Perform get operation</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="gnmi-subscribe-example">
-<h2><a class="toc-backref" href="#toc-entry-5">gNMI &#8216;subscribe&#8217; example</a><a class="headerlink" href="#gnmi-subscribe-example" title="Permalink to this headline">¶</a></h2>
-<p>Example of subscribing to telemetry using <code class="docutils literal"><span class="pre">gNMIServiceProvider</span></code> with <code class="docutils literal"><span class="pre">gNMIService</span></code> is shown below (assuming you have <code class="docutils literal"><span class="pre">openconfig</span></code> bundle installed).</p>
-<p><strong>NOTE:</strong> The <code class="docutils literal"><span class="pre">gNMIService</span></code> class <strong>can be</strong> used with <code class="docutils literal"><span class="pre">multiprocessing.Pool</span></code> for the <code class="docutils literal"><span class="pre">subscribe</span></code> operation as shown below as the subcription is a long-lived connection.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span>
-<span class="normal">34</span>
-<span class="normal">35</span>
-<span class="normal">36</span>
-<span class="normal">37</span>
-<span class="normal">38</span>
-<span class="normal">39</span>
-<span class="normal">40</span>
-<span class="normal">41</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_interfaces</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.providers</span> <span class="kn">import</span> <span class="n">gNMIServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.gnmi.services</span> <span class="kn">import</span> <span class="n">gNMIService</span><span class="p">,</span> <span class="n">gNMISubscription</span>
-
-<span class="kn">import</span> <span class="nn">datetime</span>
-
-<span class="c1"># Callback function to handle telemetry data</span>
-<span class="k">def</span> <span class="nf">print_telemetry_data</span><span class="p">(</span><span class="n">s</span><span class="p">):</span>
-    <span class="k">if</span> <span class="s1">&#39;update&#39;</span> <span class="ow">in</span> <span class="n">s</span><span class="p">:</span>
-        <span class="n">current_dt</span> <span class="o">=</span> <span class="n">datetime</span><span class="o">.</span><span class="n">datetime</span><span class="o">.</span><span class="n">now</span><span class="p">()</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">===&gt; Received subscribe response at </span><span class="si">%s</span><span class="s2">: </span><span class="se">\n</span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span>
-              <span class="p">(</span><span class="n">current_dt</span><span class="o">.</span><span class="n">strftime</span><span class="p">(</span><span class="s2">&quot;%Y-%m-</span><span class="si">%d</span><span class="s2"> %H:%M:%S&quot;</span><span class="p">),</span> <span class="n">s</span><span class="p">))</span>
-
-<span class="c1"># Function to subscribe to telemetry data</span>
-<span class="k">def</span> <span class="nf">subscribe</span><span class="p">(</span><span class="n">func</span><span class="p">):</span>
-    <span class="c1"># Initialize gNMI Service and Provider</span>
-    <span class="n">gnmi</span> <span class="o">=</span> <span class="n">gNMIService</span><span class="p">()</span>
-    <span class="n">repository</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s1">&#39;/home/yan/ydk-workspace/ydk-gen/scripts/repository/10.30.110.84&#39;</span><span class="p">)</span>
-    <span class="n">provider</span> <span class="o">=</span> <span class="n">gNMIServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="o">=</span><span class="n">repository</span><span class="p">,</span> <span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.30.110.85&#39;</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="mi">57400</span><span class="p">,</span>
-                                   <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-
-    <span class="c1"># Create telemetry subscription entity</span>
-    <span class="n">interfaces</span> <span class="o">=</span> <span class="n">openconfig_interfaces</span><span class="o">.</span><span class="n">Interfaces</span><span class="p">()</span>
-    <span class="n">interface</span> <span class="o">=</span> <span class="n">openconfig_interfaces</span><span class="o">.</span><span class="n">Interfaces</span><span class="o">.</span><span class="n">Interface</span><span class="p">()</span>
-    <span class="n">interface</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="s1">&#39;&quot;MgmtEth0/RP0/CPU0/0&quot;&#39;</span>
-    <span class="n">interfaces</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">interface</span><span class="p">)</span>
-
-    <span class="c1"># Build subscription</span>
-    <span class="n">subscription</span> <span class="o">=</span> <span class="n">gNMISubscription</span><span class="p">()</span>
-    <span class="n">subscription</span><span class="o">.</span><span class="n">entity</span> <span class="o">=</span> <span class="n">interfaces</span>
-    <span class="n">subscription</span><span class="o">.</span><span class="n">subscription_mode</span> <span class="o">=</span> <span class="s1">&#39;SAMPLE&#39;</span>
-    <span class="n">subscription</span><span class="o">.</span><span class="n">sample_interval</span> <span class="o">=</span> <span class="mi">10</span> <span class="o">*</span> <span class="mi">1000000000</span>
-    <span class="n">subscription</span><span class="o">.</span><span class="n">suppress_redundant</span> <span class="o">=</span> <span class="kc">False</span>
-    <span class="n">subscription</span><span class="o">.</span><span class="n">heartbeat_interval</span> <span class="o">=</span> <span class="mi">100</span> <span class="o">*</span> <span class="mi">1000000000</span>
-
-    <span class="c1"># Subscribe for updates in STREAM mode.</span>
-    <span class="n">gnmi</span><span class="o">.</span><span class="n">subscribe</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">subscription</span><span class="p">,</span> <span class="mi">10</span><span class="p">,</span> <span class="s1">&#39;STREAM&#39;</span><span class="p">,</span> <span class="s2">&quot;PROTO&quot;</span><span class="p">,</span> <span class="n">func</span><span class="p">)</span>
-
-<span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s2">&quot;__main__&quot;</span><span class="p">:</span>
-    <span class="n">subscribe</span><span class="p">(</span><span class="n">print_telemetry_data</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="../providers/providers.html" class="btn btn-neutral float-right" title="Service Providers" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="netconf_service.html" class="btn btn-neutral" title="NETCONF Service" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/netconf_service.html b/docs/api/services/netconf_service.html
deleted file mode 100644
index bfa000758..000000000
--- a/docs/api/services/netconf_service.html
+++ /dev/null
@@ -1,599 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>NETCONF Service &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="Services" href="services.html"/>
-        <link rel="next" title="gNMI Service API" href="gnmi_service.html"/>
-        <link rel="prev" title="Executor Service" href="executor_service.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="reference internal" href="services.html">Services</a><ul class="current">
-<li class="toctree-l4"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l4"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l4 current"><a class="current reference internal" href="#">NETCONF Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-          <li><a href="services.html">Services</a> &raquo;</li>
-      
-    <li>NETCONF Service</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="netconf-service">
-<h1>NETCONF Service<a class="headerlink" href="#netconf-service" title="Permalink to this headline">¶</a></h1>
-<p>YDK NetconfService class provides API for various operations on device configuration.</p>
-<p>All NetconfService operations performed on <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a>, which instance represents data storage of configuration on device, and/or <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, which instance represents single container in one of the device supported models.</p>
-<dl class="class">
-<dt id="ydk.ext.services.Datastore">
-<em class="property">class </em><code class="descclassname">ydk.ext.services.</code><code class="descname">Datastore</code><a class="headerlink" href="#ydk.ext.services.Datastore" title="Permalink to this definition">¶</a></dt>
-<dd><p>Type of data storage on device.</p>
-<dl class="data">
-<dt id="ydk.ext.services.Datastore.candidate">
-<code class="descname">candidate</code><a class="headerlink" href="#ydk.ext.services.Datastore.candidate" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="data">
-<dt id="ydk.ext.services.Datastore.running">
-<code class="descname">running</code><a class="headerlink" href="#ydk.ext.services.Datastore.running" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="data">
-<dt id="ydk.ext.services.Datastore.startup">
-<code class="descname">startup</code><a class="headerlink" href="#ydk.ext.services.Datastore.startup" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="data">
-<dt id="ydk.ext.services.Datastore.url">
-<code class="descname">url</code><a class="headerlink" href="#ydk.ext.services.Datastore.url" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="data">
-<dt id="ydk.ext.services.Datastore.na">
-<code class="descname">na</code><a class="headerlink" href="#ydk.ext.services.Datastore.na" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.services.NetconfService">
-<em class="property">class </em><code class="descclassname">ydk.services.</code><code class="descname">NetconfService</code><a class="headerlink" href="#ydk.services.NetconfService" title="Permalink to this definition">¶</a></dt>
-<dd><dl class="method">
-<dt id="ydk.services.NetconfService.cancel_commit">
-<code class="descname">cancel_commit</code><span class="sig-paren">(</span><em>provider</em>, <em>persist_id=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.cancel_commit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Cancels an ongoing confirmed commit. If the <strong>persist_id</strong> parameter is None, the operation <strong>must</strong> be issued on the same session that issued the confirmed commit.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>persist_id</strong> &#8211; An <code class="docutils literal"><span class="pre">int</span></code> that cancels a persistent confirmed commit.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.close_session">
-<code class="descname">close_session</code><span class="sig-paren">(</span><em>provider</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.close_session" title="Permalink to this definition">¶</a></dt>
-<dd><p>Request graceful termination of a NETCONF session.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.commit">
-<code class="descname">commit</code><span class="sig-paren">(</span><em>provider</em>, <em>confirmed=False</em>, <em>confirm_timeout=None</em>, <em>persist=None</em>, <em>persist_id=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.commit" title="Permalink to this definition">¶</a></dt>
-<dd><p>Instructs the device to implement the configuration data contained in the candidate configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>confirmed</strong> &#8211; A <code class="docutils literal"><span class="pre">bool</span></code> that signals a confirmed commit operation.</li>
-<li><strong>confirm_timeout</strong> &#8211; An <code class="docutils literal"><span class="pre">int</span></code> representing timeout interval for a confirmed commit.</li>
-<li><strong>persist</strong> &#8211; An <code class="docutils literal"><span class="pre">int</span></code> that makes the confirmed commit persistent.</li>
-<li><strong>persist_id</strong> &#8211; An <code class="docutils literal"><span class="pre">int</span></code> that is given in order to commit a persistent confirmed commit.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.copy_config">
-<code class="descname">copy_config</code><span class="sig-paren">(</span><em>provider</em>, <em>target</em>, <em>source=None</em>, <em>url=''</em>, <em>source-config=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.copy_config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Create or replace an entire <strong>target</strong> configuration from one of another source of configuration: <strong>source</strong>, <strong>url</strong>, or <strong>source-config</strong>. Only one source of configuration must be specified. If target datastore exists, it is overwritten; otherwise - new datastore is created.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>target</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing configuration being used as destination.</li>
-<li><strong>source</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing configuration being used as source.</li>
-<li><strong>url</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> representing the configuration URL.</li>
-<li><strong>source-config</strong> &#8211; <p><a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance, which represents single container in device supported model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.delete_config">
-<code class="descname">delete_config</code><span class="sig-paren">(</span><em>provider</em>, <em>target</em>, <em>url=&quot;&quot;</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.delete_config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete a configuration Datastore. The RUNNING configuration Datastore cannot be deleted.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>target</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing configuration to be deleted.</li>
-<li><strong>url</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> representing the configuration URL. Optional parameter required only when target is set to <code class="docutils literal"><span class="pre">url</span></code>.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.discard_changes">
-<code class="descname">discard_changes</code><span class="sig-paren">(</span><em>provider</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.discard_changes" title="Permalink to this definition">¶</a></dt>
-<dd><p>Used to revert the candidate configuration to the current running configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.edit_config">
-<code class="descname">edit_config</code><span class="sig-paren">(</span><em>provider</em>, <em>target</em>, <em>config</em>, <em>default_operation=''</em>, <em>error_option=''</em>, <em>test_option=''</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.edit_config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Loads all or part of a specified configuration to the specified target configuration datastore. Allows new configuration to be read from local file, remote file, or inline. If the target configuration datastore does not exist, it will be created.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>target</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing the configuration being edited.</li>
-<li><strong>config</strong> &#8211; <p>An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, which represents single container in device supported model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a>.</p>
-</li>
-<li><strong>default_operation</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> that changes default from <code class="docutils literal"><span class="pre">merge</span></code> to either <code class="docutils literal"><span class="pre">merge</span></code>, <code class="docutils literal"><span class="pre">replace</span></code>, or <code class="docutils literal"><span class="pre">none</span></code>; this parameter is optional.</li>
-<li><strong>error_option</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> that can be set to <code class="docutils literal"><span class="pre">test-then-set</span></code>, <code class="docutils literal"><span class="pre">set</span></code>, or <code class="docutils literal"><span class="pre">test-only</span></code> if the device advertises the :validate:1.1 capability; this parameter is optional.</li>
-<li><strong>test_option</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> that can be set to <code class="docutils literal"><span class="pre">stop-on-error</span></code>, <code class="docutils literal"><span class="pre">continue-on-error</span></code>, or <code class="docutils literal"><span class="pre">rollback-on-error</span></code>; this parameter is optional.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.get_config">
-<code class="descname">get_config</code><span class="sig-paren">(</span><em>provider</em>, <em>source</em>, <em>filter</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.get_config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Retrieve all or part of a specified configuration datastore.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>source</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing source configuration.</li>
-<li><strong>filter</strong> &#8211; <p>An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, which represents single container in device supported model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Filter" title="ydk.types.Filter"><code class="xref py py-class docutils literal"><span class="pre">Filter</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><p>For single entity filter - an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> as identified by the <strong>filter</strong> or <code class="docutils literal"><span class="pre">None</span></code>, if operation fails.</p>
-<p>For multiple filters - collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a> accordingly to the type of <strong>filter</strong>.</p>
-</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.get">
-<code class="descname">get</code><span class="sig-paren">(</span><em>provider</em>, <em>filter</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.get" title="Permalink to this definition">¶</a></dt>
-<dd><p>Retrieve running configuration and device state information.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>filter</strong> &#8211; <p>An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>, which represents single container in device supported model.</p>
-<p>For multiple containers the <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances must be encapsulate in Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Filter" title="ydk.types.Filter"><code class="xref py py-class docutils literal"><span class="pre">Filter</span></code></a>.</p>
-</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><p>For single entity filter - an instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> as identified by the <strong>filter</strong> or <code class="docutils literal"><span class="pre">None</span></code>, if operation fails.</p>
-<p>For multiple filters - collection of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances encapsulated into Python <code class="docutils literal"><span class="pre">list</span></code> or <a class="reference internal" href="../types.html#ydk.types.Config" title="ydk.types.Config"><code class="xref py py-class docutils literal"><span class="pre">Config</span></code></a> accordingly to the type of <strong>filter</strong>.</p>
-</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.kill_session">
-<code class="descname">kill_session</code><span class="sig-paren">(</span><em>provider</em>, <em>session_id</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.kill_session" title="Permalink to this definition">¶</a></dt>
-<dd><p>Force the termination of a NETCONF session.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>session_id</strong> &#8211; An <code class="docutils literal"><span class="pre">int</span></code> - session identifier of the NETCONF session to be terminated.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.lock">
-<code class="descname">lock</code><span class="sig-paren">(</span><em>provider</em>, <em>target</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.lock" title="Permalink to this definition">¶</a></dt>
-<dd><p>Allows the client to lock the entire configuration datastore system of a device.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>target</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing the configuration to lock.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.unlock">
-<code class="descname">unlock</code><span class="sig-paren">(</span><em>provider</em>, <em>target</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.unlock" title="Permalink to this definition">¶</a></dt>
-<dd><p>Used to release a configuration lock, previously obtained with the LOCK operation.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>target</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing the configuration to unlock.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.services.NetconfService.validate">
-<code class="descname">validate</code><span class="sig-paren">(</span><em>provider</em>, <em>source=None</em>, <em>url=''</em>, <em>source_config=None</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.services.NetconfService.validate" title="Permalink to this definition">¶</a></dt>
-<dd><p>Execute a validate operation to validate the contents of the specified configuration.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>provider</strong> &#8211; <a class="reference internal" href="../providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> instance.</li>
-<li><strong>source</strong> &#8211; An instance of <a class="reference internal" href="#ydk.ext.services.Datastore" title="ydk.ext.services.Datastore"><code class="xref py py-class docutils literal"><span class="pre">Datastore</span></code></a> representing the configuration datastore to validate.</li>
-<li><strong>url</strong> &#8211; A <code class="docutils literal"><span class="pre">str</span></code> representing the configuration <strong>url</strong>.</li>
-<li><strong>source_config</strong> &#8211; <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> An instance of <a class="reference internal" href="../types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> representing the configuration to validate.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first"><code class="docutils literal"><span class="pre">True</span></code> if the operation succeeds, <code class="docutils literal"><span class="pre">False</span></code> - otherwise.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last"><a class="reference internal" href="../errors.html#ydk.errors.YServiceProviderError" title="ydk.errors.YServiceProviderError"><code class="xref py py-exc docutils literal"><span class="pre">YServiceProviderError</span></code></a>, if error has occurred.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="gnmi_service.html" class="btn btn-neutral float-right" title="gNMI Service API" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="executor_service.html" class="btn btn-neutral" title="Executor Service" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/services/services.html b/docs/api/services/services.html
deleted file mode 100644
index 02801db24..000000000
--- a/docs/api/services/services.html
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Services &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../../index.html"/>
-        <link rel="up" title="YDK API" href="../class_hierarchy.html"/>
-        <link rel="next" title="Codec Services" href="codec_service.html"/>
-        <link rel="prev" title="YDK API" href="../class_hierarchy.html"/> 
-
-  
-  <script src="../../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="../class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Services</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l4"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l4"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="../providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../filters.html">Filters</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../types.html">Types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="../errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="../path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="../class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-    <li>Services</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="services">
-<span id="ref-service"></span><h1>Services<a class="headerlink" href="#services" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="codec_service.html">Codec Services</a></li>
-<li class="toctree-l1"><a class="reference internal" href="crud_service.html">CRUD Service</a></li>
-<li class="toctree-l1"><a class="reference internal" href="executor_service.html">Executor Service</a></li>
-<li class="toctree-l1"><a class="reference internal" href="netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l1"><a class="reference internal" href="gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l1"><a class="reference internal" href="gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="codec_service.html" class="btn btn-neutral float-right" title="Codec Services" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../class_hierarchy.html" class="btn btn-neutral" title="YDK API" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../../_static/jquery.js"></script>
-      <script type="text/javascript" src="../../_static/underscore.js"></script>
-      <script type="text/javascript" src="../../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api/types.html b/docs/api/types.html
deleted file mode 100644
index fe0a10389..000000000
--- a/docs/api/types.html
+++ /dev/null
@@ -1,1134 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Types &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="YDK API" href="class_hierarchy.html"/>
-        <link rel="next" title="Errors" href="errors.html"/>
-        <link rel="prev" title="Filters" href="filters.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../api_guide.html">API Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="reference internal" href="class_hierarchy.html">YDK API</a><ul class="current">
-<li class="toctree-l3"><a class="reference internal" href="services/services.html">Services</a></li>
-<li class="toctree-l3"><a class="reference internal" href="providers/providers.html">Service Providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="filters.html">Filters</a></li>
-<li class="toctree-l3 current"><a class="current reference internal" href="#">Types</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#yang-built-in-types">YANG built-in types</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#ydk-types">YDK types</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#utility-functions">Utility functions</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#examples">Examples</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#validation">Validation</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../api_guide.html">API Guide</a> &raquo;</li>
-      
-          <li><a href="class_hierarchy.html">YDK API</a> &raquo;</li>
-      
-    <li>Types</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="module-ydk.types">
-<span id="types"></span><h1><a class="toc-backref" href="#toc-entry-1">Types</a><a class="headerlink" href="#module-ydk.types" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#module-ydk.types" id="toc-entry-1">Types</a><ul>
-<li><a class="reference internal" href="#yang-built-in-types" id="toc-entry-2">YANG built-in types</a></li>
-<li><a class="reference internal" href="#ydk-types" id="toc-entry-3">YDK types</a></li>
-<li><a class="reference internal" href="#utility-functions" id="toc-entry-4">Utility functions</a></li>
-<li><a class="reference internal" href="#examples" id="toc-entry-5">Examples</a><ul>
-<li><a class="reference internal" href="#how-instantiate-and-use-entity-objects" id="toc-entry-6">How instantiate and use Entity objects</a></li>
-<li><a class="reference internal" href="#how-to-assign-values-to-leaves" id="toc-entry-7">How to assign values to leaves</a></li>
-<li><a class="reference internal" href="#how-to-append-values-to-leaf-list" id="toc-entry-8">How to append values to leaf-list</a></li>
-<li><a class="reference internal" href="#how-to-setting-the-read-leaf-values" id="toc-entry-9">How to setting the read leaf values</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#validation" id="toc-entry-10">Validation</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>This module contains YDK Python types. It provides built-in types specified in
-<a class="reference external" href="https://tools.ietf.org/html/rfc6020">YANG RFC 6020</a> and types used in YDK Python APIs.</p>
-<div class="section" id="yang-built-in-types">
-<span id="types-yang"></span><h2><a class="toc-backref" href="#toc-entry-2">YANG built-in types</a><a class="headerlink" href="#yang-built-in-types" title="Permalink to this headline">¶</a></h2>
-<p>For <a class="reference external" href="https://tools.ietf.org/html/rfc6020#section-4.2.4">YANG Built-In types</a>,
-ydkgen generates Python classes for <code class="docutils literal"><span class="pre">bits</span></code>, <code class="docutils literal"><span class="pre">decimal64</span></code>, <code class="docutils literal"><span class="pre">empty</span></code>,
-<code class="docutils literal"><span class="pre">enumeration</span></code>, <code class="docutils literal"><span class="pre">identityref</span></code> and <code class="docutils literal"><span class="pre">instance-identifier</span></code>. Other built-in
-types, such as <code class="docutils literal"><span class="pre">boolean</span></code> and <code class="docutils literal"><span class="pre">int8</span></code> could be specified by <a class="reference internal" href="#ydk.types.YLeaf" title="ydk.types.YLeaf"><code class="xref py py-class docutils literal"><span class="pre">YLeaf</span></code></a>
-and <a class="reference internal" href="#ydk.types.YType" title="ydk.types.YType"><code class="xref py py-class docutils literal"><span class="pre">YType</span></code></a>.</p>
-<dl class="class">
-<dt id="ydk.types.Bits">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Bits</code><a class="headerlink" href="#ydk.types.Bits" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents a YANG built-in bits type.</p>
-<p>Instantiate a bit object:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Bits</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">bits</span> <span class="o">=</span> <span class="n">Bits</span><span class="p">()</span>
-</pre></div>
-</div>
-<dl class="method">
-<dt>
-<code class="descname">__setitem__(self, name, value):</code></dt>
-<dd><p>Called to implement assignment to <code class="docutils literal"><span class="pre">self[name]</span></code>. Assign boolean value for <code class="docutils literal"><span class="pre">name</span></code>:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">bits</span><span class="p">[</span><span class="s1">&#39;disable-nagle&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">__getitem__(self, name):</code></dt>
-<dd><p>Called to implement evaluation of <code class="docutils literal"><span class="pre">self[name]</span></code>. Return boolean value for <code class="docutils literal"><span class="pre">name</span></code>:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">bits</span><span class="p">[</span><span class="s1">&#39;disable-nagle&#39;</span><span class="p">]</span>
-<span class="go">False</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">get_bitmap(self):</code></dt>
-<dd><p>Return a dictionary wrapper for an internal C++ <code class="docutils literal"><span class="pre">std::map&lt;std::string,</span> <span class="pre">bool&gt;</span></code> bitmap:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">bits</span><span class="o">.</span><span class="n">get_bitmap</span><span class="p">()</span>
-<span class="go">{&#39;disable-nagle&#39;: False}</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Decimal64">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Decimal64</code><span class="sig-paren">(</span><em>value</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Decimal64" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents a YANG built-in decimal64 type.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>value</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) String representation of value:</td>
-</tr>
-</tbody>
-</table>
-<p>Instantiate a decimal64 object:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Decimal64</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">decimal</span> <span class="o">=</span> <span class="n">Decimal64</span><span class="p">(</span><span class="s1">&#39;922337203685.4775807&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-<dl class="attribute">
-<dt id="ydk.types.Decimal64.value">
-<code class="descname">value</code><a class="headerlink" href="#ydk.types.Decimal64.value" title="Permalink to this definition">¶</a></dt>
-<dd><p>A string representation for decimal value.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">decimal</span><span class="o">.</span><span class="n">value</span>
-<span class="go">&#39;922337203685.4775807&#39;</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Empty">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Empty</code><a class="headerlink" href="#ydk.types.Empty" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents a YANG built-in empty type.</p>
-<p>Instantiate an empty object:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Empty</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">empty</span> <span class="o">=</span> <span class="n">Empty</span><span class="p">()</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Enum">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Enum</code><a class="headerlink" href="#ydk.types.Enum" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents a YANG built-in enum type, a base type for all YDK enums.
-The usage is the same as a Python enum:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp_types</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">e</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">BgpSessionDirection</span><span class="o">.</span><span class="n">INBOUND</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Identity">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Identity</code><a class="headerlink" href="#ydk.types.Identity" title="Permalink to this definition">¶</a></dt>
-<dd><p>Represents a YANG built-in identity type, a base type for all YDK identities:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp_types</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">identity</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">L3VpnIpv6Multicast</span><span class="p">()</span>
-</pre></div>
-</div>
-</dd></dl>
-
-</div>
-<div class="section" id="ydk-types">
-<span id="types-ydk"></span><h2><a class="toc-backref" href="#toc-entry-3">YDK types</a><a class="headerlink" href="#ydk-types" title="Permalink to this headline">¶</a></h2>
-<dl class="class">
-<dt id="ydk.types.EncodingFormat">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">EncodingFormat</code><a class="headerlink" href="#ydk.types.EncodingFormat" title="Permalink to this definition">¶</a></dt>
-<dd><p>Enum class for encoding format.</p>
-<dl class="data">
-<dt id="ydk.types.EncodingFormat.XML">
-<code class="descname">XML</code><a class="headerlink" href="#ydk.types.EncodingFormat.XML" title="Permalink to this definition">¶</a></dt>
-<dd><p>XML format.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.EncodingFormat.JSON">
-<code class="descname">JSON</code><a class="headerlink" href="#ydk.types.EncodingFormat.JSON" title="Permalink to this definition">¶</a></dt>
-<dd><p>JSON format.</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Entity">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Entity</code><a class="headerlink" href="#ydk.types.Entity" title="Permalink to this definition">¶</a></dt>
-<dd><p>Super class of all classes that represent containers and list elements in YANG.</p>
-<dl class="attribute">
-<dt id="ydk.types.Entity.parent">
-<code class="descname">parent</code><a class="headerlink" href="#ydk.types.Entity.parent" title="Permalink to this definition">¶</a></dt>
-<dd><p>Pointer to parent entity; the <cite>parent</cite> is set automatically during entity initialization except for presence container, which must be set manually after presence container is initialized</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.yang_name">
-<code class="descname">yang_name</code><a class="headerlink" href="#ydk.types.Entity.yang_name" title="Permalink to this definition">¶</a></dt>
-<dd><p>YANG name of container or list that this entity represents</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.yang_parent_name">
-<code class="descname">yang_parent_name</code><a class="headerlink" href="#ydk.types.Entity.yang_parent_name" title="Permalink to this definition">¶</a></dt>
-<dd><p>YANG name of container or list of parent entity</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.yfilter">
-<code class="descname">yfilter</code><a class="headerlink" href="#ydk.types.Entity.yfilter" title="Permalink to this definition">¶</a></dt>
-<dd><p>The attribute of type <a class="reference internal" href="filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">YFilter</span></code></a> can be set to perform various operations</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.is_presence_container">
-<code class="descname">is_presence_container</code><a class="headerlink" href="#ydk.types.Entity.is_presence_container" title="Permalink to this definition">¶</a></dt>
-<dd><p>Boolean flag set to <cite>True</cite> if this entity represents presence container</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.is_top_level_class">
-<code class="descname">is_top_level_class</code><a class="headerlink" href="#ydk.types.Entity.is_top_level_class" title="Permalink to this definition">¶</a></dt>
-<dd><p>Boolean flag set to <cite>True</cite> if this entity represents top-level container (does not have parent entity)</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.has_list_ancestor">
-<code class="descname">has_list_ancestor</code><a class="headerlink" href="#ydk.types.Entity.has_list_ancestor" title="Permalink to this definition">¶</a></dt>
-<dd><p>Boolean flag set to <cite>True</cite> if this entity is member of a list</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.ignore_validation">
-<code class="descname">ignore_validation</code><a class="headerlink" href="#ydk.types.Entity.ignore_validation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Boolean flag for user to control validation of entity data (leaf and leaf-list data values); default setting is <cite>False</cite>, meaning the validation is on</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.ylist_key_names">
-<code class="descname">ylist_key_names</code><a class="headerlink" href="#ydk.types.Entity.ylist_key_names" title="Permalink to this definition">¶</a></dt>
-<dd><p>If this entity is member of a list, the attribute specifies <code class="docutils literal"><span class="pre">list</span></code> of leaf names, which represent list keys</p>
-</dd></dl>
-
-<dl class="attribute">
-<dt id="ydk.types.Entity.ylist_key">
-<code class="descname">ylist_key</code><a class="headerlink" href="#ydk.types.Entity.ylist_key" title="Permalink to this definition">¶</a></dt>
-<dd><p>If this entity is member of a <cite>YList</cite>, the <cite>ylist_key</cite> is set to composite key of this entity</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.clone">
-<code class="descname">clone</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.clone" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns complete copy of this entity</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.get_segment_path">
-<code class="descname">get_segment_path</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.get_segment_path" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns relative path of this entity in terms of XPath</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.get_absolute_path">
-<code class="descname">get_absolute_path</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.get_absolute_path" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns absolute path of this entity in terms of XPath</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.has_data">
-<code class="descname">has_data</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.has_data" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns <cite>True</cite> if any leaf in this entity or its child entity is assigned value; <cite>False</cite> otherwise</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.has_operation">
-<code class="descname">has_operation</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.has_operation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Returns <cite>True</cite> if any leaf or container in this entity or its child entity has setting of <cite>yfilter</cite>; <cite>False</cite> otherwise</p>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">void set_filter(path, filter)</code></dt>
-<dd><p>Sets <cite>yfilter</cite> value in leaf</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>path</strong> &#8211; YANG name of the leaf</li>
-<li><strong>filter</strong> &#8211; <a class="reference internal" href="filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">YFilter</span></code></a>, filter value</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.Entity.children">
-<code class="descname">children</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.Entity.children" title="Permalink to this definition">¶</a></dt>
-<dd><p>Gets dictionary of child entities, where child key is a segment path of child entity</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.EntityCollection">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">EntityCollection</code><a class="headerlink" href="#ydk.types.EntityCollection" title="Permalink to this definition">¶</a></dt>
-<dd><p>Base class to represent collection of unique <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances. EntityCollection designed as a wrapper class around ordered dictionary collection of type <code class="docutils literal"><span class="pre">OrderedDict</span></code>.
-It is created specifically to collect Entity class instances. Each Entity instance has unique segment path value, which is used as a key in the dictionary.
-If &#8216;entity&#8217; is and instance of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class, the key could be retrieved ad &#8216;entity.get_segment_path()&#8217; or simply &#8216;entity.path()&#8217;.</p>
-<dl class="method">
-<dt>
-<code class="descname">__init__(*entities):</code></dt>
-<dd><p>Create <strong>EntityCollection</strong> instance:</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>entities</strong> &#8211; If not present or <code class="docutils literal"><span class="pre">None</span></code>, creates empty collection. Otherwise the instances of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class should be listed as parameters.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">Exception <code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code>, if type of <strong>entities</strong> is different.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">append(entities):</code></dt>
-<dd><p>Add entity or multiple entities to collection.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>entities</strong> &#8211; Instance of an <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> or Python <code class="docutils literal"><span class="pre">list</span></code> of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instances.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Raises:</th><td class="field-body">Exception <code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code>, if type of <strong>entities</strong> is different.</td>
-</tr>
-</tbody>
-</table>
-<p>Example usage for creating <strong>EntityCollection</strong>:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.ydktest</span> <span class="kn">import</span> <span class="n">ydktest_sanity</span> <span class="k">as</span> <span class="n">ysanity</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EntityCollection</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">runner</span> <span class="o">=</span> <span class="n">ysanity</span><span class="o">.</span><span class="n">Runner</span><span class="p">()</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">native</span> <span class="o">=</span> <span class="n">ysanity</span><span class="o">.</span><span class="n">Native</span><span class="p">()</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span> <span class="o">=</span> <span class="n">EntityCollection</span><span class="p">()</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">runner</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">native</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="c1"># or simply</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span> <span class="o">=</span> <span class="n">EntityCollection</span><span class="p">(</span><span class="n">runner</span><span class="p">,</span> <span class="n">native</span><span class="p">)</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.__getitem__">
-<code class="descname">__getitem__</code><span class="sig-paren">(</span><em>item</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.__getitem__" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get single entity instance from collection.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>item</strong> &#8211; <p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">int</span></code>, the operator returns <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance by its sequence number in the collection.</p>
-<p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">str</span></code>, the operator returns <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance, which has matching key (entity.path()==item).</p>
-<p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">Entity</span></code>, the operator returns <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance, which has matching key (entity.path()==item.path()).</p>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">Instance of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> or <code class="docutils literal"><span class="pre">None</span></code>, if matching instance is not in the collection.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body">Exception <code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code>, if type of <strong>item</strong> is other than <code class="docutils literal"><span class="pre">int</span></code> or <code class="docutils literal"><span class="pre">str</span></code> or <code class="docutils literal"><span class="pre">Entity</span></code>.</td>
-</tr>
-</tbody>
-</table>
-<p>Examples for accessing <strong>EntityCollection</strong> members:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.ydktest</span> <span class="kn">import</span> <span class="n">ydktest_sanity</span> <span class="k">as</span> <span class="n">ysanity</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EntityCollection</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span> <span class="o">=</span> <span class="n">EntityCollection</span><span class="p">(</span><span class="n">ysanity</span><span class="o">.</span><span class="n">Runner</span><span class="p">(),</span> <span class="n">ysanity</span><span class="o">.</span><span class="n">Native</span><span class="p">())</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">runner</span> <span class="o">=</span> <span class="n">config</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">native</span> <span class="o">=</span> <span class="n">config</span><span class="p">[</span><span class="s1">&#39;ydktest-sanity:native&#39;</span><span class="p">]</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">native</span> <span class="o">=</span> <span class="n">config</span><span class="p">[</span><span class="n">ysanity</span><span class="o">.</span><span class="n">Native</span><span class="p">()]</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.entities">
-<code class="descname">entities</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.entities" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get collection of all entities as Python <code class="docutils literal"><span class="pre">list</span></code> container. If collection is empty the method returns empty list.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.keys">
-<code class="descname">keys</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.keys" title="Permalink to this definition">¶</a></dt>
-<dd><p>Get list of keys for the collection entities. If collection is empty, the method returns empty list.</p>
-<p>Examples of accessing the entire <strong>EntityCollection</strong> content:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.ydktest</span> <span class="kn">import</span> <span class="n">ydktest_sanity</span> <span class="k">as</span> <span class="n">ysanity</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EntityCollection</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span> <span class="o">=</span> <span class="n">EntityCollection</span><span class="p">(</span><span class="n">ysanity</span><span class="o">.</span><span class="n">Runner</span><span class="p">(),</span> <span class="n">ysanity</span><span class="o">.</span><span class="n">Native</span><span class="p">())</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">config</span><span class="o">.</span><span class="n">entities</span><span class="p">())</span>
-<span class="go">[&#39;ydk.models.ydktest.ydktest_sanity.Runner&#39;, &#39;ydk.models.ydktest.ydktest_sanity.Native&#39;]</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">config</span><span class="o">.</span><span class="n">keys</span><span class="p">())</span>
-<span class="go">[&#39;ydktest-sanity:runner&#39;, &#39;ydktest-sanity:native&#39;]</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.clear">
-<code class="descname">clear</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.clear" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete all collection members.</p>
-</dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.pop">
-<code class="descname">pop</code><span class="sig-paren">(</span><em>item</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.pop" title="Permalink to this definition">¶</a></dt>
-<dd><p>Delete single entity instance from collection.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>item</strong> &#8211; <p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">int</span></code>, finds and deletes collection member by its sequence number.</p>
-<p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">str</span></code>, finds and deletes collection member, which has <strong>Entity.get_segment_path()==item</strong>.</p>
-<p>If <strong>item</strong> type is <code class="docutils literal"><span class="pre">Entity</span></code>, finds and deletes collection member, which has matching key.</p>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> instance of deleted member of collection, or <code class="docutils literal"><span class="pre">None</span></code>, if matching instance is not found in collection.</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body">Exception <code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code>, if type of <strong>item</strong> is other than <code class="docutils literal"><span class="pre">int</span></code> or <code class="docutils literal"><span class="pre">str</span></code> or <code class="docutils literal"><span class="pre">Entity</span></code>.</td>
-</tr>
-</tbody>
-</table>
-<p>Examples of deleting items in the collection:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.models.ydktest</span> <span class="kn">import</span> <span class="n">ydktest_sanity</span> <span class="k">as</span> <span class="n">ysanity</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EntityCollection</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">config</span> <span class="o">=</span> <span class="n">EntityCollection</span><span class="p">(</span><span class="n">ysanity</span><span class="o">.</span><span class="n">Runner</span><span class="p">(),</span> <span class="n">ysanity</span><span class="o">.</span><span class="n">Native</span><span class="p">())</span>
-<span class="go">&gt;&gt;&gt;</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">native</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s1">&#39;ydktest-sanity:native&#39;</span><span class="p">)</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="c1"># or</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="k">del</span> <span class="n">config</span><span class="p">[</span><span class="n">ysanity</span><span class="o">.</span><span class="n">Runner</span><span class="p">()]</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<p>The class also overwrites the following methods of <code class="docutils literal"><span class="pre">OrderedDict</span></code> class:</p>
-<dl class="method">
-<dt id="ydk.types.EntityCollection.has_key">
-<code class="descname">has_key</code><span class="sig-paren">(</span><em>key</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.has_key" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.get">
-<code class="descname">get</code><span class="sig-paren">(</span><em>item</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.get" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.__eq__">
-<code class="descname">__eq__</code><span class="sig-paren">(</span><em>other</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.__eq__" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.__ne__">
-<code class="descname">__ne__</code><span class="sig-paren">(</span><em>other</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.__ne__" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.__len__">
-<code class="descname">__len__</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.__len__" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt id="ydk.types.EntityCollection.__delitem__">
-<code class="descname">__delitem__</code><span class="sig-paren">(</span><em>item</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.EntityCollection.__delitem__" title="Permalink to this definition">¶</a></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">__iter__():</code></dt>
-<dd></dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">__str__():</code></dt>
-<dd></dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Config">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Config</code><a class="headerlink" href="#ydk.types.Config" title="Permalink to this definition">¶</a></dt>
-<dd><p>Alias of class <a class="reference internal" href="#ydk.types.EntityCollection" title="ydk.types.EntityCollection"><code class="xref py py-class docutils literal"><span class="pre">EntityCollection</span></code></a></p>
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.Filter">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">Filter</code><a class="headerlink" href="#ydk.types.Filter" title="Permalink to this definition">¶</a></dt>
-<dd><p>Alias of class <a class="reference internal" href="#ydk.types.EntityCollection" title="ydk.types.EntityCollection"><code class="xref py py-class docutils literal"><span class="pre">EntityCollection</span></code></a></p>
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.YLeaf">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">YLeaf</code><span class="sig-paren">(</span><em>leaf_type</em>, <em>name</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.YLeaf" title="Permalink to this definition">¶</a></dt>
-<dd><p>Concrete class that represents a YANG <code class="docutils literal"><span class="pre">leaf</span></code> to which data can be assigned.</p>
-<p>Create a <code class="docutils literal"><span class="pre">YLeaf</span></code> instance.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>leaf_type</strong> &#8211; (<a class="reference internal" href="#ydk.types.YType" title="ydk.types.YType"><code class="xref py py-class docutils literal"><span class="pre">YType</span></code></a>) YANG type for this <code class="docutils literal"><span class="pre">leaf</span></code>.</li>
-<li><strong>name</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) YANG argument for this leaf.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="attribute">
-<dt id="ydk.types.YLeaf.operation">
-<code class="descname">operation</code><a class="headerlink" href="#ydk.types.YLeaf.operation" title="Permalink to this definition">¶</a></dt>
-<dd><p>Optional attribute of the <code class="docutils literal"><span class="pre">Entity</span></code> class which can be set to perform various <a class="reference internal" href="filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">operations</span></code></a>, see <a class="reference internal" href="../guides/crud_guide.html#netconf-operations"><span class="std std-ref">How do I create, update, read and delete?</span></a>.</p>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">set(self, value):</code></dt>
-<dd><p>Set value for current leaf.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>value</strong> &#8211; Value to be set.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">get(self):</code></dt>
-<dd><p>Get leaf value.</p>
-</dd></dl>
-
-<p>Example usage for creating a <code class="docutils literal"><span class="pre">YLeaf</span></code> of YANG type <code class="docutils literal"><span class="pre">int8</span></code>:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">YLeaf</span><span class="p">,</span> <span class="n">YType</span>
-<span class="gp">&gt;&gt;&gt; </span><span class="n">yleaf</span> <span class="o">=</span> <span class="n">YLeaf</span><span class="p">(</span><span class="n">YType</span><span class="o">.</span><span class="n">int8</span><span class="p">,</span> <span class="s1">&#39;afi-safi-name&#39;</span><span class="p">)</span>
-</pre></div>
-</div>
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.YLeafList">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">YLeafList</code><span class="sig-paren">(</span><em>self</em>, <em>leaflist_type</em>, <em>name</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.YLeafList" title="Permalink to this definition">¶</a></dt>
-<dd><p>Concrete class that represents a YANG <code class="docutils literal"><span class="pre">leaf-list</span></code> to which multiple instances of data can be appended to.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
-<li><strong>leaflist_type</strong> &#8211; (<a class="reference internal" href="#ydk.types.YType" title="ydk.types.YType"><code class="xref py py-class docutils literal"><span class="pre">YType</span></code></a>) YANG type for this <code class="docutils literal"><span class="pre">leaf-list</span></code>.</li>
-<li><strong>name</strong> &#8211; (<code class="docutils literal"><span class="pre">str</span></code>) YANG argument for this <code class="docutils literal"><span class="pre">leaf-list</span></code>.</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt>
-<code class="descname">append(self, value):</code></dt>
-<dd><p>Append value to current <code class="docutils literal"><span class="pre">leaf-list</span></code>.</p>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.YList">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">YList</code><span class="sig-paren">(</span><em>parent</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.YList" title="Permalink to this definition">¶</a></dt>
-<dd><p>Concrete class that represents a YANG <code class="docutils literal"><span class="pre">list</span></code>, with pointer to its <cite>parent</cite>. The class extends <a class="reference internal" href="#ydk.types.EntityCollection" title="ydk.types.EntityCollection"><code class="xref py py-class docutils literal"><span class="pre">EntityCollection</span></code></a> and implements OrderedDict functionality.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>parent</strong> &#8211; <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> object, which hosts the YList.</td>
-</tr>
-</tbody>
-</table>
-<dl class="method">
-<dt>
-<code class="descname">append(self, item):</code></dt>
-<dd><p>Append single <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> object to current list.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>item</strong> &#8211; <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> object to be appended.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">extend(self, items):</code></dt>
-<dd><p>Append multiple instances of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class to current list.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>items</strong> &#8211; List of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> objects to be appended.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">get(self, key) and __getitem__(self, key), which implements operator `[]`</code></dt>
-<dd><p>Access list elements by their key(s), if it is defined in the Yang model.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>key</strong> &#8211; Key value for single key or key list for multiple keys as defined in the Yang model of the list.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">List element having matching key value - <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> object, or None if element is not found. If multiple elements have matching key, the function returns list of Entity objects.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="method">
-<dt>
-<code class="descname">keys(self):</code></dt>
-<dd><table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Returns:</th><td class="field-body">List of keys for all elements in the list.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</dd></dl>
-
-<dl class="class">
-<dt id="ydk.types.YType">
-<em class="property">class </em><code class="descclassname">ydk.types.</code><code class="descname">YType</code><a class="headerlink" href="#ydk.types.YType" title="Permalink to this definition">¶</a></dt>
-<dd><p>Enum class representing YANG types.</p>
-<dl class="data">
-<dt id="ydk.types.YType.bits">
-<code class="descname">bits</code><a class="headerlink" href="#ydk.types.YType.bits" title="Permalink to this definition">¶</a></dt>
-<dd><p>bits type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.boolean">
-<code class="descname">boolean</code><a class="headerlink" href="#ydk.types.YType.boolean" title="Permalink to this definition">¶</a></dt>
-<dd><p>boolean type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.decimal64">
-<code class="descname">decimal64</code><a class="headerlink" href="#ydk.types.YType.decimal64" title="Permalink to this definition">¶</a></dt>
-<dd><p>decimal64 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.empty">
-<code class="descname">empty</code><a class="headerlink" href="#ydk.types.YType.empty" title="Permalink to this definition">¶</a></dt>
-<dd><p>empty type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.enumeration">
-<code class="descname">enumeration</code><a class="headerlink" href="#ydk.types.YType.enumeration" title="Permalink to this definition">¶</a></dt>
-<dd><p>enumeration type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.identityref">
-<code class="descname">identityref</code><a class="headerlink" href="#ydk.types.YType.identityref" title="Permalink to this definition">¶</a></dt>
-<dd><p>identityref type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.int16">
-<code class="descname">int16</code><a class="headerlink" href="#ydk.types.YType.int16" title="Permalink to this definition">¶</a></dt>
-<dd><p>int16 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.int32">
-<code class="descname">int32</code><a class="headerlink" href="#ydk.types.YType.int32" title="Permalink to this definition">¶</a></dt>
-<dd><p>int32 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.int64">
-<code class="descname">int64</code><a class="headerlink" href="#ydk.types.YType.int64" title="Permalink to this definition">¶</a></dt>
-<dd><p>int64 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.int8">
-<code class="descname">int8</code><a class="headerlink" href="#ydk.types.YType.int8" title="Permalink to this definition">¶</a></dt>
-<dd><p>int8 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.str">
-<code class="descname">str</code><a class="headerlink" href="#ydk.types.YType.str" title="Permalink to this definition">¶</a></dt>
-<dd><p>string type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.uint16">
-<code class="descname">uint16</code><a class="headerlink" href="#ydk.types.YType.uint16" title="Permalink to this definition">¶</a></dt>
-<dd><p>uint16 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.uint32">
-<code class="descname">uint32</code><a class="headerlink" href="#ydk.types.YType.uint32" title="Permalink to this definition">¶</a></dt>
-<dd><p>uint32 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.uint64">
-<code class="descname">uint64</code><a class="headerlink" href="#ydk.types.YType.uint64" title="Permalink to this definition">¶</a></dt>
-<dd><p>uint64 type.</p>
-</dd></dl>
-
-<dl class="data">
-<dt id="ydk.types.YType.uint8">
-<code class="descname">uint8</code><a class="headerlink" href="#ydk.types.YType.uint8" title="Permalink to this definition">¶</a></dt>
-<dd><p>uint8 type.</p>
-</dd></dl>
-
-</dd></dl>
-
-</div>
-<div class="section" id="utility-functions">
-<h2><a class="toc-backref" href="#toc-entry-4">Utility functions</a><a class="headerlink" href="#utility-functions" title="Permalink to this headline">¶</a></h2>
-<dl class="function">
-<dt id="ydk.types.entity_to_dict">
-<code class="descclassname">ydk.types.</code><code class="descname">entity_to_dict</code><span class="sig-paren">(</span><em>entity</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.entity_to_dict" title="Permalink to this definition">¶</a></dt>
-<dd><p>Utility function to get dictionary of all leaves and presence containers recursively in this entity and its children.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>entity</strong> &#8211; An instance of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>.</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body">A dictionary, where key represents leaf absolute path and value represents string value of the leaf;
-In case of presence container the key represents the container&#8217;s absolute path and value is empty string.</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-<dl class="function">
-<dt id="ydk.types.entity_diff">
-<code class="descclassname">ydk.types.</code><code class="descname">entity_diff</code><span class="sig-paren">(</span><em>entity1</em>, <em>entity2</em><span class="sig-paren">)</span><a class="headerlink" href="#ydk.types.entity_diff" title="Permalink to this definition">¶</a></dt>
-<dd><p>Utility function to compare two entities of the same underlying type.
-Compared are presence containers and all leaves recursively.</p>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first simple">
-<li><strong>entity1</strong> &#8211; An instance of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>.</li>
-<li><strong>entity2</strong> &#8211; An instance of <a class="reference internal" href="#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a>.</li>
-</ul>
-</td>
-</tr>
-<tr class="field-even field"><th class="field-name">Returns:</th><td class="field-body"><p class="first">A dictionary of differences between two entities, where key of type <cite>str</cite> represents leaf or presence
-container absolute path and value of type <cite>tuple</cite> represents difference in <cite>str</cite> values of the leaves.</p>
-</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Raises:</th><td class="field-body"><p class="first last">Exception <code class="xref py py-exc docutils literal"><span class="pre">YInvalidArgumentError</span></code>, if supplied entities are None or have different types.</p>
-</td>
-</tr>
-</tbody>
-</table>
-</dd></dl>
-
-</div>
-<div class="section" id="examples">
-<h2><a class="toc-backref" href="#toc-entry-5">Examples</a><a class="headerlink" href="#examples" title="Permalink to this headline">¶</a></h2>
-<p>In examples below we assume that you have <cite>openconfig</cite> bundle installed, see <a class="reference internal" href="../getting_started.html#howto-install"><span class="std std-ref">Core Installation</span></a></p>
-<div class="section" id="how-instantiate-and-use-entity-objects">
-<h3><a class="toc-backref" href="#toc-entry-6">How instantiate and use Entity objects</a><a class="headerlink" href="#how-instantiate-and-use-entity-objects" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span> <span class="k">as</span> <span class="n">oc_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp_types</span> <span class="k">as</span> <span class="n">oc_bgp_types</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_routing_policy</span> <span class="k">as</span> <span class="n">oc_routing_policy</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">oc_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-<span class="n">afi_safi</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">Global_</span><span class="o">.</span><span class="n">AfiSafis</span><span class="o">.</span><span class="n">AfiSafi</span><span class="p">()</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">afi_safis</span><span class="o">.</span><span class="n">afi_safi</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">afi_safi</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="how-to-assign-values-to-leaves">
-<h3><a class="toc-backref" href="#toc-entry-7">How to assign values to leaves</a><a class="headerlink" href="#how-to-assign-values-to-leaves" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65172</span>                                          <span class="c1"># uint32</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">router_id</span> <span class="o">=</span> <span class="s1">&#39;1.2.3.4&#39;</span>                                <span class="c1"># string</span>
-<span class="n">afi_safi</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">oc_bgp_types</span><span class="o">.</span><span class="n">L3VpnIpv4Unicast</span><span class="p">()</span>                <span class="c1"># identityref</span>
-<span class="n">afi_safi</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">enabled</span> <span class="o">=</span> <span class="kc">True</span>                                          <span class="c1"># bool</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">peer_type</span> <span class="o">=</span> <span class="n">oc_bgp_types</span><span class="o">.</span><span class="n">PeerType</span><span class="o">.</span><span class="n">INTERNAL</span>              <span class="c1"># enum</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">timers</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">hold_time</span> <span class="o">=</span> <span class="n">Decimal64</span><span class="p">(</span><span class="s1">&#39;90.00&#39;</span><span class="p">)</span>                   <span class="c1"># decimal64</span>
-
-<span class="n">routing_policy</span> <span class="o">=</span> <span class="n">oc_routing_policy</span><span class="o">.</span><span class="n">RoutingPolicy</span><span class="p">()</span>
-<span class="n">policy_definition</span> <span class="o">=</span> <span class="n">routing_policy</span><span class="o">.</span><span class="n">policy_definitions</span><span class="o">.</span><span class="n">PolicyDefinition</span><span class="p">()</span>
-<span class="n">statement</span> <span class="o">=</span> <span class="n">policy_definition</span><span class="o">.</span><span class="n">statements</span><span class="o">.</span><span class="n">Statement</span><span class="p">()</span>
-<span class="n">statement</span><span class="o">.</span><span class="n">actions</span><span class="o">.</span><span class="n">accept_route</span> <span class="o">=</span> <span class="n">Empty</span><span class="p">()</span>                                <span class="c1"># empty</span>
-
-<span class="n">node</span><span class="o">.</span><span class="n">bits_type</span><span class="p">[</span><span class="s1">&#39;first-option&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>                                   <span class="c1"># bits, node is a dummy container</span>
-<span class="n">node</span><span class="o">.</span><span class="n">bits_type</span><span class="p">[</span><span class="s1">&#39;second-option&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="how-to-append-values-to-leaf-list">
-<h3><a class="toc-backref" href="#toc-entry-8">How to append values to leaf-list</a><a class="headerlink" href="#how-to-append-values-to-leaf-list" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">config</span><span class="o">.</span><span class="n">as_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="mi">65172</span><span class="p">)</span>                                            <span class="c1"># uint32, config is a dummy container</span>
-<span class="n">config</span><span class="o">.</span><span class="n">router_id</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s2">&quot;1.2.3.4&quot;</span><span class="p">)</span>                                      <span class="c1"># ip-address, config is a dummy container</span>
-<span class="nb">id</span> <span class="o">=</span> <span class="n">oc_bgp_types</span><span class="o">.</span><span class="n">L3VpnIpv4Unicast</span>                                      <span class="c1"># identityref</span>
-<span class="n">config</span><span class="o">.</span><span class="n">types_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="nb">id</span><span class="p">)</span>                                            <span class="c1"># identityref, config is a dummy container</span>
-<span class="n">config</span><span class="o">.</span><span class="n">enabled_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">false</span><span class="p">)</span>                                       <span class="c1"># bool, config is a dummy container</span>
-<span class="n">config</span><span class="o">.</span><span class="n">peer_types</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">PeerTypeEnum</span><span class="p">::</span><span class="n">INTERNAL</span><span class="p">)</span>                        <span class="c1"># enum, config is a dummy container</span>
-<span class="n">deci</span> <span class="o">=</span> <span class="n">Decimal64</span><span class="p">(</span><span class="s2">&quot;1.2&quot;</span><span class="p">)</span>
-<span class="n">node</span><span class="o">.</span><span class="n">decimal_values</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">deci</span><span class="p">)</span>                                        <span class="c1"># decimal64, node is a dummy container</span>
-
-<span class="n">bits_value</span> <span class="o">=</span> <span class="n">Bits</span><span class="p">()</span>                                                     <span class="c1"># bits</span>
-<span class="n">bits_value</span><span class="p">[</span><span class="s2">&quot;first-position&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>                                     <span class="c1"># bits</span>
-<span class="n">bits_value</span><span class="p">[</span><span class="s2">&quot;first-position&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>                                    <span class="c1"># bits</span>
-<span class="n">node</span><span class="o">.</span><span class="n">bits_values</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">bits_value</span><span class="p">)</span>                                     <span class="c1"># bits, node is a dummy container</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="how-to-setting-the-read-leaf-values">
-<span id="read-filter"></span><h3><a class="toc-backref" href="#toc-entry-9">How to setting the read leaf values</a><a class="headerlink" href="#how-to-setting-the-read-leaf-values" title="Permalink to this headline">¶</a></h3>
-<p>Here we use filter for a <code class="xref cpp cpp-class docutils literal"><span class="pre">leaf</span></code> (specifically, the <cite>as number</cite> leaf) under <code class="xref py py-class docutils literal"><span class="pre">openconfig</span> <span class="pre">BGP</span></code></p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># Instantiate a bgp object representing the bgp container from the openconfig-bgp YANG model</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">ydk</span><span class="o">.</span><span class="n">models</span><span class="o">.</span><span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># Indicate that the `as number` is desried to be read</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span><span class="o">.</span><span class="n">operation</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">read</span>
-
-<span class="c1"># Instantiate the CRUD service and Netconf provider to connect to a device with address 10.0.0.1</span>
-<span class="n">CrudService</span> <span class="n">crud_service</span><span class="p">{};</span>
-<span class="n">NetconfServiceProvider</span> <span class="n">provider</span><span class="p">{</span><span class="s2">&quot;10.0.0.1&quot;</span><span class="p">,</span> <span class="s2">&quot;test&quot;</span><span class="p">,</span> <span class="s2">&quot;test&quot;</span><span class="p">,</span> <span class="mi">830</span><span class="p">};</span>
-
-<span class="c1"># Invoke the CRUD Read method</span>
-<span class="n">crud_service</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">);</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-<div class="section" id="validation">
-<h2><a class="toc-backref" href="#toc-entry-10">Validation</a><a class="headerlink" href="#validation" title="Permalink to this headline">¶</a></h2>
-<p>YDK performs local validation of leafs based on the model type definition. A few examples of validation are given below (assuming you have <code class="docutils literal"><span class="pre">openconfig</span></code> bundle installed, see <a class="reference internal" href="../getting_started.html#howto-install"><span class="std std-ref">Core Installation</span></a>).  Assigning an invalid type results in a local validation error.</p>
-<p>The <code class="xref py py-class docutils literal"><span class="pre">openconfig</span> <span class="pre">BGP</span></code> model defines the field <cite>as_</cite> as a <cite>int</cite> (specifically, unsigned 32 bit integer).</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># Instantiate a bgp object representing the bgp container from the openconfig-bgp YANG model</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">ydk</span><span class="o">.</span><span class="n">models</span><span class="o">.</span><span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="s2">&quot;Hello&quot;</span> <span class="c1">#invalid type</span>
-</pre></div>
-</td></tr></table></div>
-<p>Assigning invalid type results in a <a class="reference internal" href="errors.html#ydk.errors.YModelError" title="ydk.errors.YModelError"><code class="xref py py-class docutils literal"><span class="pre">YModelError</span></code></a> being thrown.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>YModelError: Invalid value Hello <span class="k">for</span> <span class="s1">&#39;as_&#39;</span>. Got type: <span class="s1">&#39;str&#39;</span>. Expected types: <span class="s1">&#39;int&#39;</span>
-</pre></div>
-</div>
-<p>The <code class="xref py py-class docutils literal"><span class="pre">openconfig</span> <span class="pre">BGP</span></code> model defines the field <cite>router_id</cite> as a <cite>str</cite> (specifically, with IP address pattern).</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># Instantiate a bgp object representing the bgp container from the openconfig-bgp YANG model</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">ydk</span><span class="o">.</span><span class="n">models</span><span class="o">.</span><span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">router_id</span> <span class="o">=</span> <span class="s2">&quot;Hello&quot;</span> <span class="c1">#invalid value</span>
-</pre></div>
-</td></tr></table></div>
-<p>Assigning invalid value results in a <a class="reference internal" href="errors.html#ydk.errors.YModelError" title="ydk.errors.YModelError"><code class="xref py py-class docutils literal"><span class="pre">YModelError</span></code></a> being thrown.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>YModelError:  Value <span class="s2">&quot;Hello&quot;</span> does not satisfy the constraint <span class="s2">&quot;(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])&quot;</span> <span class="o">(</span>range, length, or pattern<span class="o">)</span>. Path: /openconfig-bgp:bgp/global/config/router-id.
-</pre></div>
-</div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="errors.html" class="btn btn-neutral float-right" title="Errors" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="filters.html" class="btn btn-neutral" title="Filters" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/api_guide.html b/docs/api_guide.html
deleted file mode 100644
index 259a14809..000000000
--- a/docs/api_guide.html
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>API Guide &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/>
-        <link rel="next" title="YDK API" href="api/class_hierarchy.html"/>
-        <link rel="prev" title="Backward compatibility notes" href="guides/backward_compatibility.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" href="#">API Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="api/class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>API Guide</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="api-guide">
-<h1>API Guide<a class="headerlink" href="#api-guide" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="api/class_hierarchy.html">YDK API</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="api/services/services.html">Services</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="api/services/codec_service.html">Codec Services</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/services/crud_service.html">CRUD Service</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/services/executor_service.html">Executor Service</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/services/netconf_service.html">NETCONF Service</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/services/gnmi_service.html">gNMI Service API</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/services/gnmi_service.html#gnmi-service-examples">gNMI Service Examples</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="api/providers/providers.html">Service Providers</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/service_provider.html">ServiceProvider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/codec_provider.html">Codec Service Provider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/netconf_provider.html">NETCONF Service Provider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/gnmi_provider.html">gNMI Service Provider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/odl_provider.html">Opendaylight Service Provider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/providers/restconf_provider.html">RESTCONF Service Provider</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="api/filters.html">Filters</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/types.html">Types</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="api/types.html#yang-built-in-types">YANG built-in types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/types.html#ydk-types">YDK types</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/types.html#utility-functions">Utility functions</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/types.html#examples">Examples</a></li>
-<li class="toctree-l3"><a class="reference internal" href="api/types.html#validation">Validation</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="api/errors.html">Errors</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="api/path/path.html">YDK Path API</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="api/path/annotation.html">Annotation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/capability.html">Capability</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/codec.html">Codec</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/data_node.html">DataNode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/repository.html">Repository</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/root_schema_node.html">RootSchemaNode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/rpc.html">Rpc</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/schema_node.html">SchemaNode</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/statement.html">Statement</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/netconf_session.html">NetconfSession</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/restconf_session.html">RestconfSession</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/gnmi_session.html">gNMISession</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="api/class_hierarchy.html" class="btn btn-neutral float-right" title="YDK API" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="guides/backward_compatibility.html" class="btn btn-neutral" title="Backward compatibility notes" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/developer_guide.html b/docs/developer_guide.html
deleted file mode 100644
index 1d88b2b68..000000000
--- a/docs/developer_guide.html
+++ /dev/null
@@ -1,291 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Developer Guide &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/>
-        <link rel="next" title="Introduction" href="guides/introduction.html"/>
-        <link rel="prev" title="Getting Started" href="getting_started.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Developer Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>Developer Guide</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="developer-guide">
-<h1>Developer Guide<a class="headerlink" href="#developer-guide" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="guides/introduction.html">Introduction</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#writing-an-app">Writing an app</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#what-happens-underneath">What happens underneath</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#service-providers">Service providers</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#using-the-model-apis">Using the model APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#invoking-the-crud-service">Invoking the CRUD Service</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#using-non-top-level-objects">Using non-top level objects</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html#logging">Logging</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/crud_guide.html">How do I create, update, read and delete?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#creating-a-configuration-with-a-list-and-a-presence-class">Creating a configuration with a list and a presence class</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#creating-and-replacing-a-configuration">Creating and replacing a configuration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#creating-and-reading-a-list">Creating and reading a list</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#reading-a-leaf">Reading a leaf</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#deleting-a-list-element">Deleting a list element</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#deleting-entire-list">Deleting entire list</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#deleting-a-leaf">Deleting a leaf</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html#applying-crud-to-multiple-entities">Applying CRUD to multiple entities</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/codec_guide.html">How do I work with instances of YANG data?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/codec_guide.html#converting-between-json-and-xml">Converting between JSON and XML</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/codec_guide.html#converting-to-json">Converting to JSON</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/executor_guide.html">How do I execute RPCs?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/executor_guide.html#executing-a-rollback-rpc">Executing a rollback RPC</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/validation.html">How to Disable Validation</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guides/presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l1"><a class="reference internal" href="guides/deviation.html">What are deviations?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/deviation.html#overview">Overview</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/deviation.html#how-to-use-deviation-with-ydk">How to use deviation with YDK</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/path.html">How do I use the Path API?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html#how-do-i-create-a-basic-configuration">How do I create a basic configuration?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html#how-do-i-work-with-different-rpcs">How do I work with different RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html#how-do-i-work-with-yang-1-1-actions">How do I work with YANG 1.1 actions?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html#what-is-the-path-syntax">What is the Path syntax?</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/opendaylight.html">How do I use OpenDaylight with YDK?</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#writing-the-app">Writing the app</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#what-happens-underneath">What happens underneath</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#import-libraries">Import libraries</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#opendaylight-service-provider">OpenDaylight service provider</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#using-the-model-apis">Using the model APIs</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#invoking-the-crud-service">Invoking the CRUD Service</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html#logging">Logging</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/restconf_https.html">Using Restconf with HTTPS</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/restconf_https.html#ca-certificate-installation">CA Certificate Installation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/restconf_https.html#code-snippet">Code Snippet</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="guides/backward_compatibility.html">Backward compatibility notes</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/backward_compatibility.html#installation">Installation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/backward_compatibility.html#windows-support">Windows Support</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/backward_compatibility.html#api-changes">API Changes</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="guides/introduction.html" class="btn btn-neutral float-right" title="Introduction" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="getting_started.html" class="btn btn-neutral" title="Getting Started" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/faq.html b/docs/faq.html
deleted file mode 100644
index 0763d5f2b..000000000
--- a/docs/faq.html
+++ /dev/null
@@ -1,257 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Questions and Answers &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/>
-        <link rel="prev" title="gNMISession" href="api/path/gnmi_session.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Questions and Answers</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#how-do-i-report-a-bug-i-found">How do I report a bug I found?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#i-am-interested-in-contributing-how-do-i-do-this">I am interested in contributing. How do I do this?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#can-you-help-me-change-something-in-a-model-bundle-api">Can you help me change something in a model bundle API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#what-version-of-ydk-core-can-be-used-with-ydk-bundles">What version of YDK core can be used with YDK bundles?</a></li>
-</ul>
-</li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>Questions and Answers</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="questions-and-answers">
-<h1>Questions and Answers<a class="headerlink" href="#questions-and-answers" title="Permalink to this headline">¶</a></h1>
-<p>Please join the <a class="reference external" href="https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk">YDK community</a> to get answers to any
-YDK-related questions you may have.</p>
-<div class="section" id="how-do-i-report-a-bug-i-found">
-<h2>How do I report a bug I found?<a class="headerlink" href="#how-do-i-report-a-bug-i-found" title="Permalink to this headline">¶</a></h2>
-<p>Please use the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/issues">YDK-Gen GitHub issue tracker</a> to report any bugs that you discovered.
-Please use the <a class="reference external" href="https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk">YDK community</a> for any other questions.</p>
-</div>
-<div class="section" id="i-am-interested-in-contributing-how-do-i-do-this">
-<h2>I am interested in contributing. How do I do this?<a class="headerlink" href="#i-am-interested-in-contributing-how-do-i-do-this" title="Permalink to this headline">¶</a></h2>
-<p>YDK is an open-source project and we welcome contributions.
-Please refer to this <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/blob/master/CONTRIBUTIONS.md">brief guide</a>,
-make the changes on your fork of <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen">ydk-gen</a> and submit a pull request
-<a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/pulls">here</a>.</p>
-</div>
-<div class="section" id="can-you-help-me-change-something-in-a-model-bundle-api">
-<h2>Can you help me change something in a model bundle API?<a class="headerlink" href="#can-you-help-me-change-something-in-a-model-bundle-api" title="Permalink to this headline">¶</a></h2>
-<p>The YDK model bundle APIs are autogenerated from <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/tree/9c36cd1ab5c85c4017a784dc7175c75056e7b3fd/profiles/bundles">predefined sets of YANG models</a>.
-Please contact the owners of the respective YANG models to request any changes.</p>
-</div>
-<div class="section" id="what-version-of-ydk-core-can-be-used-with-ydk-bundles">
-<h2>What version of YDK core can be used with YDK bundles?<a class="headerlink" href="#what-version-of-ydk-core-can-be-used-with-ydk-bundles" title="Permalink to this headline">¶</a></h2>
-<p>Currently, we do not have a central location where the compatibility information between the YDK core and
-the bundle APIs is maintained.
-In general, we try to maintain backward compatibility between the releases of the core and bundles.</p>
-<p>Check the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen#backward-compatibility">Backward Compatibility</a> notes
-for more information.</p>
-<p>Also, we use the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen">ydk-gen/generate.py</a> script to generate and install the bundles.
-This tool is available for anyone to use in order to generate the bundle version in combination with YDK core version of their choice.
-For example, the below steps will generate &amp; install the <cite>cisco-ios-xr 6.5.1</cite> bundle compatible with <cite>ydk core 0.8.6</cite>:</p>
-<ol class="arabic simple">
-<li>Install third party dependency software and core components</li>
-</ol>
-<div class="highlight-sh"><div class="highlight"><pre><span></span>git clone https://github.com/CiscoDevNet/ydk-gen.git
-<span class="nb">cd</span> ydk-gen
-./install_ydk.sh --core
-</pre></div>
-</div>
-<ol class="arabic simple" start="2">
-<li>Generate and install bundle after activating Python virtual environment that was automatically created in previous step.</li>
-</ol>
-<div class="highlight-sh"><div class="highlight"><pre><span></span><span class="nb">source</span> ~/venv/bin/activate
-./generate --bundle profiles/bundles/cisco-ios-xr_6_5_1.json -i
-</pre></div>
-</div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-      
-        <a href="api/path/gnmi_session.html" class="btn btn-neutral" title="gNMISession" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/getting_started.html b/docs/getting_started.html
deleted file mode 100644
index a277dc690..000000000
--- a/docs/getting_started.html
+++ /dev/null
@@ -1,718 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Getting Started &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/>
-        <link rel="next" title="Developer Guide" href="developer_guide.html"/>
-        <link rel="prev" title="About YDK" href="about_ydk.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="#overview">Overview</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#backward-compatibility">Backward Compatibility</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#docker">Docker</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#system-requirements">System Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#core-installation">Core Installation</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#installation-script">Installation Script</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#building-from-source">Building from source</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#environment-variables">Environment variables</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#installing-third-party-dependencies">Installing third party dependencies</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#installing-core-components">Installing core components</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="#adding-gnmi-service">Adding gNMI Service</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#gnmi-service-installation">gNMI Service installation</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#gnmi-runtime-environment">gNMI runtime environment</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#bundle-installation">Bundle Installation</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#quick-installation">Quick installation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#installing-from-source">Installing from source</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#generate-ydk-components">Generate YDK components</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#generation-script">Generation script</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#build-model-bundle-profile">Build model bundle profile</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#generate-and-install-model-bundle">Generate and install model bundle</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#generate-adhoc-bundle">Generate &#8220;adhoc&#8221; bundle</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#generate-bundle-documentation">Generate bundle documentation</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="#documentation-and-support">Documentation and Support</a></li>
-<li class="toctree-l2"><a class="reference internal" href="#release-notes">Release Notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>Getting Started</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="getting-started">
-<h1><a class="toc-backref" href="#toc-entry-1">Getting Started</a><a class="headerlink" href="#getting-started" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#getting-started" id="toc-entry-1">Getting Started</a><ul>
-<li><a class="reference internal" href="#overview" id="toc-entry-2">Overview</a></li>
-<li><a class="reference internal" href="#backward-compatibility" id="toc-entry-3">Backward Compatibility</a></li>
-<li><a class="reference internal" href="#docker" id="toc-entry-4">Docker</a></li>
-<li><a class="reference internal" href="#system-requirements" id="toc-entry-5">System Requirements</a></li>
-<li><a class="reference internal" href="#core-installation" id="toc-entry-6">Core Installation</a><ul>
-<li><a class="reference internal" href="#installation-script" id="toc-entry-7">Installation Script</a></li>
-<li><a class="reference internal" href="#building-from-source" id="toc-entry-8">Building from source</a><ul>
-<li><a class="reference internal" href="#environment-variables" id="toc-entry-9">Environment variables</a></li>
-<li><a class="reference internal" href="#installing-third-party-dependencies" id="toc-entry-10">Installing third party dependencies</a></li>
-<li><a class="reference internal" href="#installing-core-components" id="toc-entry-11">Installing core components</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#adding-gnmi-service" id="toc-entry-12">Adding gNMI Service</a><ul>
-<li><a class="reference internal" href="#gnmi-service-installation" id="toc-entry-13">gNMI Service installation</a></li>
-<li><a class="reference internal" href="#gnmi-runtime-environment" id="toc-entry-14">gNMI runtime environment</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#bundle-installation" id="toc-entry-15">Bundle Installation</a><ul>
-<li><a class="reference internal" href="#quick-installation" id="toc-entry-16">Quick installation</a></li>
-<li><a class="reference internal" href="#installing-from-source" id="toc-entry-17">Installing from source</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#generate-ydk-components" id="toc-entry-18">Generate YDK components</a><ul>
-<li><a class="reference internal" href="#generation-script" id="toc-entry-19">Generation script</a></li>
-<li><a class="reference internal" href="#build-model-bundle-profile" id="toc-entry-20">Build model bundle profile</a></li>
-<li><a class="reference internal" href="#generate-and-install-model-bundle" id="toc-entry-21">Generate and install model bundle</a></li>
-<li><a class="reference internal" href="#generate-adhoc-bundle" id="toc-entry-22">Generate &#8220;adhoc&#8221; bundle</a></li>
-<li><a class="reference internal" href="#generate-bundle-documentation" id="toc-entry-23">Generate bundle documentation</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#documentation-and-support" id="toc-entry-24">Documentation and Support</a></li>
-<li><a class="reference internal" href="#release-notes" id="toc-entry-25">Release Notes</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="overview">
-<h2><a class="toc-backref" href="#toc-entry-2">Overview</a><a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
-<p>The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API
-and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers,
-plus one or more module bundles that are based on YANG models.</p>
-</div>
-<div class="section" id="backward-compatibility">
-<h2><a class="toc-backref" href="#toc-entry-3">Backward Compatibility</a><a class="headerlink" href="#backward-compatibility" title="Permalink to this headline">¶</a></h2>
-<p>The Python YDK-0.8.6 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
-However the YDK-0.8.6 generates slightly different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling YList objects.</p>
-<p><strong>NOTE.</strong> Starting from release 0.8.5 the YDK does not support Python2 interpreter as it was deprecated.</p>
-</div>
-<div class="section" id="docker">
-<h2><a class="toc-backref" href="#toc-entry-4">Docker</a><a class="headerlink" href="#docker" title="Permalink to this headline">¶</a></h2>
-<p>A <a class="reference external" href="https://docs.docker.com/engine/reference/run/">docker image</a> is automatically built with the latest ydk-gen installed.
-This be used to run ydk-gen without installing anything natively on your platform.</p>
-<p>To use the docker image, <a class="reference external" href="https://docs.docker.com/install/">install docker</a> on your system and run the below command.
-See the <a class="reference external" href="https://docs.docker.com/engine/reference/run/">docker documentation</a> for more details:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">docker</span> <span class="n">run</span> <span class="o">-</span><span class="n">it</span> <span class="n">ydksolutions</span><span class="o">/</span><span class="n">ydk</span><span class="o">-</span><span class="n">gen</span><span class="p">:</span><span class="mf">0.8.6.4</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="system-requirements">
-<h2><a class="toc-backref" href="#toc-entry-5">System Requirements</a><a class="headerlink" href="#system-requirements" title="Permalink to this headline">¶</a></h2>
-<p>The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:</p>
-<blockquote>
-<div><ul class="simple">
-<li>Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)</li>
-<li>Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)</li>
-<li>Linux RHEL version 7.x and 8.x</li>
-<li>MacOS up to 11.6.2 (Big Sur)</li>
-</ul>
-</div></blockquote>
-<p>On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check <a class="reference external" href="https://www.windowscentral.com/install-windows-subsystem-linux-windows-10">this</a> for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.</p>
-<p>On supported platforms the YDK can be installed using <a class="reference internal" href="#installation-script">Installation Script</a>.
-On other platforms the YDK should be installed manually <a class="reference internal" href="#building-from-source">Building from source</a>.
-For both the methods the user must install <cite>git</cite> package prior to the installation procedure.</p>
-<p>All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are <cite>/usr/local/bin</cite>, <cite>/usr/local/lib</cite>, and <cite>/usr/local/include</cite>.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the <cite>sudo</cite> package is installed on your platform prior to the YDK installation procedure.</p>
-<p><strong>NOTE.</strong> Due to GitHub issue <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/issues/1050">#1050</a> YDK is not supported with Python 3.9.x.</p>
-</div>
-<div class="section" id="core-installation">
-<span id="howto-install"></span><h2><a class="toc-backref" href="#toc-entry-6">Core Installation</a><a class="headerlink" href="#core-installation" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="installation-script">
-<h3><a class="toc-backref" href="#toc-entry-7">Installation Script</a><a class="headerlink" href="#installation-script" title="Permalink to this headline">¶</a></h3>
-<p>For YDK installation it is recommended to use script <cite>install_ydk.sh</cite> from <cite>ydk-gen</cite> git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.</p>
-<p>If the script installs any YDK component, it also creates an environment activation file &#8216;.env&#8217; in the &#8216;ydk-gen&#8217;
-directory, which can be used to activate YDK runtime environment identical to the installation environment.
-To activate YDK runtime environment simply run this command once in bash shell:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span><span class="nb">cd</span> ydk-gen
-<span class="nb">source</span> .env
-</pre></div>
-</div>
-<p>The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under <cite>$HOME/venv</cite> directory.
-If user has different location, the PYTHON_VENV environment variable should be set to that location.</p>
-<p>When installing YDK for Python programming language, the third party dependencies and C++ packages must be installed first.
-This step requires sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Python programming language with virtual environment:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span>git clone https://github.com/CiscoDevNet/ydk-gen.git
-<span class="nb">cd</span> ydk-gen
-<span class="nb">export</span> <span class="nv">YDKGEN_HOME</span><span class="o">=</span><span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</span>  <span class="c1"># optional</span>
-<span class="nb">export</span> <span class="nv">PYTHON_VENV</span><span class="o">=</span><span class="nv">$HOME</span>/ydk_vne  <span class="c1"># optional</span>
-./install_ydk.sh --cpp --core --venv
-./install_ydk.sh --py --core --venv
-</pre></div>
-</div>
-<p>The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>./install_ydk.sh --help
-usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-Options and arguments:
-  --cpp                 install YDK for C++ programming language;
-                        requires sudo access for dependencies and libraries installation
-  --go                  install YDK for Go programming language
-  --py|--python         install YDK for Python programming language
-  --all                 install YDK for all available programming languages;
-                        requires sudo access for dependencies and libraries installation
-  -v|--venv             create python virtual environment
-  -c|--core             install YDK core package
-  -s|--service gnmi     install gNMI service package
-  -n|--no-deps          skip installation of dependencies;
-                        applicable only with --cpp and --all options
-  -h|--help             print this help message and exit
-
-Environment variables:
-YDKGEN_HOME         specifies location of ydk-gen git repository;
-                    if not set, $HOME/ydk-gen is assumed
-PYTHON_VENV         specifies location of python virtual environment;
-                    if not set, $HOME/venv is assumed
-GOROOT              specifies installation directory of go software;
-                    if not set, /usr/local/go is assumed
-GOPATH              specifies location of go source directory;
-                    if not set, $HOME/go is assumed
-C_INCLUDE_PATH      location of C include files;
-                    if not set, /usr/local/include is assumed
-CPLUS_INCLUDE_PATH  location of C++ include files;
-                    if not set, /usr/local/include is assumed
-CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                    if not set, default system library location is assumed
-</pre></div>
-</div>
-<p>If user environment is different from the default one (different Python installation or different
-location of libraries), then building from source method should be used.</p>
-</div>
-<div class="section" id="building-from-source">
-<h3><a class="toc-backref" href="#toc-entry-8">Building from source</a><a class="headerlink" href="#building-from-source" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="environment-variables">
-<h4><a class="toc-backref" href="#toc-entry-9">Environment variables</a><a class="headerlink" href="#environment-variables" title="Permalink to this headline">¶</a></h4>
-<p>In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the headers file location must be specified explicitly (in below commands the default location is shown):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">export</span> <span class="n">C_INCLUDE_PATH</span><span class="o">=/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">include</span>
-<span class="n">export</span> <span class="n">CPLUS_INCLUDE_PATH</span><span class="o">=/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">include</span>
-</pre></div>
-</div>
-<p>When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.</p>
-</div>
-<div class="section" id="installing-third-party-dependencies">
-<h4><a class="toc-backref" href="#toc-entry-10">Installing third party dependencies</a><a class="headerlink" href="#installing-third-party-dependencies" title="Permalink to this headline">¶</a></h4>
-<p>If user platform is supported one, it is recommended to use <cite>ydk-gen/install_ydk.sh</cite> script.
-The script will also install Python virtual environment in default or specified location:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span># Clone ydk-gen from GitHub
-git clone https://github.com/CiscoDevNet/ydk-gen.git
-cd ydk-gen
-
-# Define optional environment variables and install dependencies
-export YDKGEN_HOME=`pwd`  # optional
-export PYTHON_VENV=$HOME/ydk_venv  # optional
-./install_ydk.sh -v   # also builds Python virtual environment and .env file
-</pre></div>
-</div>
-<p>For unsupported platforms it is recommended to follow logic of <cite>ydk-gen/test/dependencies-*</cite> scripts.</p>
-</div>
-<div class="section" id="installing-core-components">
-<h4><a class="toc-backref" href="#toc-entry-11">Installing core components</a><a class="headerlink" href="#installing-core-components" title="Permalink to this headline">¶</a></h4>
-<p>Please follow this procedure to install YDK core components for Python apps development:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1"># Activate runtime environment</span>
-<span class="n">source</span> <span class="o">.</span><span class="n">env</span>
-
-<span class="c1"># Generate and install YDK core library</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">-</span><span class="ow">is</span> <span class="o">--</span><span class="n">core</span> <span class="o">--</span><span class="n">cpp</span>
-
-<span class="c1"># Generate and install Python core package</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">-</span><span class="n">i</span> <span class="o">--</span><span class="n">core</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="adding-gnmi-service">
-<h3><a class="toc-backref" href="#toc-entry-12">Adding gNMI Service</a><a class="headerlink" href="#adding-gnmi-service" title="Permalink to this headline">¶</a></h3>
-<p>In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package.</p>
-<div class="section" id="gnmi-service-installation">
-<h4><a class="toc-backref" href="#toc-entry-13">gNMI Service installation</a><a class="headerlink" href="#gnmi-service-installation" title="Permalink to this headline">¶</a></h4>
-<p>Here is simple example, how gNMI service package for Python could be added:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="n">ydk</span><span class="o">-</span><span class="n">gen</span>
-<span class="o">./</span><span class="n">install_ydk</span><span class="o">.</span><span class="n">sh</span> <span class="o">--</span><span class="n">cpp</span> <span class="o">--</span><span class="n">service</span> <span class="n">gnmi</span> <span class="o">--</span><span class="n">venv</span>  <span class="c1"># requires sudo access</span>
-<span class="o">./</span><span class="n">install_ydk</span><span class="o">.</span><span class="n">sh</span> <span class="o">--</span><span class="n">py</span> <span class="o">--</span><span class="n">service</span> <span class="n">gnmi</span> <span class="o">--</span><span class="n">venv</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="gnmi-runtime-environment">
-<h4><a class="toc-backref" href="#toc-entry-14">gNMI runtime environment</a><a class="headerlink" href="#gnmi-runtime-environment" title="Permalink to this headline">¶</a></h4>
-<p>When YDK is installed using &#8216;install_ydk.sh&#8217; script, the runtime environment is set by running &#8216;source .env&#8217; in bash shell.
-The below information is applicable only when YDK is installed manually, which is not recommended.</p>
-<p>There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on <a class="reference external" href="https://github.com/grpc/grpc/issues/10942#issuecomment-312565041">GRPC GitHub</a> for details.
-As a workaround, the YDK based application runtime environment must include setting of <cite>LD_LIBRARY_PATH</cite> variable:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
-</pre></div>
-</div>
-</div>
-</div>
-</div>
-<div class="section" id="bundle-installation">
-<h2><a class="toc-backref" href="#toc-entry-15">Bundle Installation</a><a class="headerlink" href="#bundle-installation" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="quick-installation">
-<h3><a class="toc-backref" href="#toc-entry-16">Quick installation</a><a class="headerlink" href="#quick-installation" title="Permalink to this headline">¶</a></h3>
-<p>You can install the latest model packages from Python package index.
-Note that Python index does not have this release, therefore make sure the Python core package for this release is already installed prior to bundle installation.
-Make sure to activate Python virtual environment prior to package installation.
-When installing a bundle package from Python index, all dependent packages installed automatically.
-The installation of the <cite>ydk-models-cisco-ios-xr</cite> and/or <cite>ydk-models-cisco-ios-xe</cite> bundle(s)
-(depending on whether you&#8217;re developing application for IOS XR or IOS XE platform) automatically installs all other
-related packages (<cite>ydk</cite>, <cite>openconfig</cite> and <cite>ietf</cite> packages):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span><span class="o">-</span><span class="n">models</span><span class="o">-</span><span class="n">cisco</span><span class="o">-</span><span class="n">ios</span><span class="o">-</span><span class="n">xr</span>
-<span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span><span class="o">-</span><span class="n">models</span><span class="o">-</span><span class="n">cisco</span><span class="o">-</span><span class="n">ios</span><span class="o">-</span><span class="n">xe</span>
-</pre></div>
-</div>
-<p>Alternatively, you can perform a partial installation.
-If you prefer to install only the <cite>openconfig</cite> bundle and its dependencies (<cite>ydk</cite> and <cite>ietf</cite> packages), execute:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span>
-<span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span><span class="o">-</span><span class="n">models</span><span class="o">-</span><span class="n">openconfig</span>
-</pre></div>
-</div>
-<p>If you want install only the <cite>ietf</cite> bundle and its dependencies (<cite>ydk</cite> package), execute:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span>
-<span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span><span class="o">-</span><span class="n">models</span><span class="o">-</span><span class="n">ietf</span>
-</pre></div>
-</div>
-<p>To enable gNMI Service support in Python based application, install package:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="n">install</span> <span class="n">ydk</span><span class="o">-</span><span class="n">service</span><span class="o">-</span><span class="n">gnmi</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="installing-from-source">
-<h3><a class="toc-backref" href="#toc-entry-17">Installing from source</a><a class="headerlink" href="#installing-from-source" title="Permalink to this headline">¶</a></h3>
-<p>Once you have installed the <cite>ydk</cite> core package, you can install one or more model bundles.  Note that some bundles have dependencies on other bundles.
-Those dependencies are already captured in the bundle package.  Make sure you install the desired bundles in the order below.
-To install the <cite>ietf</cite> bundle from <cite>ydk-gen</cite> execute:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1"># Navigate to ydk-gen directory and activate runtime environment</span>
-<span class="n">cd</span> <span class="n">ydk</span><span class="o">-</span><span class="n">gen</span>
-<span class="n">source</span> <span class="o">.</span><span class="n">env</span>  <span class="c1"># if not ran previously</span>
-
-<span class="c1"># Generate and install the bundle</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">ietf_0_1_6</span><span class="o">.</span><span class="n">json</span> <span class="o">-</span><span class="n">i</span>
-</pre></div>
-</div>
-<p>To install the <cite>openconfig</cite> bundle, execute:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1"># Navigate to ydk-gen directory and activate runtime environment</span>
-<span class="n">cd</span> <span class="n">ydk</span><span class="o">-</span><span class="n">gen</span>
-<span class="n">source</span> <span class="o">.</span><span class="n">env</span>  <span class="c1"># if not ran previously</span>
-
-<span class="c1"># Generate and install the bundle</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">openconfig_0_1_9</span><span class="o">.</span><span class="n">json</span> <span class="o">-</span><span class="n">i</span>
-</pre></div>
-</div>
-<p>To install the <cite>cisco-ios-xr</cite> bundle, execute:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="c1"># Navigate to ydk-gen directory and activate runtime environment</span>
-<span class="n">cd</span> <span class="n">ydk</span><span class="o">-</span><span class="n">gen</span>
-<span class="n">source</span> <span class="o">.</span><span class="n">env</span>  <span class="c1"># if not ran previously</span>
-
-<span class="c1"># Generate and install the bundle</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">cisco</span><span class="o">-</span><span class="n">ios</span><span class="o">-</span><span class="n">xr</span><span class="o">-</span><span class="mi">6_7_4</span><span class="n">_post1</span><span class="o">.</span><span class="n">json</span> <span class="o">-</span><span class="n">i</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="generate-ydk-components">
-<h2><a class="toc-backref" href="#toc-entry-18">Generate YDK components</a><a class="headerlink" href="#generate-ydk-components" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="generation-script">
-<h3><a class="toc-backref" href="#toc-entry-19">Generation script</a><a class="headerlink" href="#generation-script" title="Permalink to this headline">¶</a></h3>
-<p>All the YDK components/packages can be generated by using Python script <cite>generate.py</cite>. To get all of its options run:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="n">ydk</span><span class="o">-</span><span class="n">gen</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">help</span>
-<span class="n">usage</span><span class="p">:</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="p">[</span><span class="o">-</span><span class="n">h</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">l</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">core</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">service</span> <span class="n">SERVICE</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">bundle</span> <span class="n">BUNDLE</span><span class="p">]</span>
-                   <span class="p">[</span><span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span><span class="o">-</span><span class="n">name</span> <span class="n">ADHOC_BUNDLE_NAME</span><span class="p">]</span>
-                   <span class="p">[</span><span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span> <span class="n">ADHOC_BUNDLE</span> <span class="p">[</span><span class="n">ADHOC_BUNDLE</span> <span class="o">...</span><span class="p">]]</span>
-                   <span class="p">[</span><span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">meta</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">doc</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">tests</span><span class="p">]</span>
-                   <span class="p">[</span><span class="o">--</span><span class="n">output</span><span class="o">-</span><span class="n">directory</span> <span class="n">OUTPUT_DIRECTORY</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">cached</span><span class="o">-</span><span class="n">output</span><span class="o">-</span><span class="nb">dir</span><span class="p">]</span>
-                   <span class="p">[</span><span class="o">-</span><span class="n">p</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">g</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">o</span><span class="p">]</span>
-
-<span class="n">Generate</span> <span class="n">YDK</span> <span class="n">artifacts</span><span class="p">:</span>
-
-<span class="n">optional</span> <span class="n">arguments</span><span class="p">:</span>
-  <span class="o">-</span><span class="n">h</span><span class="p">,</span> <span class="o">--</span><span class="n">help</span>            <span class="n">show</span> <span class="n">this</span> <span class="n">help</span> <span class="n">message</span> <span class="ow">and</span> <span class="n">exit</span>
-  <span class="o">-</span><span class="n">l</span><span class="p">,</span> <span class="o">--</span><span class="n">libydk</span>          <span class="n">Generate</span> <span class="n">libydk</span> <span class="n">core</span> <span class="n">package</span>
-  <span class="o">--</span><span class="n">core</span>                <span class="n">Generate</span> <span class="ow">and</span><span class="o">/</span><span class="ow">or</span> <span class="n">install</span> <span class="n">core</span> <span class="n">library</span>
-  <span class="o">--</span><span class="n">service</span> <span class="n">SERVICE</span>     <span class="n">Location</span> <span class="n">of</span> <span class="n">service</span> <span class="n">profile</span> <span class="n">JSON</span> <span class="n">file</span>
-  <span class="o">--</span><span class="n">bundle</span> <span class="n">BUNDLE</span>       <span class="n">Location</span> <span class="n">of</span> <span class="n">bundle</span> <span class="n">profile</span> <span class="n">JSON</span> <span class="n">file</span>
-  <span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span><span class="o">-</span><span class="n">name</span> <span class="n">ADHOC_BUNDLE_NAME</span>
-                        <span class="n">Name</span> <span class="n">of</span> <span class="n">the</span> <span class="n">adhoc</span> <span class="n">bundle</span>
-  <span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span> <span class="n">ADHOC_BUNDLE</span> <span class="p">[</span><span class="n">ADHOC_BUNDLE</span> <span class="o">...</span><span class="p">]</span>
-                        <span class="n">Generate</span> <span class="n">an</span> <span class="n">SDK</span> <span class="kn">from</span> <span class="nn">a</span> <span class="n">specified</span> <span class="nb">list</span> <span class="n">of</span> <span class="n">files</span>
-  <span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">meta</span>       <span class="n">Generate</span> <span class="n">meta</span><span class="o">-</span><span class="n">data</span> <span class="k">for</span> <span class="n">Python</span> <span class="n">bundle</span>
-  <span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">doc</span>        <span class="n">Generate</span> <span class="n">documentation</span>
-  <span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">tests</span>      <span class="n">Generate</span> <span class="n">tests</span>
-  <span class="o">--</span><span class="n">output</span><span class="o">-</span><span class="n">directory</span> <span class="n">OUTPUT_DIRECTORY</span>
-                        <span class="n">The</span> <span class="n">output</span> <span class="n">directory</span> <span class="n">where</span> <span class="n">the</span> <span class="n">sdk</span> <span class="n">will</span> <span class="n">get</span> <span class="n">created</span><span class="o">.</span>
-  <span class="o">--</span><span class="n">cached</span><span class="o">-</span><span class="n">output</span><span class="o">-</span><span class="nb">dir</span>   <span class="n">The</span> <span class="n">output</span> <span class="n">directory</span> <span class="n">specified</span> <span class="k">with</span> <span class="o">--</span><span class="n">output</span><span class="o">-</span><span class="n">directory</span>
-                        <span class="n">includes</span> <span class="n">a</span> <span class="n">cache</span> <span class="n">of</span> <span class="n">previously</span> <span class="n">generated</span> <span class="n">gen</span><span class="o">-</span>
-                        <span class="n">api</span><span class="o">/&lt;</span><span class="n">language</span><span class="o">&gt;</span> <span class="n">files</span> <span class="n">under</span> <span class="n">a</span> <span class="n">directory</span> <span class="n">called</span> <span class="s1">&#39;cache&#39;</span><span class="o">.</span>
-                        <span class="n">To</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">generate</span> <span class="n">docs</span> <span class="k">for</span> <span class="o">--</span><span class="n">core</span>
-  <span class="o">-</span><span class="n">p</span><span class="p">,</span> <span class="o">--</span><span class="n">python</span>          <span class="n">Generate</span> <span class="n">Python</span> <span class="n">SDK</span>
-  <span class="o">-</span><span class="n">c</span><span class="p">,</span> <span class="o">--</span><span class="n">cpp</span>             <span class="n">Generate</span> <span class="n">C</span><span class="o">++</span> <span class="n">SDK</span>
-  <span class="o">-</span><span class="n">g</span><span class="p">,</span> <span class="o">--</span><span class="n">go</span>              <span class="n">Generate</span> <span class="n">Go</span> <span class="n">SDK</span>
-  <span class="o">-</span><span class="n">v</span><span class="p">,</span> <span class="o">--</span><span class="n">verbose</span>         <span class="n">Verbose</span> <span class="n">mode</span>
-  <span class="o">-</span><span class="n">o</span><span class="p">,</span> <span class="o">--</span><span class="n">one</span><span class="o">-</span><span class="n">class</span><span class="o">-</span><span class="n">per</span><span class="o">-</span><span class="n">module</span>
-                        <span class="n">Generate</span> <span class="n">separate</span> <span class="n">modules</span> <span class="k">for</span> <span class="n">each</span> <span class="n">python</span> <span class="k">class</span>
-                        <span class="nc">corresponding</span> <span class="n">to</span> <span class="n">YANG</span> <span class="n">containers</span> <span class="ow">or</span> <span class="n">lists</span><span class="o">.</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="build-model-bundle-profile">
-<h3><a class="toc-backref" href="#toc-entry-20">Build model bundle profile</a><a class="headerlink" href="#build-model-bundle-profile" title="Permalink to this headline">¶</a></h3>
-<p>The first step in using ydk-gen is either using one of the already built <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/tree/master/profiles/bundles">bundle profiles</a>
-or constructing your own bundle profile, consisting of the YANG models you are interested to include into the bundle.</p>
-<p>Construct a bundle profile file, such as <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_5_3.json">cisco-ios-xr_6_5_3</a>
-and specify its dependencies.</p>
-<p>A sample bundle profile file is described below. The file is in a JSON format. The profile must define the &#8220;name&#8221;,
-&#8220;version&#8221; and &#8220;description&#8221; of the bundle, and then the &#8220;core_version&#8221;, which refers to
-<a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/releases">the version</a> of the YDK core package that you want to use with this bundle.
-The &#8220;name&#8221; of the bundle will form part of the installation path of the bundle.
-All other attributes, like &#8220;author&#8221; and &#8220;copyright&#8221;, are optional and will not affect the bundle generation:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="s2">&quot;name&quot;</span><span class="p">:</span><span class="s2">&quot;cisco-ios-xr&quot;</span><span class="p">,</span>
-<span class="s2">&quot;version&quot;</span><span class="p">:</span> <span class="s2">&quot;6.5.3&quot;</span><span class="p">,</span>
-<span class="s2">&quot;core_version&quot;</span><span class="p">:</span> <span class="s2">&quot;0.8.6&quot;</span><span class="p">,</span>
-<span class="s2">&quot;author&quot;</span><span class="p">:</span> <span class="s2">&quot;Cisco&quot;</span><span class="p">,</span>
-<span class="s2">&quot;copyright&quot;</span><span class="p">:</span> <span class="s2">&quot;Cisco&quot;</span><span class="p">,</span>
-<span class="s2">&quot;description&quot;</span><span class="p">:</span> <span class="s2">&quot;Cisco IOS-XR Native Models From Git&quot;</span><span class="p">,</span>
-</pre></div>
-</div>
-<p>The <cite>models</cite> section of the profile describes sources of YANG models. It could contain combination of elements:</p>
-<ul class="simple">
-<li><cite>dir</cite> - list of <strong>relative</strong> directory paths containing YANG files</li>
-<li><cite>file</cite> - list of <strong>relative</strong> YANG file paths</li>
-<li><cite>git</cite> - git repository, where YANG files are located</li>
-</ul>
-<p>The sample below shows the use of git sources only.
-Each <cite>git</cite> source must specify <cite>url</cite> - git repository URL, and <cite>commits</cite> list.
-The specified URL must allow the repository to be cloned without user intervention.
-Each element in <cite>commits</cite> list can specify:</p>
-<ul class="simple">
-<li><cite>commitid</cite> - optional specification of a commit ID in string format. If not specified the HEAD revision is assumed.</li>
-<li><cite>dir</cite> - optional list of <strong>relative</strong> directory paths within the git repository.</li>
-<li><cite>file</cite> - optional list of <strong>relative</strong> <cite>*.yang</cite> file paths within the git repository.</li>
-</ul>
-<p>Only directory examples are shown in this example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="s2">&quot;models&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="s2">&quot;git&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="p">{</span>
-            <span class="s2">&quot;url&quot;</span><span class="p">:</span> <span class="s2">&quot;https://github.com/YangModels/yang.git&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;commits&quot;</span><span class="p">:</span> <span class="p">[</span>
-              <span class="p">{</span>
-                <span class="s2">&quot;dir&quot;</span><span class="p">:</span> <span class="p">[</span>
-                    <span class="s2">&quot;vendor/cisco/xr/653&quot;</span>
-                <span class="p">]</span>
-              <span class="p">}</span>
-            <span class="p">]</span>
-        <span class="p">},</span>
-        <span class="p">{</span>
-            <span class="s2">&quot;url&quot;</span><span class="p">:</span> <span class="s2">&quot;https://github.com/YangModels/yang.git&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;commits&quot;</span><span class="p">:</span> <span class="p">[</span>
-              <span class="p">{</span>
-                <span class="s2">&quot;commitid&quot;</span><span class="p">:</span> <span class="s2">&quot;f6b4e2d59d4eedf31ae8b2fa3119468e4c38259c&quot;</span><span class="p">,</span>
-                <span class="s2">&quot;dir&quot;</span><span class="p">:</span> <span class="p">[</span>
-                    <span class="s2">&quot;experimental/openconfig/bgp&quot;</span><span class="p">,</span>
-                    <span class="s2">&quot;experimental/openconfig/policy&quot;</span>
-                <span class="p">]</span>
-              <span class="p">}</span>
-            <span class="p">]</span>
-        <span class="p">}</span>
-    <span class="p">]</span>
-<span class="p">},</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="generate-and-install-model-bundle">
-<h3><a class="toc-backref" href="#toc-entry-21">Generate and install model bundle</a><a class="headerlink" href="#generate-and-install-model-bundle" title="Permalink to this headline">¶</a></h3>
-<p>Generate model bundle using a bundle profile and install it.
-YDK Runtime environment must be activated prior to these procedures:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">-</span><span class="n">i</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/&lt;</span><span class="n">name</span><span class="o">-</span><span class="n">of</span><span class="o">-</span><span class="n">profile</span><span class="o">&gt;.</span><span class="n">json</span>
-</pre></div>
-</div>
-<p>Check Python packages installed:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">pip</span> <span class="nb">list</span> <span class="o">|</span> <span class="n">grep</span> <span class="n">ydk</span>
-<span class="n">ydk</span> <span class="p">(</span><span class="mf">0.8.6.4</span><span class="p">)</span>
-<span class="n">ydk</span><span class="o">-</span><span class="n">models</span><span class="o">-&lt;</span><span class="n">name</span><span class="o">-</span><span class="n">of</span><span class="o">-</span><span class="n">bundle</span><span class="o">&gt;</span> <span class="p">(</span><span class="mf">0.1.1</span><span class="p">)</span>
-<span class="o">...</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="generate-adhoc-bundle">
-<h3><a class="toc-backref" href="#toc-entry-22">Generate &#8220;adhoc&#8221; bundle</a><a class="headerlink" href="#generate-adhoc-bundle" title="Permalink to this headline">¶</a></h3>
-<p>When YANG models available on the hard drive, there is capability to generate small model bundles, which include
-just few models. It is called an &#8220;adhoc&#8221; bundle. Such a bundle generated without profile directly from command line.
-Here is simple example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">-</span><span class="n">i</span> <span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span><span class="o">-</span><span class="n">name</span> <span class="n">test</span> <span class="o">--</span><span class="n">adhoc</span><span class="o">-</span><span class="n">bundle</span> \
-    <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">git</span><span class="o">-</span><span class="n">repos</span><span class="o">/</span><span class="n">clean</span><span class="o">-</span><span class="n">yang</span><span class="o">/</span><span class="n">vendor</span><span class="o">/</span><span class="n">cisco</span><span class="o">/</span><span class="n">xr</span><span class="o">/</span><span class="mi">621</span><span class="o">/</span><span class="n">Cisco</span><span class="o">-</span><span class="n">IOS</span><span class="o">-</span><span class="n">XR</span><span class="o">-</span><span class="n">ipv4</span><span class="o">-</span><span class="n">bgp</span><span class="o">-</span><span class="n">oper</span><span class="o">*.</span><span class="n">yang</span> \
-    <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">git</span><span class="o">-</span><span class="n">repos</span><span class="o">/</span><span class="n">clean</span><span class="o">-</span><span class="n">yang</span><span class="o">/</span><span class="n">vendor</span><span class="o">/</span><span class="n">cisco</span><span class="o">/</span><span class="n">xr</span><span class="o">/</span><span class="mi">621</span><span class="o">/</span><span class="n">Cisco</span><span class="o">-</span><span class="n">IOS</span><span class="o">-</span><span class="n">XR</span><span class="o">-</span><span class="n">types</span><span class="o">.</span><span class="n">yang</span>
-    <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">git</span><span class="o">-</span><span class="n">repos</span><span class="o">/</span><span class="n">clean</span><span class="o">-</span><span class="n">yang</span><span class="o">/</span><span class="n">vendor</span><span class="o">/</span><span class="n">cisco</span><span class="o">/</span><span class="n">xr</span><span class="o">/</span><span class="mi">621</span><span class="o">/</span><span class="n">Cisco</span><span class="o">-</span><span class="n">IOS</span><span class="o">-</span><span class="n">XR</span><span class="o">-</span><span class="n">ipv4</span><span class="o">-</span><span class="n">bgp</span><span class="o">-</span><span class="n">datatypes</span><span class="o">.</span><span class="n">yang</span>
-</pre></div>
-</div>
-<p>This will generate a bundle that contains files specified in the <cite>&#8211;adhoc-bundle</cite> option and
-create Python package <cite>ydk-models-test-0.1.0.tar.gz</cite>, which has dependency on the base IETF bundle.
-Note that <strong>all</strong> dependencies for the bundle must be listed. It is expected that this option will be typically used
-for generating point model bundles for specific testing. The <cite>&#8211;verbose</cite> option is automatically enabled to quickly
-and easily let the user see if dependencies have been satisfied.</p>
-</div>
-<div class="section" id="generate-bundle-documentation">
-<h3><a class="toc-backref" href="#toc-entry-23">Generate bundle documentation</a><a class="headerlink" href="#generate-bundle-documentation" title="Permalink to this headline">¶</a></h3>
-<p>In order to generate YDK core and bundles documentation, the <cite>&#8211;generate-doc</cite> option is used when generating core package.
-Therefore the user should generate all the bundles without the <cite>&#8211;generate-doc</cite> option prior to the documentation generation.
-For example, the below sequence of commands will generate the documentation for the three python bundles and the python core:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">ietf_0_1_6</span><span class="o">.</span><span class="n">json</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">openconfig_0_1_9</span><span class="o">.</span><span class="n">json</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">cisco_ios_xr_6_3_1</span><span class="o">.</span><span class="n">json</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">core</span> <span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">doc</span>
-</pre></div>
-</div>
-<p><strong>NOTE.</strong> The documentation generation for bundles can take few hours due to their sizes.
-If you have previously generated documentation using the <cite>&#8211;cached-output-dir &#8211;output-directory &lt;dir&gt;</cite> option,
-the add-on documentation generation time can be reduced. Adding cisco-ios-xr documentation as an example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">mkdir</span> <span class="n">gen</span><span class="o">-</span><span class="n">api</span><span class="o">/</span><span class="n">cache</span>
-<span class="n">mv</span> <span class="n">gen</span><span class="o">-</span><span class="n">api</span><span class="o">/</span><span class="n">python</span> <span class="n">gen</span><span class="o">-</span><span class="n">api</span><span class="o">/</span><span class="n">cache</span>
-
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">bundle</span> <span class="n">profiles</span><span class="o">/</span><span class="n">bundles</span><span class="o">/</span><span class="n">cisco_ios_xr_6_6_3</span><span class="o">.</span><span class="n">json</span>
-<span class="n">python3</span> <span class="n">generate</span><span class="o">.</span><span class="n">py</span> <span class="o">--</span><span class="n">core</span> <span class="o">--</span><span class="n">generate</span><span class="o">-</span><span class="n">doc</span> <span class="o">--</span><span class="n">output</span><span class="o">-</span><span class="n">directory</span> <span class="n">gen</span><span class="o">-</span><span class="n">api</span> <span class="o">--</span><span class="n">cached</span><span class="o">-</span><span class="n">output</span><span class="o">-</span><span class="nb">dir</span>
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="documentation-and-support">
-<h2><a class="toc-backref" href="#toc-entry-24">Documentation and Support</a><a class="headerlink" href="#documentation-and-support" title="Permalink to this headline">¶</a></h2>
-<ul class="simple">
-<li>Pre-generated documentation for YDK-0.8.6 core and model API for IETF and OpenConfig can be found <a class="reference external" href="https://ciscodevnet.github.io/ydk-gen/">here</a></li>
-<li>Application samples can be found under the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen/tree/master/sdk/python/core/samples">samples</a> directory</li>
-<li>Hundreds of Python application samples can be found in the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-py-samples">samples</a> repository</li>
-<li>Join the <a class="reference external" href="https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk">YDK community</a> to connect with YDK users and developers</li>
-</ul>
-</div>
-<div class="section" id="release-notes">
-<h2><a class="toc-backref" href="#toc-entry-25">Release Notes</a><a class="headerlink" href="#release-notes" title="Permalink to this headline">¶</a></h2>
-<p>The current YDK release version is 0.8.6.4.</p>
-<p>YDK is licensed under the Apache 2.0 License.</p>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="developer_guide.html" class="btn btn-neutral float-right" title="Developer Guide" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="about_ydk.html" class="btn btn-neutral" title="About YDK" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/backward_compatibility.html b/docs/guides/backward_compatibility.html
deleted file mode 100644
index c31463069..000000000
--- a/docs/guides/backward_compatibility.html
+++ /dev/null
@@ -1,290 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Backward compatibility notes &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="API Guide" href="../api_guide.html"/>
-        <link rel="prev" title="Using Restconf with HTTPS" href="restconf_https.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Backward compatibility notes</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#installation">Installation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#windows-support">Windows Support</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#api-changes">API Changes</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>Backward compatibility notes</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="backward-compatibility-notes">
-<span id="compatibility"></span><h1><a class="toc-backref" href="#toc-entry-1">Backward compatibility notes</a><a class="headerlink" href="#backward-compatibility-notes" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#backward-compatibility-notes" id="toc-entry-1">Backward compatibility notes</a><ul>
-<li><a class="reference internal" href="#installation" id="toc-entry-2">Installation</a></li>
-<li><a class="reference internal" href="#windows-support" id="toc-entry-3">Windows Support</a></li>
-<li><a class="reference internal" href="#api-changes" id="toc-entry-4">API Changes</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>When installing and using the <code class="docutils literal"><span class="pre">0.6.0</span></code> and newer releases of <code class="docutils literal"><span class="pre">YDK-Py</span></code>, please note the below issues with backward compatibility.</p>
-<div class="section" id="installation">
-<h2><a class="toc-backref" href="#toc-entry-2">Installation</a><a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h2>
-<p>When installing <code class="docutils literal"><span class="pre">YDK-Py</span></code>, there is a new system requirement which needs to be installed.
-This is the <code class="docutils literal"><span class="pre">libydk</span></code> library, which is available on the DevHub website for various OS platforms.
-Please refer to the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-gen#system-requirements">system requirements</a> for details.</p>
-</div>
-<div class="section" id="windows-support">
-<h2><a class="toc-backref" href="#toc-entry-3">Windows Support</a><a class="headerlink" href="#windows-support" title="Permalink to this headline">¶</a></h2>
-<p>From release <code class="docutils literal"><span class="pre">0.6.0</span></code> onwards, YDK no longer is supported on the Windows platform. We hope to add back support for this platform in the future.</p>
-</div>
-<div class="section" id="api-changes">
-<h2><a class="toc-backref" href="#toc-entry-4">API Changes</a><a class="headerlink" href="#api-changes" title="Permalink to this headline">¶</a></h2>
-<ol class="arabic simple">
-<li><a class="reference internal" href="../api/providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a> no longer has the <code class="docutils literal"><span class="pre">close()</span></code> method. There is no need to explicitly close the provider as it will be automatically cleaned up when the object goes out of scope.</li>
-<li><a class="reference internal" href="../api/filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">YFilter</span></code></a> has replaced the functionality of the <code class="docutils literal"><span class="pre">READ</span></code> and <code class="docutils literal"><span class="pre">DELETE</span></code> objects</li>
-<li>When using YDK&#8217;s <a class="reference internal" href="introduction.html#howto-logging"><span class="std std-ref">Logging</span></a>, the suggested level to be used is <code class="docutils literal"><span class="pre">INFO</span></code></li>
-<li>The type names of <code class="docutils literal"><span class="pre">enumerations</span></code> and <code class="docutils literal"><span class="pre">identities</span></code> no longer have <code class="docutils literal"><span class="pre">Enum</span></code> or <code class="docutils literal"><span class="pre">Identity</span></code> in their names. For example, the  identity <code class="docutils literal"><span class="pre">InterfaceTypeIdentity</span></code> in <code class="docutils literal"><span class="pre">ydk.models.ietf.ietf_interfaces</span></code> is now renamed to just <code class="xref py py-class docutils literal"><span class="pre">InterfaceType</span></code>.</li>
-<li>The <code class="docutils literal"><span class="pre">is_config()</span></code> method is no longer available for the YDK model APIs. This may be added back in a future release.</li>
-<li>For <code class="docutils literal"><span class="pre">CRUDService</span></code> and other services, using a child container or list, which is not the top-level node in a yang model is no longer supported. For example:</li>
-</ol>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xe</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XE_bgp_oper</span> <span class="k">as</span> <span class="n">bgp_oper</span>
-
-<span class="c1"># connect to provider etc ...</span>
-
-<span class="n">neighbors</span> <span class="o">=</span> <span class="n">bgp_oper</span><span class="o">.</span><span class="n">BgpStateData</span><span class="o">.</span><span class="n">Neighbors</span><span class="p">()</span>
-<span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">neighbors</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>now has to be changed to:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xe</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XE_bgp_oper</span> <span class="k">as</span> <span class="n">bgp_oper</span>
-
-<span class="c1"># connect to provider etc ...</span>
-
-<span class="n">bgp_state</span> <span class="o">=</span> <span class="n">bgp_oper</span><span class="o">.</span><span class="n">BgpStateData</span><span class="p">()</span>
-<span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp_state</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="../api_guide.html" class="btn btn-neutral float-right" title="API Guide" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="restconf_https.html" class="btn btn-neutral" title="Using Restconf with HTTPS" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/codec_guide.html b/docs/guides/codec_guide.html
deleted file mode 100644
index 46e736493..000000000
--- a/docs/guides/codec_guide.html
+++ /dev/null
@@ -1,387 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How do I work with instances of YANG data? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How do I execute RPCs?" href="executor_guide.html"/>
-        <link rel="prev" title="How do I create, update, read and delete?" href="crud_guide.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How do I work with instances of YANG data?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#converting-between-json-and-xml">Converting between JSON and XML</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#converting-to-json">Converting to JSON</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How do I work with instances of YANG data?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-do-i-work-with-instances-of-yang-data">
-<h1><a class="toc-backref" href="#toc-entry-1">How do I work with instances of YANG data?</a><a class="headerlink" href="#how-do-i-work-with-instances-of-yang-data" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#how-do-i-work-with-instances-of-yang-data" id="toc-entry-1">How do I work with instances of YANG data?</a><ul>
-<li><a class="reference internal" href="#converting-between-json-and-xml" id="toc-entry-2">Converting between JSON and XML</a></li>
-<li><a class="reference internal" href="#converting-to-json" id="toc-entry-3">Converting to JSON</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>This document contains some examples of encoding and decoding yang data. To perform these operations, the <a class="reference internal" href="../api/services/codec_service.html#ydk.services.CodecService" title="ydk.services.CodecService"><code class="xref py py-class docutils literal"><span class="pre">CodecService</span></code></a> is used.</p>
-<p>The below approaches can be used to perform encoding and decoding of an interface Ipv4 loopback configuration. For these examples, the <code class="xref py py-class docutils literal"><span class="pre">Cisco_IOS_XR_ifmgr_cfg.InterfaceConfigurations</span></code> class is used. Note that the <code class="docutils literal"><span class="pre">ydk</span></code> and <code class="docutils literal"><span class="pre">ydk-models-cisco-ios-xr</span></code> python packages need to be installed for this example.</p>
-<div class="section" id="converting-between-json-and-xml">
-<h2><a class="toc-backref" href="#toc-entry-2">Converting between JSON and XML</a><a class="headerlink" href="#converting-between-json-and-xml" title="Permalink to this headline">¶</a></h2>
-<p>To parse a JSON string representing yang data into a YDK python object and then to an XML string, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span>
-<span class="normal">34</span>
-<span class="normal">35</span>
-<span class="normal">36</span>
-<span class="normal">37</span>
-<span class="normal">38</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">CodecServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CodecService</span>
-
-<span class="c1"># Instantiate the codec service</span>
-<span class="n">codec</span> <span class="o">=</span> <span class="n">CodecService</span><span class="p">()</span>
-
-<span class="c1"># Instantiate codec providers with json and xml options</span>
-<span class="n">json_provider</span> <span class="o">=</span> <span class="n">CodecServiceProvider</span><span class="p">(</span><span class="nb">type</span><span class="o">=</span><span class="s1">&#39;json&#39;</span><span class="p">)</span>
-<span class="n">xml_provider</span> <span class="o">=</span> <span class="n">CodecServiceProvider</span><span class="p">(</span><span class="nb">type</span><span class="o">=</span><span class="s1">&#39;xml&#39;</span><span class="p">)</span>
-
-<span class="c1"># Declare the JSON configuration</span>
-<span class="n">if_json</span> <span class="o">=</span> <span class="s1">&#39;&#39;&#39; {</span>
-<span class="s1">  &quot;Cisco-IOS-XR-ifmgr-cfg:interface-configurations&quot;: {</span>
-<span class="s1">    &quot;interface-configuration&quot;: [</span>
-<span class="s1">      {</span>
-<span class="s1">        &quot;active&quot;: &quot;act&quot;,</span>
-<span class="s1">        &quot;interface-name&quot;: &quot;Loopback0&quot;,</span>
-<span class="s1">        &quot;description&quot;: &quot;PRIMARY ROUTER LOOPBACK&quot;,</span>
-<span class="s1">        &quot;Cisco-IOS-XR-ipv4-io-cfg:ipv4-network&quot;: {</span>
-<span class="s1">          &quot;addresses&quot;: {</span>
-<span class="s1">            &quot;primary&quot;: {</span>
-<span class="s1">              &quot;address&quot;: &quot;172.16.255.1&quot;,</span>
-<span class="s1">              &quot;netmask&quot;: &quot;255.255.255.255&quot;</span>
-<span class="s1">            }</span>
-<span class="s1">          }</span>
-<span class="s1">        }</span>
-<span class="s1">      }</span>
-<span class="s1">    ]</span>
-<span class="s1">  }</span>
-<span class="s1">}</span>
-<span class="s1">&#39;&#39;&#39;</span>
-
-<span class="c1"># Invoke the decode method  to decode the JSON payload to a YDK python object</span>
-<span class="n">interface_configurations</span> <span class="o">=</span> <span class="n">codec</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="n">json_provider</span><span class="p">,</span> <span class="n">if_json</span><span class="p">)</span>
-
-<span class="c1"># Invoke the encode method to encode the YDK python object to an XML string</span>
-<span class="n">if_xml</span> <span class="o">=</span> <span class="n">codec</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">xml_provider</span><span class="p">,</span> <span class="n">interface_configurations</span><span class="p">)</span>
-<span class="nb">print</span><span class="p">(</span><span class="n">if_xml</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="converting-to-json">
-<h2><a class="toc-backref" href="#toc-entry-3">Converting to JSON</a><a class="headerlink" href="#converting-to-json" title="Permalink to this headline">¶</a></h2>
-<p>To convert a YDK python object into a JSON string, the below approach can be used. Note that the attribute <code class="docutils literal"><span class="pre">primary</span></code> is an instance of a <a class="reference internal" href="presence_class.html#presence-class"><span class="std std-ref">presence class</span></a>, which is set to <code class="docutils literal"><span class="pre">None</span></code> by default. So it needs to be assigned to a new instance of its class.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">CodecServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CodecService</span>
-<span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ifmgr_cfg</span>
-
-<span class="c1"># Instantiate the codec service</span>
-<span class="n">codec</span> <span class="o">=</span> <span class="n">CodecService</span><span class="p">()</span>
-
-<span class="c1"># Instantiate the provider with json option</span>
-<span class="n">json_provider</span> <span class="o">=</span> <span class="n">CodecServiceProvider</span><span class="p">(</span><span class="nb">type</span><span class="o">=</span><span class="s1">&#39;json&#39;</span><span class="p">)</span>
-
-<span class="c1"># Instantiate the interface configuration class to configure the IPv4 loopback</span>
-<span class="n">interface_configurations</span> <span class="o">=</span>  <span class="n">Cisco_IOS_XR_ifmgr_cfg</span><span class="o">.</span><span class="n">InterfaceConfigurations</span><span class="p">()</span>
-
-<span class="c1"># Instantiate the InterfaceConfiguration list instance</span>
-<span class="n">interface_configuration</span> <span class="o">=</span> <span class="n">interface_configurations</span><span class="o">.</span><span class="n">InterfaceConfiguration</span><span class="p">()</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">active</span> <span class="o">=</span> <span class="s2">&quot;act&quot;</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">interface_name</span> <span class="o">=</span> <span class="s2">&quot;Loopback0&quot;</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">description</span> <span class="o">=</span> <span class="s2">&quot;PRIMARY ROUTER LOOPBACK&quot;</span>
-
-<span class="c1"># Instantiate the Primary presence node</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">ipv4_network</span><span class="o">.</span><span class="n">addresses</span><span class="o">.</span><span class="n">primary</span> <span class="o">=</span> <span class="n">interface_configuration</span><span class="o">.</span><span class="n">ipv4_network</span><span class="o">.</span><span class="n">addresses</span><span class="o">.</span><span class="n">Primary</span><span class="p">()</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">ipv4_network</span><span class="o">.</span><span class="n">addresses</span><span class="o">.</span><span class="n">primary</span><span class="o">.</span><span class="n">address</span> <span class="o">=</span> <span class="s2">&quot;172.16.255.1&quot;</span>
-<span class="n">interface_configuration</span><span class="o">.</span><span class="n">ipv4_network</span><span class="o">.</span><span class="n">addresses</span><span class="o">.</span><span class="n">primary</span><span class="o">.</span><span class="n">netmask</span> <span class="o">=</span> <span class="s2">&quot;255.255.255.255&quot;</span>
-
-<span class="c1"># Append the list instance to the parent list</span>
-<span class="n">interface_configurations</span><span class="o">.</span><span class="n">interface_configuration</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">interface_configuration</span><span class="p">)</span>
-
-<span class="c1"># Invoke the encode method to encode the YDK python object to a JSON payload</span>
-<span class="n">json</span> <span class="o">=</span> <span class="n">codec</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">json_provider</span><span class="p">,</span> <span class="n">interface_configurations</span><span class="p">)</span>
-<span class="nb">print</span><span class="p">(</span><span class="n">json</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="executor_guide.html" class="btn btn-neutral float-right" title="How do I execute RPCs?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="crud_guide.html" class="btn btn-neutral" title="How do I create, update, read and delete?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/crud_guide.html b/docs/guides/crud_guide.html
deleted file mode 100644
index 8df01a739..000000000
--- a/docs/guides/crud_guide.html
+++ /dev/null
@@ -1,750 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How do I create, update, read and delete? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How do I work with instances of YANG data?" href="codec_guide.html"/>
-        <link rel="prev" title="Introduction" href="introduction.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How do I create, update, read and delete?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#creating-a-configuration-with-a-list-and-a-presence-class">Creating a configuration with a list and a presence class</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#creating-and-replacing-a-configuration">Creating and replacing a configuration</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#creating-and-reading-a-list">Creating and reading a list</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#reading-a-leaf">Reading a leaf</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#deleting-a-list-element">Deleting a list element</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#deleting-entire-list">Deleting entire list</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#deleting-a-leaf">Deleting a leaf</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#applying-crud-to-multiple-entities">Applying CRUD to multiple entities</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How do I create, update, read and delete?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-do-i-create-update-read-and-delete">
-<span id="netconf-operations"></span><h1><a class="toc-backref" href="#toc-entry-1">How do I create, update, read and delete?</a><a class="headerlink" href="#how-do-i-create-update-read-and-delete" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#how-do-i-create-update-read-and-delete" id="toc-entry-1">How do I create, update, read and delete?</a><ul>
-<li><a class="reference internal" href="#creating-a-configuration-with-a-list-and-a-presence-class" id="toc-entry-2">Creating a configuration with a list and a presence class</a></li>
-<li><a class="reference internal" href="#creating-and-replacing-a-configuration" id="toc-entry-3">Creating and replacing a configuration</a></li>
-<li><a class="reference internal" href="#creating-and-reading-a-list" id="toc-entry-4">Creating and reading a list</a></li>
-<li><a class="reference internal" href="#reading-a-leaf" id="toc-entry-5">Reading a leaf</a></li>
-<li><a class="reference internal" href="#deleting-a-list-element" id="toc-entry-6">Deleting a list element</a></li>
-<li><a class="reference internal" href="#deleting-entire-list" id="toc-entry-7">Deleting entire list</a></li>
-<li><a class="reference internal" href="#deleting-a-leaf" id="toc-entry-8">Deleting a leaf</a></li>
-<li><a class="reference internal" href="#applying-crud-to-multiple-entities" id="toc-entry-9">Applying CRUD to multiple entities</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>This document contains some examples of creating, reading and deleting yang data using YDK. To perform these operations, the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> is used. Also, in these examples, <a class="reference internal" href="../api/filters.html#ydk.filters.YFilter" title="ydk.filters.YFilter"><code class="xref py py-class docutils literal"><span class="pre">YFilter</span></code></a> is used to mark parts of the data for particular operations.</p>
-<div class="section" id="creating-a-configuration-with-a-list-and-a-presence-class">
-<h2><a class="toc-backref" href="#toc-entry-2">Creating a configuration with a list and a presence class</a><a class="headerlink" href="#creating-a-configuration-with-a-list-and-a-presence-class" title="Permalink to this headline">¶</a></h2>
-<p>To configure a rule in the SNMP trap correlator, the below approach can be used.</p>
-<p>Note that the <code class="xref py py-class docutils literal"><span class="pre">Cisco_IOS_XR_snmp_agent_cfg.Snmp.Correlator.Rules.Rule</span></code> class is a <a class="reference internal" href="../api/types.html#ydk.types.YList" title="ydk.types.YList"><code class="xref py py-class docutils literal"><span class="pre">YList</span></code></a>. So it needs to be instantiated and appended to its parent.</p>
-<p>Also, the attribute <code class="docutils literal"><span class="pre">non_stateful</span></code> is an instance of a <a class="reference internal" href="presence_class.html#presence-class"><span class="std std-ref">presence class</span></a>, which is set to <code class="docutils literal"><span class="pre">None</span></code> by default. So it needs to be assigned to a new instance of its class.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_snmp_agent_cfg</span>
-
-<span class="c1"># Create the top-level container</span>
-<span class="n">snmp</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_snmp_agent_cfg</span><span class="o">.</span><span class="n">Snmp</span><span class="p">()</span>
-
-<span class="c1"># Create the list instance</span>
-<span class="n">rule</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_snmp_agent_cfg</span><span class="o">.</span><span class="n">Snmp</span><span class="o">.</span><span class="n">Correlator</span><span class="o">.</span><span class="n">Rules</span><span class="o">.</span><span class="n">Rule</span><span class="p">()</span>
-<span class="n">rule</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="s1">&#39;abc&#39;</span>
-
-<span class="c1"># Instantiate and assign the presence class</span>
-<span class="n">rule</span><span class="o">.</span><span class="n">non_stateful</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_snmp_agent_cfg</span><span class="o">.</span><span class="n">Snmp</span><span class="o">.</span><span class="n">Correlator</span><span class="o">.</span><span class="n">Rules</span><span class="o">.</span><span class="n">Rule</span><span class="o">.</span><span class="n">NonStateful</span><span class="p">()</span>
-
-<span class="n">rule</span><span class="o">.</span><span class="n">non_stateful</span><span class="o">.</span><span class="n">timeout</span> <span class="o">=</span> <span class="mi">3</span>
-
-<span class="c1"># Append the list instance to its parent</span>
-<span class="n">snmp</span><span class="o">.</span><span class="n">correlator</span><span class="o">.</span><span class="n">rules</span><span class="o">.</span><span class="n">rule</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">rule</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD create on the top-level snmp object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">snmp</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="creating-and-replacing-a-configuration">
-<h2><a class="toc-backref" href="#toc-entry-3">Creating and replacing a configuration</a><a class="headerlink" href="#creating-and-replacing-a-configuration" title="Permalink to this headline">¶</a></h2>
-<p>First, let us create a configuration for the <code class="xref py py-class docutils literal"><span class="pre">openconfig_bgp.Bgp.Global_.Config</span></code> class. Here, we set the leaf <code class="docutils literal"><span class="pre">as_</span></code>, which represents the autonomous system number, to <code class="docutils literal"><span class="pre">65001</span></code> and the leaf <code class="docutils literal"><span class="pre">router_id</span></code> to <code class="docutils literal"><span class="pre">'10.0.0.1'</span></code>.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">YFilter</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-
-<span class="c1"># First, create the top-level Bgp() object</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># Populate the values for the global config object</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65001</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">router_id</span> <span class="o">=</span> <span class="s1">&#39;10.0.0.1&#39;</span>
-
-<span class="c1"># Call the CRUD create on the top-level bgp object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>Now, let us replace the above configuration with a new configuration for the <code class="xref py py-class docutils literal"><span class="pre">openconfig_bgp.Bgp.Global_.Config</span></code> class using the below code.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">YFilter</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-
-<span class="c1"># First, create the top-level Bgp() object</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># Set the yfilter attribute of the config object to YFilter.replace</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">replace</span>
-
-<span class="c1"># Populate the new values for the global config object</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65023</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">router_id</span> <span class="o">=</span> <span class="s1">&#39;25.3.55.12&#39;</span>
-
-<span class="c1"># Call the CRUD update on the top-level bgp object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="creating-and-reading-a-list">
-<h2><a class="toc-backref" href="#toc-entry-4">Creating and reading a list</a><a class="headerlink" href="#creating-and-reading-a-list" title="Permalink to this headline">¶</a></h2>
-<p>For example, to read the instances of a deeply nested <a class="reference internal" href="../api/types.html#ydk.types.YList" title="ydk.types.YList"><code class="xref py py-class docutils literal"><span class="pre">YList</span></code></a> called <code class="xref py py-class docutils literal"><span class="pre">Cisco_IOS_XR_ip_rib_ipv4_oper.Rib.Vrfs.Vrf.Afs.Af.Safs.Saf.IpRibRouteTableNames.IpRibRouteTableName.Routes.Route</span></code>  in the <code class="docutils literal"><span class="pre">Cisco_IOS_XR_ip_rib_ipv4_oper</span></code> module using YDK&#8217;s <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a>, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span>
-<span class="normal">34</span>
-<span class="normal">35</span>
-<span class="normal">36</span>
-<span class="normal">37</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Rib() object</span>
-<span class="n">rib</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="p">()</span>
-
-<span class="c1"># Then create the list instance Vrf()</span>
-<span class="n">vrf</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="o">.</span><span class="n">Vrfs</span><span class="o">.</span><span class="n">Vrf</span><span class="p">()</span>
-<span class="n">vrf</span><span class="o">.</span><span class="n">vrf_name</span><span class="o">=</span><span class="s1">&#39;default&#39;</span>
-
-<span class="c1"># Then create the child list element Af() and the rest of the nested list instances</span>
-<span class="n">af</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="o">.</span><span class="n">Vrfs</span><span class="o">.</span><span class="n">Vrf</span><span class="o">.</span><span class="n">Afs</span><span class="o">.</span><span class="n">Af</span><span class="p">()</span>
-<span class="n">af</span><span class="o">.</span><span class="n">af_name</span> <span class="o">=</span> <span class="s1">&#39;IPv4&#39;</span>
-
-<span class="n">saf</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="o">.</span><span class="n">Vrfs</span><span class="o">.</span><span class="n">Vrf</span><span class="o">.</span><span class="n">Afs</span><span class="o">.</span><span class="n">Af</span><span class="o">.</span><span class="n">Safs</span><span class="o">.</span><span class="n">Saf</span><span class="p">()</span>
-<span class="n">saf</span><span class="o">.</span><span class="n">saf_name</span><span class="o">=</span><span class="s1">&#39;Unicast&#39;</span>
-
-<span class="n">table_name</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="o">.</span><span class="n">Vrfs</span><span class="o">.</span><span class="n">Vrf</span><span class="o">.</span><span class="n">Afs</span><span class="o">.</span><span class="n">Af</span><span class="o">.</span><span class="n">Safs</span><span class="o">.</span><span class="n">Saf</span><span class="o">.</span><span class="n">IpRibRouteTableNames</span><span class="o">.</span><span class="n">IpRibRouteTableName</span><span class="p">()</span>
-<span class="n">table_name</span><span class="o">.</span><span class="n">route_table_name</span> <span class="o">=</span> <span class="s1">&#39;default&#39;</span>
-
-<span class="c1"># Create the final list instance Route()</span>
-<span class="n">route</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="o">.</span><span class="n">Vrfs</span><span class="o">.</span><span class="n">Vrf</span><span class="o">.</span><span class="n">Afs</span><span class="o">.</span><span class="n">Af</span><span class="o">.</span><span class="n">Safs</span><span class="o">.</span><span class="n">Saf</span><span class="o">.</span><span class="n">IpRibRouteTableNames</span><span class="o">.</span><span class="n">IpRibRouteTableName</span><span class="o">.</span><span class="n">Routes</span><span class="o">.</span><span class="n">Route</span><span class="p">()</span>
-<span class="n">route</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">read</span> <span class="c1"># set the yfilter attribute for route to YFilter.read</span>
-
-<span class="c1"># Append each of the list instances to their respective parents</span>
-<span class="n">table_name</span><span class="o">.</span><span class="n">routes</span><span class="o">.</span><span class="n">route</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">route</span><span class="p">)</span>
-<span class="n">saf</span><span class="o">.</span><span class="n">ip_rib_route_table_names</span><span class="o">.</span><span class="n">ip_rib_route_table_name</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">table_name</span><span class="p">)</span>
-<span class="n">af</span><span class="o">.</span><span class="n">safs</span><span class="o">.</span><span class="n">saf</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">saf</span><span class="p">)</span>
-<span class="n">vrf</span><span class="o">.</span><span class="n">afs</span><span class="o">.</span><span class="n">af</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">af</span><span class="p">)</span>
-<span class="n">rib</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">vrf</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD read on the top-level rib object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">rib_oper</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">rib</span><span class="p">)</span>
-
-<span class="n">vrf_list</span> <span class="o">=</span> <span class="n">rib_oper</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span>
-<span class="n">vrf_default</span> <span class="o">=</span> <span class="n">vrf_list</span><span class="p">[</span><span class="s2">&quot;default&quot;</span><span class="p">]</span>  <span class="c1"># or  vrf_default = vrf_list.get(&quot;default&quot;)</span>
-</pre></div>
-</td></tr></table></div>
-<p>Read all VRF configuration:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Rib() object</span>
-<span class="n">rib</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_ip_rib_ipv4_oper</span><span class="o">.</span><span class="n">Rib</span><span class="p">()</span>
-
-<span class="c1"># Call the CRUD read on the top-level rib object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">rib_oper</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">rib</span><span class="p">)</span>
-
-<span class="c1"># Access all VRFs in the list</span>
-<span class="k">for</span> <span class="n">vrf</span> <span class="ow">in</span> <span class="n">rib_oper</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="n">vrf</span><span class="o">.</span><span class="n">vrf_name</span><span class="p">)</span>
-
-<span class="c1"># Get list of VRF names</span>
-<span class="n">all_vrf_names</span> <span class="o">=</span> <span class="n">rib_oper</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span>
-
-<span class="c1"># Iterate over VRF names</span>
-<span class="k">for</span> <span class="n">vrf_name</span> <span class="ow">in</span> <span class="n">all_vrf_names</span><span class="p">:</span>
-    <span class="n">vrf</span> <span class="o">=</span> <span class="n">rib_oper</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span><span class="p">[</span><span class="n">vrf_name</span><span class="p">]</span>
-    <span class="k">for</span> <span class="n">af</span> <span class="ow">in</span> <span class="n">vrf</span><span class="o">.</span><span class="n">afs</span><span class="o">.</span><span class="n">af</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;VRF: </span><span class="si">%s</span><span class="s2">, AF: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">vrf_name</span><span class="p">,</span> <span class="n">af</span><span class="p">)</span>
-
-<span class="c1"># Access specific VRF, when name is known</span>
-<span class="n">vrf</span> <span class="o">=</span> <span class="n">rib_oper</span><span class="o">.</span><span class="n">vrfs</span><span class="o">.</span><span class="n">vrf</span><span class="p">[</span><span class="s2">&quot;default&quot;</span><span class="p">]</span>
-<span class="k">if</span> <span class="n">vrf</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
-    <span class="k">for</span> <span class="n">af</span> <span class="ow">in</span> <span class="n">vrf</span><span class="o">.</span><span class="n">afs</span><span class="o">.</span><span class="n">af</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;VRF: </span><span class="si">%s</span><span class="s2">, AF: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="s2">&quot;default&quot;</span><span class="p">,</span> <span class="n">af</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="reading-a-leaf">
-<h2><a class="toc-backref" href="#toc-entry-5">Reading a leaf</a><a class="headerlink" href="#reading-a-leaf" title="Permalink to this headline">¶</a></h2>
-<p>For example, to read a <a class="reference internal" href="../api/types.html#ydk.types.YLeaf" title="ydk.types.YLeaf"><code class="xref py py-class docutils literal"><span class="pre">YLeaf</span></code></a> called <code class="docutils literal"><span class="pre">running</span></code> in the <code class="xref py py-class docutils literal"><span class="pre">Cisco_IOS_XR_clns_isis_cfg.Isis.Instances.Instance</span></code> class in the <code class="docutils literal"><span class="pre">Cisco_IOS_XR_clns_isis_cfg</span></code> module using YDK&#8217;s <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a>, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Empty</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Isis() object</span>
-<span class="n">isis</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="p">()</span>
-
-<span class="c1"># Create the list instance</span>
-<span class="n">ins</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="o">.</span><span class="n">Instances</span><span class="o">.</span><span class="n">Instance</span><span class="p">()</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">instance_name</span> <span class="o">=</span> <span class="s1">&#39;default&#39;</span>
-
-<span class="c1"># Set the yfilter attribute of the leaf called &#39;running&#39; to YFilter.read</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">running</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">read</span>
-
-<span class="c1"># Append the instance to the parent</span>
-<span class="n">isis</span><span class="o">.</span><span class="n">instances</span><span class="o">.</span><span class="n">instance</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">ins</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD read on the top-level isis object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">isis</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="deleting-a-list-element">
-<h2><a class="toc-backref" href="#toc-entry-6">Deleting a list element</a><a class="headerlink" href="#deleting-a-list-element" title="Permalink to this headline">¶</a></h2>
-<p>For example, to delete a <a class="reference internal" href="../api/types.html#ydk.types.YList" title="ydk.types.YList"><code class="xref py py-class docutils literal"><span class="pre">YList</span></code></a> called <code class="xref py py-class docutils literal"><span class="pre">Instance</span></code> in the <code class="docutils literal"><span class="pre">Cisco_IOS_XR_clns_isis_cfg</span></code> module using YDK&#8217;s <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a>, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Empty</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Isis() object</span>
-<span class="n">isis</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="p">()</span>
-
-<span class="c1"># Create the list instance</span>
-<span class="n">ins</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="o">.</span><span class="n">Instances</span><span class="o">.</span><span class="n">Instance</span><span class="p">()</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">instance_name</span> <span class="o">=</span> <span class="s1">&#39;xyz&#39;</span>
-
-<span class="c1"># Set the yfilter attribute of the leaf called &#39;running&#39; to YFilter.delete</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">delete</span>
-
-<span class="c1"># Append the instance to the parent</span>
-<span class="n">isis</span><span class="o">.</span><span class="n">instances</span><span class="o">.</span><span class="n">instance</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">ins</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD update on the top-level isis object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">isis</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="deleting-entire-list">
-<h2><a class="toc-backref" href="#toc-entry-7">Deleting entire list</a><a class="headerlink" href="#deleting-entire-list" title="Permalink to this headline">¶</a></h2>
-<p>In order to delete entire list, all its elements must be deleted.
-It could be done like in example above. The issue here is that user have to know all the keys of the <a class="reference internal" href="../api/types.html#ydk.types.YList" title="ydk.types.YList"><code class="xref py py-class docutils literal"><span class="pre">YList</span></code></a> elements.
-To address this issue YDK offers a shortcut, which allows user to delete all list elements in one operation.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First read configuration of top level container</span>
-<span class="n">isis</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read_config</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="p">()</span>
-
-<span class="c1"># Then set YFilter.delete operation to the YList object</span>
-<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">isis</span><span class="o">.</span><span class="n">instances</span><span class="o">.</span><span class="n">instance</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
-    <span class="n">isis</span><span class="o">.</span><span class="n">instances</span><span class="o">.</span><span class="n">instance</span><span class="o">.</span><span class="n">yfilter</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">delete</span>
-
-    <span class="c1"># Call the CRUD update on modified &#39;isis&#39; object</span>
-    <span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">isis</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="deleting-a-leaf">
-<h2><a class="toc-backref" href="#toc-entry-8">Deleting a leaf</a><a class="headerlink" href="#deleting-a-leaf" title="Permalink to this headline">¶</a></h2>
-<p>For example, to delete a <a class="reference internal" href="../api/types.html#ydk.types.YLeaf" title="ydk.types.YLeaf"><code class="xref py py-class docutils literal"><span class="pre">YLeaf</span></code></a> called <code class="docutils literal"><span class="pre">timer</span></code> of type <code class="docutils literal"><span class="pre">int</span></code> in the <code class="xref py py-class docutils literal"><span class="pre">Cdp</span></code> class in the <code class="docutils literal"><span class="pre">Cisco_IOS_XR_cdp_cfg</span></code> module using YDK&#8217;s <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a>, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_cdp_cfg</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Cdp() object</span>
-<span class="n">cdp</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_cdp_cfg</span><span class="o">.</span><span class="n">Cdp</span><span class="p">()</span>
-
-<span class="c1"># Set a dummy value to the leaf</span>
-<span class="n">cdp</span><span class="o">.</span><span class="n">timer</span> <span class="o">=</span> <span class="mi">5</span>
-<span class="c1"># Assign YFilter.delete to the &#39;timer&#39; leaf</span>
-<span class="n">cdp</span><span class="o">.</span><span class="n">timer</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">delete</span>
-
-<span class="c1"># Call the CRUD update on the top-level cdp object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">cdp</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>For example, to delete a <a class="reference internal" href="../api/types.html#ydk.types.YLeaf" title="ydk.types.YLeaf"><code class="xref py py-class docutils literal"><span class="pre">YLeaf</span></code></a> called <code class="docutils literal"><span class="pre">running</span></code> of type <code class="docutils literal"><span class="pre">Empty</span></code> in the <code class="xref py py-class docutils literal"><span class="pre">Instance</span></code> class in the <code class="docutils literal"><span class="pre">Cisco_IOS_XR_clns_isis_cfg</span></code> module using YDK&#8217;s <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a>, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Empty</span>
-<span class="kn">from</span> <span class="nn">ydk.filters</span> <span class="kn">import</span> <span class="n">YFilter</span>
-
-<span class="c1"># First create the top-level Isis() object</span>
-<span class="n">isis</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="p">()</span>
-
-<span class="c1"># Create the list instance</span>
-<span class="n">ins</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_clns_isis_cfg</span><span class="o">.</span><span class="n">Isis</span><span class="o">.</span><span class="n">Instances</span><span class="o">.</span><span class="n">Instance</span><span class="p">()</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">instance_name</span> <span class="o">=</span> <span class="s1">&#39;default&#39;</span>
-
-<span class="c1"># Assign YFilter.delete to the &#39;running&#39; leaf</span>
-<span class="n">ins</span><span class="o">.</span><span class="n">running</span> <span class="o">=</span> <span class="n">YFilter</span><span class="o">.</span><span class="n">delete</span>
-
-<span class="c1"># Append the instance to the parent</span>
-<span class="n">isis</span><span class="o">.</span><span class="n">instances</span><span class="o">.</span><span class="n">instance</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">ins</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD update on the top-level isis object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">isis</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="applying-crud-to-multiple-entities">
-<h2><a class="toc-backref" href="#toc-entry-9">Applying CRUD to multiple entities</a><a class="headerlink" href="#applying-crud-to-multiple-entities" title="Permalink to this headline">¶</a></h2>
-<p>You can apply CRUD operations on multiple entities in one CRUD service call. For example, you want to &#8216;read&#8217; BGP and Interfaces configuration together.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Filter</span><span class="p">,</span> <span class="n">Config</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span><span class="p">,</span> <span class="n">openconfig_interfaces</span>
-
-<span class="c1"># First, create the top-level Bgp and Interface objects</span>
-<span class="n">int_filter</span> <span class="o">=</span> <span class="n">openconfig_interfaces</span><span class="o">.</span><span class="n">Interfaces</span><span class="p">()</span>
-<span class="n">bgp_filter</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># Create read filter</span>
-<span class="n">read_filter</span> <span class="o">=</span> <span class="n">Filter</span><span class="p">(</span><span class="n">int_filter</span><span class="p">,</span> <span class="n">bgp_filter</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD read-config to get configuration of entities</span>
-<span class="n">result</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read_config</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">read_filter</span><span class="p">)</span>
-
-<span class="c1"># Access read results from returned Config collection</span>
-<span class="n">int_config</span> <span class="o">=</span> <span class="n">result</span><span class="p">[</span><span class="n">int_filter</span><span class="p">]</span>
-<span class="n">bgp_config</span> <span class="o">=</span> <span class="n">result</span><span class="p">[</span><span class="n">bgp_filter</span><span class="p">]</span>
-
-<span class="c1"># Or print all configuration in XML format</span>
-<span class="n">codec_service</span> <span class="o">=</span> <span class="n">CodecService</span><span class="p">()</span>
-<span class="n">codec_provider</span> <span class="o">=</span> <span class="n">CodecServiceProvider</span><span class="p">()</span>
-<span class="n">codec_provider</span><span class="o">.</span><span class="n">encoding</span> <span class="o">=</span> <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">XML</span>
-<span class="k">for</span> <span class="n">entity</span> <span class="ow">in</span> <span class="n">result</span><span class="p">:</span>
-    <span class="n">xml_encode</span> <span class="o">=</span> <span class="n">codec_service</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">codec_provider</span><span class="p">,</span> <span class="n">entity</span><span class="p">)</span>
-    <span class="nb">print</span><span class="p">(</span><span class="n">xml_encode</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="codec_guide.html" class="btn btn-neutral float-right" title="How do I work with instances of YANG data?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="introduction.html" class="btn btn-neutral" title="Introduction" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/deviation.html b/docs/guides/deviation.html
deleted file mode 100644
index 7ba8b9ae2..000000000
--- a/docs/guides/deviation.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>What are deviations? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How do I use the Path API?" href="path.html"/>
-        <link rel="prev" title="What are presence classes?" href="presence_class.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">What are deviations?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#overview">Overview</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#how-to-use-deviation-with-ydk">How to use deviation with YDK</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>What are deviations?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="what-are-deviations">
-<h1><a class="toc-backref" href="#toc-entry-1">What are deviations?</a><a class="headerlink" href="#what-are-deviations" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#what-are-deviations" id="toc-entry-1">What are deviations?</a><ul>
-<li><a class="reference internal" href="#overview" id="toc-entry-2">Overview</a></li>
-<li><a class="reference internal" href="#how-to-use-deviation-with-ydk" id="toc-entry-3">How to use deviation with YDK</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="overview">
-<h2><a class="toc-backref" href="#toc-entry-2">Overview</a><a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
-<p>Not all devices faithfully support features defined in standard yang models. For a particular device, it could support only part of features or the feature it supported varies from the standard module. The YANG language defines the <a class="reference external" href="https://tools.ietf.org/html/rfc6020#section-7.18.3">deviation statement</a> to indicate such a thing.
-For example, using a deviation statement in <a class="reference external" href="https://github.com/YangModels/yang/blob/master/vendor/cisco/xr/631/cisco-xr-openconfig-telemetry-deviations.yang#L73">cisco-xr-openconfig-telemetry-deviations.yang</a>, the netconf server can indicate that the <code class="xref py py-class docutils literal"><span class="pre">openconfig_telemetry.TelemetrySystem.Subscriptions.Dynamic.Subscription</span></code> container of the <code class="docutils literal"><span class="pre">openconfig_telemetry</span></code> model is not supported.</p>
-<div class="highlight-c"><div class="highlight"><pre><span></span><span class="n">deviation</span><span class="w"> </span><span class="o">/</span><span class="n">oc</span><span class="o">-</span><span class="n">telemetry</span><span class="o">:</span><span class="n">telemetry</span><span class="o">-</span><span class="n">system</span><span class="o">/</span><span class="n">oc</span><span class="o">-</span><span class="n">telemetry</span><span class="o">:</span><span class="n">subscriptions</span><span class="o">/</span><span class="n">oc</span><span class="o">-</span><span class="n">telemetry</span><span class="o">:</span><span class="n">dynamic</span><span class="o">/</span><span class="n">oc</span><span class="o">-</span><span class="n">telemetry</span><span class="o">:</span><span class="n">subscription</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">  </span><span class="n">deviate</span><span class="w"> </span><span class="n">not</span><span class="o">-</span><span class="n">supported</span><span class="p">;</span><span class="w"></span>
-<span class="p">}</span><span class="w"></span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="how-to-use-deviation-with-ydk">
-<h2><a class="toc-backref" href="#toc-entry-3">How to use deviation with YDK</a><a class="headerlink" href="#how-to-use-deviation-with-ydk" title="Permalink to this headline">¶</a></h2>
-<p>When using YDK to program a device which has some unsupported features, YDK will raise error <strong>before</strong> sending payload to device. For instance, if the device advertises via a deviation that it does not support the <code class="docutils literal"><span class="pre">subscription</span></code> node as shown above, an error will be raised.</p>
-<p>We can try to configure a dynamic subscription with the below app.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig.openconfig_telemetry</span> <span class="kn">import</span> <span class="n">TelemetrySystem</span>
-
-<span class="n">telemetry</span> <span class="o">=</span> <span class="n">TelemetrySystem</span><span class="p">()</span>
-<span class="n">s</span> <span class="o">=</span> <span class="n">telemetry</span><span class="o">.</span><span class="n">subscriptions</span><span class="o">.</span><span class="n">dynamic</span><span class="o">.</span><span class="n">Subscription</span><span class="p">()</span>
-<span class="n">s</span><span class="o">.</span><span class="n">subscription_id</span> <span class="o">=</span> <span class="mi">123</span>
-<span class="n">s</span><span class="o">.</span><span class="n">state</span><span class="o">.</span><span class="n">subscription_id</span> <span class="o">=</span> <span class="mi">123</span>
-<span class="n">telemetry</span><span class="o">.</span><span class="n">subscriptions</span><span class="o">.</span><span class="n">dynamic</span><span class="o">.</span><span class="n">subscription</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">s</span><span class="p">)</span>
-
-<span class="c1"># Call the CRUD create on the top-level telemetry object</span>
-<span class="c1"># (assuming you have already instantiated the service and provider)</span>
-<span class="n">crud</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">telemetry</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>The above app results in the below errors logged and exception being raised because of the deviation which is active on the <code class="docutils literal"><span class="pre">subscription</span></code> node.</p>
-<div class="highlight-sh"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="m">2017</span>-11-08 <span class="m">21</span>:26:58,543 - ydk - ERROR - Data is invalid according to the yang model. Error details: Schema node not found. Path: <span class="s1">&#39;subscription&#39;</span>
-<span class="m">2017</span>-11-08 <span class="m">21</span>:26:58,543 - ydk - ERROR - Invalid path: subscription<span class="o">[</span>subscription-id<span class="o">=</span><span class="s1">&#39;123&#39;</span><span class="o">]</span>
-
-  File <span class="s2">&quot;/Users/lib/python3.6/site-packages/ydk/errors/error_handler.py&quot;</span>, line <span class="m">112</span>, <span class="k">in</span> helper
-    <span class="k">return</span> func<span class="o">(</span>self, provider, entity, *args, **kwargs<span class="o">)</span>
-  File <span class="s2">&quot;/Users/lib/python3.6/site-packages/ydk/services/crud_service.py&quot;</span>, line <span class="m">30</span>, <span class="k">in</span> create
-    <span class="k">return</span> self._crud.create<span class="o">(</span>provider, entity<span class="o">)</span>
-  File <span class="s2">&quot;/Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/contextlib.py&quot;</span>, line <span class="m">99</span>, <span class="k">in</span> __exit__
-    self.gen.throw<span class="o">(</span>type, value, traceback<span class="o">)</span>
-  File <span class="s2">&quot;/Users/lib/python3.6/site-packages/ydk/errors/error_handler.py&quot;</span>, line <span class="m">82</span>, <span class="k">in</span> handle_runtime_error
-    _raise<span class="o">(</span>_exc<span class="o">)</span>
-  File <span class="s2">&quot;/Users/lib/python3.6/site-packages/ydk/errors/error_handler.py&quot;</span>, line <span class="m">54</span>, <span class="k">in</span> _raise
-    exec<span class="o">(</span><span class="s2">&quot;raise exc from None&quot;</span><span class="o">)</span>
-  File <span class="s2">&quot;&lt;string&gt;&quot;</span>, line <span class="m">1</span>, <span class="k">in</span> &lt;module&gt;
-ydk.errors.YModelError:  Invalid path: subscription<span class="o">[</span>subscription-id<span class="o">=</span><span class="s1">&#39;123&#39;</span><span class="o">]</span> : Schema node not found.. Path: subscription
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="path.html" class="btn btn-neutral float-right" title="How do I use the Path API?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="presence_class.html" class="btn btn-neutral" title="What are presence classes?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/executor_guide.html b/docs/guides/executor_guide.html
deleted file mode 100644
index 4c6c1ea0b..000000000
--- a/docs/guides/executor_guide.html
+++ /dev/null
@@ -1,298 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How do I execute RPCs? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How to Disable Validation" href="validation.html"/>
-        <link rel="prev" title="How do I work with instances of YANG data?" href="codec_guide.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How do I execute RPCs?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#executing-a-rollback-rpc">Executing a rollback RPC</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How do I execute RPCs?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-do-i-execute-rpcs">
-<h1><a class="toc-backref" href="#toc-entry-1">How do I execute RPCs?</a><a class="headerlink" href="#how-do-i-execute-rpcs" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#how-do-i-execute-rpcs" id="toc-entry-1">How do I execute RPCs?</a><ul>
-<li><a class="reference internal" href="#executing-a-rollback-rpc" id="toc-entry-2">Executing a rollback RPC</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>This document contains some examples of executing RPCs defined in yang. To perform these operations, the <a class="reference internal" href="../api/services/executor_service.html#ydk.services.ExecutorService" title="ydk.services.ExecutorService"><code class="xref py py-class docutils literal"><span class="pre">ExecutorService</span></code></a> is used.</p>
-<p>The below approach can be used to execute a rollback RPC.</p>
-<div class="section" id="executing-a-rollback-rpc">
-<h2><a class="toc-backref" href="#toc-entry-2">Executing a rollback RPC</a><a class="headerlink" href="#executing-a-rollback-rpc" title="Permalink to this headline">¶</a></h2>
-<p>For this example, the <code class="xref py py-class docutils literal"><span class="pre">Cisco_IOS_XR_cfgmgr_rollback_act.RollBackConfigurationLast</span></code> class is used. Note that the <code class="docutils literal"><span class="pre">ydk</span></code> and <code class="docutils literal"><span class="pre">ydk-models-cisco-ios-xr</span></code> python packages need to be installed for this example.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># Import the rollback module</span>
-<span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_cfgmgr_rollback_act</span>
-
-<span class="c1"># Import the executor service and netconf provider</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">ExecutorService</span>
-<span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">NetconfServiceProvider</span>
-
-<span class="c1"># Create object</span>
-<span class="n">roll_back_configuration_to</span> <span class="o">=</span> <span class="n">Cisco_IOS_XR_cfgmgr_rollback_act</span><span class="o">.</span><span class="n">RollBackConfigurationLast</span><span class="p">()</span>
-
-<span class="c1"># Force roll back for the five most recent changes</span>
-<span class="n">roll_back_configuration_to</span><span class="o">.</span><span class="n">input</span><span class="o">.</span><span class="n">comment</span> <span class="o">=</span> <span class="s2">&quot;Forced programmatic rollback&quot;</span>
-<span class="n">roll_back_configuration_to</span><span class="o">.</span><span class="n">input</span><span class="o">.</span><span class="n">count</span> <span class="o">=</span> <span class="mi">5</span>
-<span class="n">roll_back_configuration_to</span><span class="o">.</span><span class="n">input</span><span class="o">.</span><span class="n">force</span> <span class="o">=</span> <span class="kc">True</span>
-<span class="n">roll_back_configuration_to</span><span class="o">.</span><span class="n">input</span><span class="o">.</span><span class="n">label</span> <span class="o">=</span> <span class="s2">&quot;PRB-005&quot;</span>
-
-<span class="c1"># Create executor service</span>
-<span class="n">executor</span> <span class="o">=</span> <span class="n">ExecutorService</span><span class="p">()</span>
-
-<span class="c1"># Create a NetconfServiceProvider instance to connect to the device</span>
-<span class="n">provider</span> <span class="o">=</span> <span class="n">NetconfServiceProvider</span><span class="p">(</span><span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span>
-                                     <span class="n">port</span><span class="o">=</span><span class="mi">830</span><span class="p">,</span>
-                                     <span class="n">username</span><span class="o">=</span><span class="s1">&#39;test&#39;</span><span class="p">,</span>
-                                     <span class="n">password</span><span class="o">=</span><span class="s1">&#39;test&#39;</span><span class="p">)</span>
-
-<span class="c1"># Execute RPC on NETCONF device</span>
-<span class="n">executor</span><span class="o">.</span><span class="n">execute_rpc</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">roll_back_configuration_to</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="validation.html" class="btn btn-neutral float-right" title="How to Disable Validation" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="codec_guide.html" class="btn btn-neutral" title="How do I work with instances of YANG data?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/introduction.html b/docs/guides/introduction.html
deleted file mode 100644
index c3114ef8c..000000000
--- a/docs/guides/introduction.html
+++ /dev/null
@@ -1,497 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Introduction &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How do I create, update, read and delete?" href="crud_guide.html"/>
-        <link rel="prev" title="Developer Guide" href="../developer_guide.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Introduction</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#writing-an-app">Writing an app</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#what-happens-underneath">What happens underneath</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#service-providers">Service providers</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#using-the-model-apis">Using the model APIs</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#invoking-the-crud-service">Invoking the CRUD Service</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#using-non-top-level-objects">Using non-top level objects</a><ul>
-<li class="toctree-l4"><a class="reference internal" href="#top-level-object-vs-non-top">Top level object vs. non-top</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#how-to-use-non-top-level-objects">How to use non-top level objects</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#limitations">Limitations</a></li>
-<li class="toctree-l4"><a class="reference internal" href="#under-the-hood">Under the hood</a></li>
-</ul>
-</li>
-<li class="toctree-l3"><a class="reference internal" href="#logging">Logging</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>Introduction</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="introduction">
-<h1><a class="toc-backref" href="#toc-entry-1">Introduction</a><a class="headerlink" href="#introduction" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#introduction" id="toc-entry-1">Introduction</a><ul>
-<li><a class="reference internal" href="#writing-an-app" id="toc-entry-2">Writing an app</a></li>
-<li><a class="reference internal" href="#what-happens-underneath" id="toc-entry-3">What happens underneath</a></li>
-<li><a class="reference internal" href="#service-providers" id="toc-entry-4">Service providers</a></li>
-<li><a class="reference internal" href="#using-the-model-apis" id="toc-entry-5">Using the model APIs</a></li>
-<li><a class="reference internal" href="#invoking-the-crud-service" id="toc-entry-6">Invoking the CRUD Service</a></li>
-<li><a class="reference internal" href="#using-non-top-level-objects" id="toc-entry-7">Using non-top level objects</a><ul>
-<li><a class="reference internal" href="#top-level-object-vs-non-top" id="toc-entry-8">Top level object vs. non-top</a></li>
-<li><a class="reference internal" href="#how-to-use-non-top-level-objects" id="toc-entry-9">How to use non-top level objects</a></li>
-<li><a class="reference internal" href="#limitations" id="toc-entry-10">Limitations</a></li>
-<li><a class="reference internal" href="#under-the-hood" id="toc-entry-11">Under the hood</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#logging" id="toc-entry-12">Logging</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>YDK consists of two main components: core library, which consists of services and providers, and python model API, which are APIs generated based on YANG models and packaged as bundles.</p>
-<p>Core library consists of the below:</p>
-<blockquote>
-<div><ul class="simple">
-<li><strong>Service:</strong> Provides simple API interface to be used with the bindings and providers</li>
-<li><strong>ServiceProvider:</strong> Provides concrete implementation that abstracts underlying protocol details (e.g. <a class="reference internal" href="../api/providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a>, which is based on the NETCONF protocol)</li>
-</ul>
-</div></blockquote>
-<p>Applications can be written using the python model API in conjunction with a service and a provider.</p>
-<div class="section" id="writing-an-app">
-<h2><a class="toc-backref" href="#toc-entry-2">Writing an app</a><a class="headerlink" href="#writing-an-app" title="Permalink to this headline">¶</a></h2>
-<p>In this example, we set some BGP configuration using the OpenConfig model, the CRUD (Create/Read/Update/Delete) service and the NETCONF service provider. The example in this document is a simplified version of the more complete sample that is available in <code class="docutils literal"><span class="pre">samples/bgp.py</span></code>. The more complete sample can be run with the below steps:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span><span class="o">(</span>ydk-py<span class="o">)</span>ydk-py$ <span class="nb">cd</span> core/samples
-<span class="o">(</span>ydk-py<span class="o">)</span>samples$ ./bgp.py -h
-Usage: bgp.py <span class="o">[</span>-h <span class="p">|</span> --help<span class="o">]</span> <span class="o">[</span>options<span class="o">]</span>
-
-Options:
--h, --help            show this <span class="nb">help</span> message and <span class="nb">exit</span>
--v VERSION, --version<span class="o">=</span>VERSION
-                    force NETCONF version <span class="m">1</span>.0 or <span class="m">1</span>.1
--u USERNAME, --user<span class="o">=</span>USERNAME
--p PASSWORD, --password<span class="o">=</span>PASSWORD
-                    password
---proto<span class="o">=</span>PROTO         Which transport protocol to use, one of ssh or tcp
---host<span class="o">=</span>HOST           NETCONF agent hostname
---port<span class="o">=</span>PORT           NETCONF agent SSH port
-
-<span class="o">(</span>ydk-py<span class="o">)</span>samples$ ./bgp.py --host &lt;ip-address-of-netconf-server&gt; -u &lt;username&gt; -p &lt;password&gt; --port &lt;port-number&gt;
-</pre></div>
-</div>
-</div>
-<div class="section" id="what-happens-underneath">
-<h2><a class="toc-backref" href="#toc-entry-3">What happens underneath</a><a class="headerlink" href="#what-happens-underneath" title="Permalink to this headline">¶</a></h2>
-<p>YDK performs the below actions when running this application:</p>
-<blockquote>
-<div><ol class="arabic simple">
-<li>Establish a session with the device</li>
-<li>Encode python data objects to the protocol format (e.g. netconf XML payload)</li>
-<li>Perform transport operation with the device and collect the response (e.g. netconf reply)</li>
-<li>Decode response as python object and return the result to app</li>
-<li>Raise python exceptions for any errors that occurred</li>
-</ol>
-</div></blockquote>
-</div>
-<div class="section" id="service-providers">
-<h2><a class="toc-backref" href="#toc-entry-4">Service providers</a><a class="headerlink" href="#service-providers" title="Permalink to this headline">¶</a></h2>
-<p>The first step in any application is to create a service provider instance. In this case, the NETCONF service provider (defined in <a class="reference internal" href="../api/providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a>) is responsible for mapping between the CRUD service API and the underlying manageability protocol (NETCONF RPCs).</p>
-<p>We instantiate an instance of the service provider that creates a NETCONF session to the machine with address 10.0.0.1:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span>
-<span class="normal">7</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">NetconfServiceProvider</span>
-
-<span class="n">sp_instance</span> <span class="o">=</span> <span class="n">NetconfServiceProvider</span><span class="p">(</span><span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span>
-                                     <span class="n">port</span><span class="o">=</span><span class="mi">830</span><span class="p">,</span>
-                                     <span class="n">username</span><span class="o">=</span><span class="s1">&#39;test&#39;</span><span class="p">,</span>
-                                     <span class="n">password</span><span class="o">=</span><span class="s1">&#39;test&#39;</span><span class="p">,</span>
-                                     <span class="n">protocol</span><span class="o">=</span><span class="s1">&#39;ssh&#39;</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="using-the-model-apis">
-<h2><a class="toc-backref" href="#toc-entry-5">Using the model APIs</a><a class="headerlink" href="#using-the-model-apis" title="Permalink to this headline">¶</a></h2>
-<p>After establishing the connection, we instantiate the entities and set some data. First, we import the types from the OpenConfig BGP module:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">8</span>
-<span class="normal">9</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp_types</span>
-</pre></div>
-</td></tr></table></div>
-<p>Next, create a <code class="xref py py-class docutils literal"><span class="pre">Bgp</span></code> configuration object and set the attributes:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># create BGP object</span>
-<span class="n">bgp_cfg</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># set the Global AS</span>
-<span class="n">bgp_cfg</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65001</span>
-
-<span class="c1"># Create an AFI SAFI config</span>
-<span class="n">ipv4_afsf</span> <span class="o">=</span> <span class="n">bgp_cfg</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">afi_safis</span><span class="o">.</span><span class="n">AfiSafi</span><span class="p">()</span>
-<span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">Ipv4Unicast</span><span class="p">()</span>
-<span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">Ipv4Unicast</span><span class="p">()</span>
-<span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">enabled</span> <span class="o">=</span> <span class="kc">True</span>
-
-<span class="c1"># Add the AFI SAFI config to the global AFI SAFI list</span>
-<span class="n">bgp_cfg</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">afi_safis</span><span class="o">.</span><span class="n">afi_safi</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">ipv4_afsf</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="invoking-the-crud-service">
-<h2><a class="toc-backref" href="#toc-entry-6">Invoking the CRUD Service</a><a class="headerlink" href="#invoking-the-crud-service" title="Permalink to this headline">¶</a></h2>
-<p>The CRUD service provides methods to create, read, update and delete entities on a device making use of the session provided by a service provider (NETCONF in this case).  In order to use the CRUD service, we need to import the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> class:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">24</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CRUDService</span>
-</pre></div>
-</td></tr></table></div>
-<p>Next, we instantiate the CRUD service:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">25</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">crud_service</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-</pre></div>
-</td></tr></table></div>
-<p>Finally, we invoke the create method of the in this case).  In order to use the CRUD service, we need to import the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> class passing in the
-service provider instance and our entity (<code class="docutils literal"><span class="pre">bgp_cfg</span></code>):</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">try</span><span class="p">:</span>
-    <span class="n">crud_service</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">sp_instance</span><span class="p">,</span> <span class="n">bgp_cfg</span><span class="p">)</span>
-<span class="k">except</span> <span class="n">YError</span><span class="p">:</span>
-</pre></div>
-</td></tr></table></div>
-<p>Note if there were any errors the above API will raise a YError exception.</p>
-</div>
-<div class="section" id="using-non-top-level-objects">
-<h2><a class="toc-backref" href="#toc-entry-7">Using non-top level objects</a><a class="headerlink" href="#using-non-top-level-objects" title="Permalink to this headline">¶</a></h2>
-<p>In the example above you noticed that we started building model from top-level object - <code class="xref py py-class docutils literal"><span class="pre">Bgp</span></code> and then built the object tree down the hierarchy.
-However in certain conditions we can build independently non-top level objects and still be able to do all the CRUD operations.</p>
-<div class="section" id="top-level-object-vs-non-top">
-<h3><a class="toc-backref" href="#toc-entry-8">Top level object vs. non-top</a><a class="headerlink" href="#top-level-object-vs-non-top" title="Permalink to this headline">¶</a></h3>
-<p>The top level object represents top-level container in the Yang model. Examples of top-level objects:</p>
-<blockquote>
-<div><ul class="simple">
-<li>openconfig_bgp.Bgp</li>
-<li>openconfig_interfaces.Interfaces</li>
-</ul>
-</div></blockquote>
-<p>The non-top level object represents a container in the Yang model, which is located under top level container. A member of a non-top level list can also be considered as non-top level object.
-Examples of non-top level objects:</p>
-<blockquote>
-<div><ul class="simple">
-<li>openconfig_bgp.Bgp.Global_.AfiSafis.AfiSafi</li>
-<li>openconfig_bgp.Bgp.Neighbors</li>
-<li>openconfig_bgp.Bgp.Neighbors.Neighbor</li>
-<li>openconfig_bgp.Bgp.Neighbors.Neighbor.Config</li>
-<li>openconfig_interfaces.Interfaces.Interface</li>
-</ul>
-</div></blockquote>
-</div>
-<div class="section" id="how-to-use-non-top-level-objects">
-<h3><a class="toc-backref" href="#toc-entry-9">How to use non-top level objects</a><a class="headerlink" href="#how-to-use-non-top-level-objects" title="Permalink to this headline">¶</a></h3>
-<p>You should be able to work with non-top level objects similarly as with top level.
-Your program will look more simple and straight to the point.
-The above example will look now like this:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span>   <span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp</span>
-   <span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_bgp_types</span>
-
-   <span class="c1"># Create an AFI SAFI config</span>
-   <span class="n">ipv4_afsf</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="o">.</span><span class="n">Global_</span><span class="o">.</span><span class="n">AfiSafis</span><span class="o">.</span><span class="n">AfiSafi</span><span class="p">()</span>
-   <span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">Ipv4Unicast</span><span class="p">()</span>
-   <span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">Ipv4Unicast</span><span class="p">()</span>
-   <span class="n">ipv4_afsf</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">enabled</span> <span class="o">=</span> <span class="kc">True</span>
-
-   <span class="n">crud_service</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-   <span class="n">crud_service</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">sp_instance</span><span class="p">,</span> <span class="n">ipv4_afsf</span><span class="p">)</span>
-
-   <span class="c1"># Read single AFI SAFI config</span>
-   <span class="n">afisafiFilter</span> <span class="o">=</span> <span class="n">openconfig_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="o">.</span><span class="n">Global_</span><span class="o">.</span><span class="n">AfiSafis</span><span class="o">.</span><span class="n">AfiSafi</span><span class="p">()</span>
-   <span class="n">afisafiFilter</span><span class="o">.</span><span class="n">afi_safi_name</span> <span class="o">=</span> <span class="n">openconfig_bgp_types</span><span class="o">.</span><span class="n">IPV6UNICAST</span><span class="p">{}</span>
-
-   <span class="n">afisafi</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">ReadConfig</span><span class="p">(</span><span class="n">sp_instance</span><span class="p">,</span> <span class="n">afisafiFilter</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="limitations">
-<h3><a class="toc-backref" href="#toc-entry-10">Limitations</a><a class="headerlink" href="#limitations" title="Permalink to this headline">¶</a></h3>
-<p>Not all non-top level objects can be used independently. Here is the rule:</p>
-<blockquote>
-<div>When building non-top level object, we have to define all the list keys on the way up to the top level object.
-In the example above the object <cite>ipv4_afsf</cite> is a member of the list. We can use it as long as its key <cite>afi_safi_name</cite> is defined.</div></blockquote>
-</div>
-<div class="section" id="under-the-hood">
-<h3><a class="toc-backref" href="#toc-entry-11">Under the hood</a><a class="headerlink" href="#under-the-hood" title="Permalink to this headline">¶</a></h3>
-<p>The programmability protocols like Netconf, gNMI, etc. are always working with top level model objects.
-When non-top level object is presented to <cite>CRUDService</cite> or <cite>NetconfService</cite>, the YDK creates corresponding top-level object and perform the requested operation.
-In case of read/get operation the protocol returns always top-level objects.
-When specified filter is a non-top level object, the YDK traverses the response object tree and finds corresponding non-top level object.</p>
-</div>
-</div>
-<div class="section" id="logging">
-<span id="howto-logging"></span><h2><a class="toc-backref" href="#toc-entry-12">Logging</a><a class="headerlink" href="#logging" title="Permalink to this headline">¶</a></h2>
-<p>YDK uses common Python logging.  All modules are based on the <code class="docutils literal"><span class="pre">ydk</span></code> log. The below code snippet shows how to enable basic logging with the <code class="docutils literal"><span class="pre">INFO</span></code> level, which is useful for most <cite>users</cite> of YDK. Using the <code class="docutils literal"><span class="pre">DEBUG</span></code> level will produces a lot more detailed logs, which may be useful for <cite>developers</cite> working on YDK.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">logging</span>
-<span class="n">log</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="s1">&#39;ydk&#39;</span><span class="p">)</span>
-<span class="n">log</span><span class="o">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">)</span>
-<span class="n">handler</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">StreamHandler</span><span class="p">()</span>
-<span class="n">log</span><span class="o">.</span><span class="n">addHandler</span><span class="p">(</span><span class="n">handler</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>To see time stamps and logging levels, please see the below code snippet.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
-<span class="normal">2</span>
-<span class="normal">3</span>
-<span class="normal">4</span>
-<span class="normal">5</span>
-<span class="normal">6</span>
-<span class="normal">7</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">logging</span>
-<span class="n">log</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="s1">&#39;ydk&#39;</span><span class="p">)</span>
-<span class="n">log</span><span class="o">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">logging</span><span class="o">.</span><span class="n">INFO</span><span class="p">)</span>
-<span class="n">handler</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">StreamHandler</span><span class="p">()</span>
-<span class="n">formatter</span> <span class="o">=</span> <span class="n">logging</span><span class="o">.</span><span class="n">Formatter</span><span class="p">((</span><span class="s2">&quot;</span><span class="si">%(asctime)s</span><span class="s2"> - </span><span class="si">%(name)s</span><span class="s2"> - </span><span class="si">%(levelname)s</span><span class="s2"> - </span><span class="si">%(message)s</span><span class="s2">&quot;</span><span class="p">))</span>
-<span class="n">handler</span><span class="o">.</span><span class="n">setFormatter</span><span class="p">(</span><span class="n">formatter</span><span class="p">)</span>
-<span class="n">log</span><span class="o">.</span><span class="n">addHandler</span><span class="p">(</span><span class="n">handler</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="crud_guide.html" class="btn btn-neutral float-right" title="How do I create, update, read and delete?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="../developer_guide.html" class="btn btn-neutral" title="Developer Guide" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/opendaylight.html b/docs/guides/opendaylight.html
deleted file mode 100644
index 8cb3464bf..000000000
--- a/docs/guides/opendaylight.html
+++ /dev/null
@@ -1,387 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How do I use OpenDaylight with YDK? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="Using Restconf with HTTPS" href="restconf_https.html"/>
-        <link rel="prev" title="How do I use the Path API?" href="path.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How do I use OpenDaylight with YDK?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#writing-the-app">Writing the app</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#what-happens-underneath">What happens underneath</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#import-libraries">Import libraries</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#opendaylight-service-provider">OpenDaylight service provider</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#using-the-model-apis">Using the model APIs</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#invoking-the-crud-service">Invoking the CRUD Service</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#logging">Logging</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How do I use OpenDaylight with YDK?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-do-i-use-opendaylight-with-ydk">
-<h1><a class="toc-backref" href="#toc-entry-1">How do I use OpenDaylight with YDK?</a><a class="headerlink" href="#how-do-i-use-opendaylight-with-ydk" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="contents">
-<p class="topic-title">Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#how-do-i-use-opendaylight-with-ydk" id="toc-entry-1">How do I use OpenDaylight with YDK?</a><ul>
-<li><a class="reference internal" href="#writing-the-app" id="toc-entry-2">Writing the app</a></li>
-<li><a class="reference internal" href="#what-happens-underneath" id="toc-entry-3">What happens underneath</a></li>
-<li><a class="reference internal" href="#import-libraries" id="toc-entry-4">Import libraries</a></li>
-<li><a class="reference internal" href="#opendaylight-service-provider" id="toc-entry-5">OpenDaylight service provider</a></li>
-<li><a class="reference internal" href="#using-the-model-apis" id="toc-entry-6">Using the model APIs</a></li>
-<li><a class="reference internal" href="#invoking-the-crud-service" id="toc-entry-7">Invoking the CRUD Service</a></li>
-<li><a class="reference internal" href="#logging" id="toc-entry-8">Logging</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>YDK makes it easy to interact with OpenDaylight programmatically using the YANG model APIs.</p>
-<p>Applications can be written using the Python model API in conjunction with a service and a provider.</p>
-<div class="section" id="writing-the-app">
-<h2><a class="toc-backref" href="#toc-entry-2">Writing the app</a><a class="headerlink" href="#writing-the-app" title="Permalink to this headline">¶</a></h2>
-<p>In this example, we set some BGP configuration using the Cisco IOS XR model, the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUD</span> <span class="pre">(Create/Read/Update/Delete)</span> <span class="pre">service</span></code></a> and the <a class="reference internal" href="../api/providers/odl_provider.html#ydk.providers.OpendaylightServiceProvider" title="ydk.providers.OpendaylightServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">OpenDaylightServiceProvider</span></code></a>. The example in this document is a simplified version of the more complete sample that is available in <code class="docutils literal"><span class="pre">core/samples/bgp_xr_opendaylight.py</span></code>. Assuming you have performed the <code class="docutils literal"><span class="pre">core</span></code> and <code class="docutils literal"><span class="pre">cisco-ios-xr</span></code> bundle installations first(see <a class="reference internal" href="../getting_started.html#howto-install"><span class="std std-ref">Core Installation</span></a>), the more complete sample can be run with the below steps:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span>ydk-py$ <span class="nb">cd</span> core/samples
-samples$ ./bgp_xr_opendaylight.py http://&lt;username&gt;:&lt;password&gt;@&lt;host-address&gt;:&lt;port&gt;
-</pre></div>
-</div>
-</div>
-<div class="section" id="what-happens-underneath">
-<h2><a class="toc-backref" href="#toc-entry-3">What happens underneath</a><a class="headerlink" href="#what-happens-underneath" title="Permalink to this headline">¶</a></h2>
-<p>YDK performs the below actions when running this application:</p>
-<blockquote>
-<div><ol class="arabic simple">
-<li>Establish a session with the OpenDaylight instance and fetch the details of the nodes mounted on the southbound</li>
-<li>Encode Python data objects to the protocol format (e.g. restconf JSON payload)</li>
-<li>For a chosen node on the southbound, perform transport operation with the device and collect the response (e.g. restconf reply)</li>
-<li>Decode response as Python object and return the result to app</li>
-<li>Raise Python exceptions for any errors that occurred</li>
-</ol>
-</div></blockquote>
-</div>
-<div class="section" id="import-libraries">
-<h2><a class="toc-backref" href="#toc-entry-4">Import libraries</a><a class="headerlink" href="#import-libraries" title="Permalink to this headline">¶</a></h2>
-<p>In our example YDK application, first, let us import the necessary libraries</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">os</span>
-<span class="kn">import</span> <span class="nn">sys</span>
-<span class="kn">from</span> <span class="nn">argparse</span> <span class="kn">import</span> <span class="n">ArgumentParser</span>
-<span class="k">if</span> <span class="n">sys</span><span class="o">.</span><span class="n">version_info</span> <span class="o">&gt;</span> <span class="p">(</span><span class="mi">3</span><span class="p">,):</span>
-    <span class="kn">from</span> <span class="nn">urllib.parse</span> <span class="kn">import</span> <span class="n">urlparse</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="kn">from</span> <span class="nn">urlparse</span> <span class="kn">import</span> <span class="n">urlparse</span>
-
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">Empty</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CRUDService</span>
-<span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">OpenDaylightServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.errors</span> <span class="kn">import</span> <span class="n">YError</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EncodingFormat</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-<span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ipv4_bgp_cfg</span> <span class="k">as</span> <span class="n">xr_bgp</span>
-<span class="kn">from</span> <span class="nn">ydk.models.cisco_ios_xr</span> <span class="kn">import</span> <span class="n">Cisco_IOS_XR_ipv4_bgp_datatypes</span> <span class="k">as</span> <span class="n">xr_bgp_types</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="opendaylight-service-provider">
-<h2><a class="toc-backref" href="#toc-entry-5">OpenDaylight service provider</a><a class="headerlink" href="#opendaylight-service-provider" title="Permalink to this headline">¶</a></h2>
-<p>The first step in any application is to create a service provider instance. In this case, the OpenDaylight service provider is responsible for mapping between the CRUD service API and the underlying manageability protocol (Restconf).</p>
-<p>We first instantiate a <a class="reference internal" href="../api/path/repository.html#ydk.path.Repository" title="ydk.path.Repository"><code class="xref py py-class docutils literal"><span class="pre">Repository</span></code></a> using the location of the schema cache of the OpenDaylight instance. We instantiate an instance of the service provider that can communicate using Restconf with an OpenDaylight instance running at host address: <code class="docutils literal"><span class="pre">127.0.0.1</span></code> and port: <code class="docutils literal"><span class="pre">8181</span></code></p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">17</span>
-<span class="normal">18</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">repo</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s2">&quot;/Users/home/distribution-karaf-0.5.2-Boron-SR2/cache/schema&quot;</span><span class="p">)</span> <span class="c1"># In this case, we have a ODL boron instance with this schema cache location</span>
-<span class="n">odl_provider</span> <span class="o">=</span> <span class="n">OpenDaylightServiceProvider</span><span class="p">(</span><span class="n">repo</span><span class="p">,</span> <span class="s2">&quot;127.0.0.1&quot;</span><span class="p">,</span> <span class="s2">&quot;admin&quot;</span><span class="p">,</span> <span class="s2">&quot;admin&quot;</span><span class="p">,</span> <span class="mi">8181</span><span class="p">,</span> <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">XML</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="using-the-model-apis">
-<h2><a class="toc-backref" href="#toc-entry-6">Using the model APIs</a><a class="headerlink" href="#using-the-model-apis" title="Permalink to this headline">¶</a></h2>
-<p>After establishing the connection, let&#8217;s instantiate the entities and set some data. Now, create a Cisco IOS XR <code class="xref py py-class docutils literal"><span class="pre">Bgp</span></code> configuration object and set the attributes</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span>
-<span class="normal">34</span>
-<span class="normal">35</span>
-<span class="normal">36</span>
-<span class="normal">37</span>
-<span class="normal">38</span>
-<span class="normal">39</span>
-<span class="normal">40</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># Create BGP object</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">xr_bgp</span><span class="o">.</span><span class="n">Bgp</span><span class="p">()</span>
-
-<span class="c1"># BGP instance</span>
-<span class="n">instance</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">Instance</span><span class="p">()</span>
-<span class="n">instance</span><span class="o">.</span><span class="n">instance_name</span> <span class="o">=</span> <span class="s2">&quot;test&quot;</span>
-<span class="n">instance_as</span> <span class="o">=</span> <span class="n">instance</span><span class="o">.</span><span class="n">InstanceAs</span><span class="p">()</span>
-<span class="n">instance_as</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65001</span><span class="p">;</span>
-<span class="n">four_byte_as</span> <span class="o">=</span> <span class="n">instance_as</span><span class="o">.</span><span class="n">FourByteAs</span><span class="p">()</span>
-<span class="n">four_byte_as</span><span class="o">.</span><span class="n">as_</span> <span class="o">=</span> <span class="mi">65001</span><span class="p">;</span>
-<span class="n">four_byte_as</span><span class="o">.</span><span class="n">bgp_running</span> <span class="o">=</span> <span class="n">Empty</span><span class="p">();</span>
-
-<span class="c1"># global address family</span>
-<span class="n">global_af</span> <span class="o">=</span> <span class="n">four_byte_as</span><span class="o">.</span><span class="n">DefaultVrf</span><span class="o">.</span><span class="n">Global_</span><span class="o">.</span><span class="n">GlobalAfs</span><span class="o">.</span><span class="n">GlobalAf</span><span class="p">()</span>
-<span class="n">global_af</span><span class="o">.</span><span class="n">af_name</span> <span class="o">=</span> <span class="n">xr_bgp_types</span><span class="o">.</span><span class="n">BgpAddressFamilyEnum</span><span class="o">.</span><span class="n">ipv4_unicast</span><span class="p">;</span>
-<span class="n">global_af</span><span class="o">.</span><span class="n">enable</span> <span class="o">=</span> <span class="n">Empty</span><span class="p">();</span>
-<span class="n">four_byte_as</span><span class="o">.</span><span class="n">default_vrf</span><span class="o">.</span><span class="n">global_</span><span class="o">.</span><span class="n">global_afs</span><span class="o">.</span><span class="n">global_af</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">global_af</span><span class="p">)</span>
-
-<span class="c1"># add the instance to the parent BGP object</span>
-<span class="n">instance_as</span><span class="o">.</span><span class="n">four_byte_as</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">four_byte_as</span><span class="p">)</span>
-<span class="n">instance</span><span class="o">.</span><span class="n">instance_as</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">instance_as</span><span class="p">)</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">instance</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">instance</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="invoking-the-crud-service">
-<h2><a class="toc-backref" href="#toc-entry-7">Invoking the CRUD Service</a><a class="headerlink" href="#invoking-the-crud-service" title="Permalink to this headline">¶</a></h2>
-<p>The CRUD service provides methods to create, read, update and delete entities on a device making use of the session provided by a service provider.  In order to use the CRUD service, we need to instantiate the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> class</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">41</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">crud_service</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-</pre></div>
-</td></tr></table></div>
-<p>At this point we can explore the southbound device node-IDs using the function call: <a class="reference internal" href="../api/providers/odl_provider.html#ydk.providers.OpendaylightServiceProvider.get_node_ids" title="ydk.providers.OpendaylightServiceProvider.get_node_ids"><code class="xref py py-meth docutils literal"><span class="pre">get_node_ids</span></code></a>. Let us assume there is a XR device mounted with the node ID <code class="docutils literal"><span class="pre">xr</span></code>. We can obtain the <code class="xref py py-class docutils literal"><span class="pre">ServiceProvider</span></code> instance corresponding to this node using the : <a class="reference internal" href="../api/providers/odl_provider.html#ydk.providers.OpendaylightServiceProvider.get_node_provider" title="ydk.providers.OpendaylightServiceProvider.get_node_provider"><code class="xref py py-meth docutils literal"><span class="pre">get_node_provider</span></code></a>.</p>
-<p>Finally, we invoke the create method of the <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CRUDService</span></code></a> class passing in the service provider instance and our entity, <code class="docutils literal"><span class="pre">bgp</span></code></p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">42</span>
-<span class="normal">43</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="n">provider</span> <span class="o">=</span> <span class="n">odl_provider</span><span class="o">.</span><span class="n">get_node_provider</span><span class="p">(</span><span class="s1">&#39;xr&#39;</span><span class="p">)</span>
-<span class="n">crud_service</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">bgp</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-<p>Note if there were any errors the above API will raise an exception with the base type <a class="reference internal" href="../api/errors.html#ydk.errors.YError" title="ydk.errors.YError"><code class="xref py py-class docutils literal"><span class="pre">YError</span></code></a></p>
-</div>
-<div class="section" id="logging">
-<h2><a class="toc-backref" href="#toc-entry-8">Logging</a><a class="headerlink" href="#logging" title="Permalink to this headline">¶</a></h2>
-<p>YDK uses common Python logging. See <a class="reference internal" href="introduction.html#howto-logging"><span class="std std-ref">Logging</span></a>.</p>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="restconf_https.html" class="btn btn-neutral float-right" title="Using Restconf with HTTPS" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="path.html" class="btn btn-neutral" title="How do I use the Path API?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/path.html b/docs/guides/path.html
deleted file mode 100644
index 4ee0b0715..000000000
--- a/docs/guides/path.html
+++ /dev/null
@@ -1,492 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How do I use the Path API? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="How do I use OpenDaylight with YDK?" href="opendaylight.html"/>
-        <link rel="prev" title="What are deviations?" href="deviation.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How do I use the Path API?</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#how-do-i-create-a-basic-configuration">How do I create a basic configuration?</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#how-do-i-work-with-different-rpcs">How do I work with different RPCs?</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#how-do-i-work-with-yang-1-1-actions">How do I work with YANG 1.1 actions?</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#what-is-the-path-syntax">What is the Path syntax?</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How do I use the Path API?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-do-i-use-the-path-api">
-<span id="howto-path"></span><h1><a class="toc-backref" href="#toc-entry-1">How do I use the Path API?</a><a class="headerlink" href="#how-do-i-use-the-path-api" title="Permalink to this headline">¶</a></h1>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#how-do-i-use-the-path-api" id="toc-entry-1">How do I use the Path API?</a><ul>
-<li><a class="reference internal" href="#how-do-i-create-a-basic-configuration" id="toc-entry-2">How do I create a basic configuration?</a></li>
-<li><a class="reference internal" href="#how-do-i-work-with-different-rpcs" id="toc-entry-3">How do I work with different RPCs?</a></li>
-<li><a class="reference internal" href="#how-do-i-work-with-yang-1-1-actions" id="toc-entry-4">How do I work with YANG 1.1 actions?</a></li>
-<li><a class="reference internal" href="#what-is-the-path-syntax" id="toc-entry-5">What is the Path syntax?</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<p>The <a class="reference internal" href="../api/path/path.html#path-api-guide"><span class="std std-ref">Path API</span></a> (part of the <a class="reference external" href="https://github.com/CiscoDevNet/ydk-py/tree/master/core">YDK core</a>) is a generic API which can be used to create and access YANG data nodes without having to use the model bundle APIs (for example, <a class="reference external" href="https://github.com/CiscoDevNet/ydk-py/tree/master/openconfig">openconfig</a>). The <code class="docutils literal"><span class="pre">ydk</span></code> python package is sufficient to use the Path API. Apps can be written using xpath-like path expressions as illustrated below.</p>
-<div class="section" id="how-do-i-create-a-basic-configuration">
-<h2><a class="toc-backref" href="#toc-entry-2">How do I create a basic configuration?</a><a class="headerlink" href="#how-do-i-create-a-basic-configuration" title="Permalink to this headline">¶</a></h2>
-<p>An example for using Path API to create a <code class="docutils literal"><span class="pre">bgp</span></code> configuration using the <code class="docutils literal"><span class="pre">openconfig-bgp</span></code> model in conjunction with the standard <a class="reference external" href="https://github.com/YangModels/yang/blob/4b12d5017eb94a0760746d72c6fd93cb02943d45/standard/ietf/RFC/ietf-netconf%402011-06-01.yang#L416">edit-config RPC</a> is shown below:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span>
-<span class="normal">29</span>
-<span class="normal">30</span>
-<span class="normal">31</span>
-<span class="normal">32</span>
-<span class="normal">33</span>
-<span class="normal">34</span>
-<span class="normal">35</span>
-<span class="normal">36</span>
-<span class="normal">37</span>
-<span class="normal">38</span>
-<span class="normal">39</span>
-<span class="normal">40</span>
-<span class="normal">41</span>
-<span class="normal">42</span>
-<span class="normal">43</span>
-<span class="normal">44</span>
-<span class="normal">45</span>
-<span class="normal">46</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Codec</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EncodingFormat</span>
-
-<span class="c1"># Create a NetconfSession instance to connect to the device</span>
-<span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-
-<span class="c1"># Get the root schema node</span>
-<span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>
-
-<span class="c1"># Create the bgp configuration</span>
-<span class="n">bgp</span> <span class="o">=</span> <span class="n">root_schema</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;openconfig-bgp:bgp&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-<span class="n">bgp</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;global/config/as&quot;</span><span class="p">,</span> <span class="s2">&quot;65172&quot;</span><span class="p">)</span>
-
-<span class="c1"># Create a list instance of afi-safi. Note how the key (afi-safi-name)  of the list is specified</span>
-<span class="n">l3vpn_ipv4_unicast</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;global/afi-safis/afi-safi[afi-safi-name=&#39;openconfig-bgp-types:L3VPN_IPV4_UNICAST&#39;]&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-<span class="n">l3vpn_ipv4_unicast</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/afi-safi-name&quot;</span><span class="p">,</span> <span class="s2">&quot;openconfig-bgp-types:L3VPN_IPV4_UNICAST&quot;</span><span class="p">)</span>
-<span class="n">l3vpn_ipv4_unicast</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/enabled&quot;</span><span class="p">,</span><span class="s2">&quot;true&quot;</span><span class="p">)</span>
-
-<span class="c1"># Create a list instance of neighbor. Note how the key (neighbor-address)  of the list is specified</span>
-<span class="n">neighbor</span> <span class="o">=</span> <span class="n">bgp</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;neighbors/neighbor[neighbor-address=&#39;172.16.255.2&#39;]&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/neighbor-address&quot;</span><span class="p">,</span> <span class="s2">&quot;172.16.255.2&quot;</span><span class="p">)</span>
-<span class="n">neighbor</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/peer-as&quot;</span><span class="p">,</span><span class="s2">&quot;65172&quot;</span><span class="p">)</span>
-<span class="n">neighbor_af</span> <span class="o">=</span> <span class="n">neighbor</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;afi-safis/afi-safi[afi-safi-name=&#39;openconfig-bgp-types:L3VPN_IPV4_UNICAST&#39;]&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-<span class="n">neighbor_af</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/afi-safi-name&quot;</span> <span class="p">,</span> <span class="s2">&quot;openconfig-bgp-types:L3VPN_IPV4_UNICAST&quot;</span><span class="p">)</span>
-<span class="n">neighbor_af</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;config/enabled&quot;</span><span class="p">,</span><span class="s2">&quot;true&quot;</span><span class="p">)</span>
-
-<span class="n">codec_service</span> <span class="o">=</span> <span class="n">Codec</span><span class="p">()</span>
-
-<span class="c1"># Encode the bgp object to JSON string to examine the data</span>
-<span class="n">json</span> <span class="o">=</span> <span class="n">codec_service</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">bgp</span><span class="p">,</span> <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">JSON</span><span class="p">,</span> <span class="kc">True</span><span class="p">)</span>
-<span class="nb">print</span><span class="p">(</span><span class="n">json</span><span class="p">)</span>
-
-<span class="c1"># Encode the bgp object to XML string</span>
-<span class="n">xml</span> <span class="o">=</span> <span class="n">codec_service</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">bgp</span><span class="p">,</span> <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">XML</span><span class="p">,</span> <span class="kc">True</span><span class="p">)</span>
-
-<span class="c1"># Create the &#39;ietf-netconf:edit-config&#39; RPC object</span>
-<span class="n">edit_rpc</span> <span class="o">=</span> <span class="n">root_schema</span><span class="o">.</span><span class="n">create_rpc</span><span class="p">(</span><span class="s1">&#39;ietf-netconf:edit-config&#39;</span><span class="p">)</span>
-
-<span class="c1"># Set the target to the candidate datastore</span>
-<span class="n">edit_rpc</span><span class="o">.</span><span class="n">get_input_node</span><span class="p">()</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;target/candidate&#39;</span><span class="p">)</span>
-<span class="c1"># Set the xml string to the &#39;config&#39; field</span>
-<span class="n">edit_rpc</span><span class="o">.</span><span class="n">get_input_node</span><span class="p">()</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;config&#39;</span><span class="p">,</span> <span class="n">xml</span><span class="p">)</span>
-
-<span class="c1"># Invoke the RPC</span>
-<span class="n">edit_rpc</span><span class="p">(</span><span class="n">session</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="how-do-i-work-with-different-rpcs">
-<h2><a class="toc-backref" href="#toc-entry-3">How do I work with different RPCs?</a><a class="headerlink" href="#how-do-i-work-with-different-rpcs" title="Permalink to this headline">¶</a></h2>
-<p>To invoke the <a class="reference external" href="https://github.com/YangModels/yang/blob/4b12d5017eb94a0760746d72c6fd93cb02943d45/standard/ietf/RFC/ietf-netconf-monitoring%402010-10-04.yang#L512">get-schema RPC</a> to download the <code class="docutils literal"><span class="pre">Cisco-IOS-XR-aaa-lib-cfg.yang</span></code> yang model from a netconf server using the path API, the below approach can be used.</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Codec</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EncodingFormat</span>
-
-<span class="c1"># Create a NetconfSession instance to connect to the device</span>
-<span class="n">netconf_session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="n">address</span><span class="o">=</span><span class="s1">&#39;10.0.0.1&#39;</span> <span class="p">,</span> <span class="n">username</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="n">password</span><span class="o">=</span><span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-
-<span class="n">c</span> <span class="o">=</span> <span class="n">Codec</span><span class="p">()</span>
-
-<span class="c1"># Get the root schema node</span>
-<span class="n">root</span> <span class="o">=</span> <span class="n">netconf_session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>
-
-<span class="c1"># Create the &#39;ietf-netconf-monitoring:get-schema&#39; RPC object</span>
-<span class="n">get_schema</span> <span class="o">=</span> <span class="n">root</span><span class="o">.</span><span class="n">create_rpc</span><span class="p">(</span><span class="s1">&#39;ietf-netconf-monitoring:get-schema&#39;</span><span class="p">)</span>
-
-<span class="c1"># Set the &#39;identifier&#39; to &#39;Cisco-IOS-XR-aaa-lib-cfg&#39;</span>
-<span class="n">get_schema</span><span class="o">.</span><span class="n">get_input_node</span><span class="p">()</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s1">&#39;identifier&#39;</span><span class="p">,</span><span class="s1">&#39;Cisco-IOS-XR-aaa-lib-cfg&#39;</span><span class="p">)</span>
-
-<span class="c1"># Invoke the RPC</span>
-<span class="n">output_data</span> <span class="o">=</span> <span class="n">get_schema</span><span class="p">(</span><span class="n">netconf_session</span><span class="p">)</span>
-
-<span class="c1"># Encode the RPC reply to XML</span>
-<span class="n">output_xml</span> <span class="o">=</span>  <span class="n">c</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="n">output_data</span><span class="p">,</span> <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">XML</span><span class="p">,</span> <span class="kc">True</span><span class="p">)</span>
-
-<span class="c1"># Print the XML</span>
-<span class="nb">print</span><span class="p">(</span><span class="n">output_xml</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="how-do-i-work-with-yang-1-1-actions">
-<h2><a class="toc-backref" href="#toc-entry-4">How do I work with YANG 1.1 actions?</a><a class="headerlink" href="#how-do-i-work-with-yang-1-1-actions" title="Permalink to this headline">¶</a></h2>
-<p>Path API can be used to work with a <code class="docutils literal"><span class="pre">action</span></code> as defined in the YANG 1.1 standard in <a class="reference external" href="https://tools.ietf.org/html/rfc7950">RFC 7950</a>.</p>
-<p>Consider the below snippet from an example <code class="docutils literal"><span class="pre">action-config.yang</span></code> model compliant with the YANG 1.1 standard.</p>
-<div class="highlight-cpp"><div class="highlight"><pre><span></span><span class="n">container</span><span class="w"> </span><span class="n">data</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">  </span><span class="n">action</span><span class="w"> </span><span class="n">action</span><span class="o">-</span><span class="n">node</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">    </span><span class="n">input</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">        </span><span class="n">leaf</span><span class="w"> </span><span class="n">ip</span><span class="o">-</span><span class="n">test</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">            </span><span class="n">type</span><span class="w"> </span><span class="n">string</span><span class="p">;</span><span class="w"></span>
-<span class="w">        </span><span class="p">}</span><span class="w"></span>
-<span class="w">     </span><span class="p">}</span><span class="w"></span>
-<span class="w">     </span><span class="n">output</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">        </span><span class="n">leaf</span><span class="w"> </span><span class="n">op</span><span class="o">-</span><span class="n">test</span><span class="w"> </span><span class="p">{</span><span class="w"></span>
-<span class="w">            </span><span class="n">type</span><span class="w"> </span><span class="n">string</span><span class="p">;</span><span class="w"></span>
-<span class="w">        </span><span class="p">}</span><span class="w"></span>
-<span class="w">     </span><span class="p">}</span><span class="w"></span>
-<span class="w">  </span><span class="p">}</span><span class="w"></span>
-<span class="p">}</span><span class="w"></span>
-</pre></div>
-</div>
-<p>The below script can be used to work with the above model</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">NetconfSession</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Codec</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EncodingFormat</span>
-
-<span class="c1"># Create a NetconfSession instance to connect to the device which supports the YANG 1.1 action-config model</span>
-<span class="n">session</span> <span class="o">=</span> <span class="n">NetconfSession</span><span class="p">(</span><span class="s1">&#39;10.0.0.1&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">,</span> <span class="s1">&#39;admin&#39;</span><span class="p">)</span>
-
-<span class="c1"># Get the root schema node</span>
-<span class="n">root_schema</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="n">get_root_schema</span><span class="p">()</span>
-
-<span class="c1"># Create and populate the action data</span>
-<span class="n">data</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">root_schema</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;action-config:data&quot;</span><span class="p">,</span> <span class="s2">&quot;&quot;</span><span class="p">)</span>
-<span class="n">action</span> <span class="o">=</span> <span class="n">action</span><span class="o">.</span><span class="n">create_action</span><span class="p">(</span><span class="s2">&quot;action-node&quot;</span><span class="p">)</span>
-<span class="n">action</span><span class="o">.</span><span class="n">create_datanode</span><span class="p">(</span><span class="s2">&quot;ip-test&quot;</span><span class="p">,</span> <span class="s2">&quot;xyz&quot;</span><span class="p">)</span>
-
-<span class="c1"># Invoke the data object containing the action on the session</span>
-<span class="n">data</span><span class="p">(</span><span class="n">session</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-<div class="section" id="what-is-the-path-syntax">
-<h2><a class="toc-backref" href="#toc-entry-5">What is the Path syntax?</a><a class="headerlink" href="#what-is-the-path-syntax" title="Permalink to this headline">¶</a></h2>
-<p>Full XPath notation is supported for find operations on <code class="xref py py-class docutils literal"><span class="pre">DataNode</span></code>(s). This XPath conforms to the YANG specification (<a class="reference external" href="https://tools.ietf.org/html/rfc6020#section-6.4">RFC 6020 section 6.4</a>). Some useful examples:</p>
-<ul class="simple">
-<li>Get <code class="docutils literal"><span class="pre">list</span></code> instance with <code class="docutils literal"><span class="pre">key1</span></code> of value <code class="docutils literal"><span class="pre">1</span></code> and <code class="docutils literal"><span class="pre">key2</span></code> of value <code class="docutils literal"><span class="pre">2</span></code> (this can return more <code class="docutils literal"><span class="pre">list</span></code> instances if there are more keys than <code class="docutils literal"><span class="pre">key1</span></code> and <code class="docutils literal"><span class="pre">key2</span></code>)</li>
-</ul>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>/module-name:container/list<span class="o">[</span><span class="nv">key1</span><span class="o">=</span><span class="s1">&#39;1&#39;</span><span class="o">][</span><span class="nv">key2</span><span class="o">=</span><span class="s1">&#39;2&#39;</span><span class="o">]</span>
-</pre></div>
-</div>
-<ul class="simple">
-<li>Get <code class="docutils literal"><span class="pre">leaf-list</span></code> instance with the value <code class="docutils literal"><span class="pre">val</span></code></li>
-</ul>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>/module-name:container/leaf-list<span class="o">[</span>.<span class="o">=</span><span class="s1">&#39;val&#39;</span><span class="o">]</span>
-</pre></div>
-</div>
-<ul class="simple">
-<li>Get <code class="docutils literal"><span class="pre">aug-leaf</span></code>, which was added to <code class="docutils literal"><span class="pre">module-name</span></code> from an augment module <code class="docutils literal"><span class="pre">augment-module</span></code></li>
-</ul>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>/module-name:container/container2/augment-module:aug-cont/aug-leaf
-</pre></div>
-</div>
-<p>A very small subset of this full XPath is recognized by <code class="xref py py-meth docutils literal"><span class="pre">DataNode::create</span></code>. Basically, only a relative or absolute path can be specified to identify a new data node. However, lists must be identified by all their keys and created with all of them, so for those cases predicates are allowed. Predicates must be ordered the way the keys are ordered and all the keys must be specified. Every predicate includes a single key with its value. Optionally, leaves and leaf-lists can have predicates specifying their value in the path itself. All these paths are valid XPath expressions. Example: (Relative to Root Data or <a class="reference internal" href="../api/path/root_schema_node.html#ydk.path.RootSchemaNode" title="ydk.path.RootSchemaNode"><code class="xref py py-class docutils literal"><span class="pre">ydk.path.RootSchemaNode</span></code></a>)</p>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>ietf-yang-library:modules-state/module<span class="o">[</span><span class="nv">name</span><span class="o">=</span><span class="s1">&#39;ietf-yang-library&#39;</span><span class="o">][</span><span class="nv">revision</span><span class="o">=</span><span class="s1">&#39;&#39;</span><span class="o">]</span>/conformance<span class="o">[</span>.<span class="o">=</span><span class="s1">&#39;implement&#39;</span><span class="o">]</span>
-</pre></div>
-</div>
-<p>Almost the same XPath is accepted by <code class="xref py py-class docutils literal"><span class="pre">SchemaNode</span></code> methods. The difference is that it is not used on data, but schema, which means there are no key values and only one node matches one path. In effect, lists do not have to have any predicates. If they do, they do not need to have all the keys specified and if values are included, they are ignored. Nevertheless, any such expression is still a valid XPath, but can return more nodes if executed on a data tree. Examples (all returning the same node):</p>
-<div class="highlight-bash"><div class="highlight"><pre><span></span>ietf-yang-library:modules-state/module/submodules
-ietf-yang-library:modules-state/module<span class="o">[</span>name<span class="o">]</span>/submodules
-ietf-yang-library:modules-state/module<span class="o">[</span>name<span class="o">][</span>revision<span class="o">]</span>/submodules
-ietf-yang-library:modules-state/module<span class="o">[</span><span class="nv">name</span><span class="o">=</span><span class="s1">&#39;ietf-yang-library&#39;</span><span class="o">][</span>revision<span class="o">]</span>/submodules
-</pre></div>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">In all cases the node&#8217;s prefix is specified as the name of the appropriate YANG schema. Any node can be prefixed by the module name. However, if the prefix is omitted, the module name is inherited from the previous (parent) node. It means, that the first node in the path is always supposed to have a prefix.</p>
-</div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="opendaylight.html" class="btn btn-neutral float-right" title="How do I use OpenDaylight with YDK?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="deviation.html" class="btn btn-neutral" title="What are deviations?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/presence_class.html b/docs/guides/presence_class.html
deleted file mode 100644
index 696d4f74e..000000000
--- a/docs/guides/presence_class.html
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>What are presence classes? &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="What are deviations?" href="deviation.html"/>
-        <link rel="prev" title="How to Disable Validation" href="validation.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>What are presence classes?</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="what-are-presence-classes">
-<span id="presence-class"></span><h1>What are presence classes?<a class="headerlink" href="#what-are-presence-classes" title="Permalink to this headline">¶</a></h1>
-<p>According to <a class="reference external" href="https://tools.ietf.org/html/rfc6020#section-7.5.1">RFC 6020</a>, YANG supports two styles of containers. One is for organizing hierarchy. Another type (called &#8216;presence container&#8217;) is for representing configuration data. For instance the existence of presence container <code class="docutils literal"><span class="pre">ssh</span></code> indicates the capability to log in to the device using ssh. Let us consider a presence node <code class="docutils literal"><span class="pre">match-community-set</span></code> in <a class="reference external" href="https://github.com/YangModels/yang/blob/96883adbf612605f02271523d7eaa731ded46b61/vendor/cisco/xr/621/openconfig-bgp-policy.yang#L126">openconfig-bgp-policy.yang</a>. This node is generated as a YDK class shown below:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span>
-<span class="normal">28</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="k">class</span> <span class="nc">BgpConditions</span><span class="p">(</span><span class="n">Entity</span><span class="p">):</span>
-    <span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">    ...</span>
-
-<span class="sd">    .. attribute:: match_community_set</span>
-
-<span class="sd">    Match a referenced community\-set according to the logic defined in the match\-set\-options leaf</span>
-<span class="sd">    **type**\:   :py:class:`MatchCommunitySet &lt;ydk.models.openconfig.openconfig_routing_policy.RoutingPolicy.PolicyDefinitions.PolicyDefinition.Statements.Statement.Conditions.BgpConditions.MatchCommunitySet&gt;`</span>
-
-<span class="sd">    **presence node**\: True</span>
-
-<span class="sd">    ...</span>
-
-<span class="sd">    &quot;&quot;&quot;</span>
-
-    <span class="o">...</span>
-
-    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="nb">super</span><span class="p">(</span><span class="n">RoutingPolicy</span><span class="o">.</span><span class="n">PolicyDefinitions</span><span class="o">.</span><span class="n">PolicyDefinition</span><span class="o">.</span><span class="n">Statements</span><span class="o">.</span><span class="n">Statement</span><span class="o">.</span><span class="n">Conditions</span><span class="o">.</span><span class="n">BgpConditions</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">()</span>
-
-        <span class="bp">self</span><span class="o">.</span><span class="n">yang_name</span> <span class="o">=</span> <span class="s2">&quot;bgp-conditions&quot;</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">yang_parent_name</span> <span class="o">=</span> <span class="s2">&quot;conditions&quot;</span>
-
-        <span class="o">...</span>
-
-        <span class="bp">self</span><span class="o">.</span><span class="n">match_community_set</span> <span class="o">=</span> <span class="kc">None</span>
-
-        <span class="o">...</span>
-</pre></div>
-</td></tr></table></div>
-<p>Since the existence of container <code class="docutils literal"><span class="pre">match_community_set</span></code> itself represents configuration data, YDK does not instantiate an instance of class <code class="xref py py-class docutils literal"><span class="pre">MatchCommunitySet</span></code> and assign it to the <code class="docutils literal"><span class="pre">match_community_set</span></code> leaf. The user needs to manually instantiate and assign this object.</p>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="deviation.html" class="btn btn-neutral float-right" title="What are deviations?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="validation.html" class="btn btn-neutral" title="How to Disable Validation" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/restconf_https.html b/docs/guides/restconf_https.html
deleted file mode 100644
index 6ae7dc6e8..000000000
--- a/docs/guides/restconf_https.html
+++ /dev/null
@@ -1,321 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Using Restconf with HTTPS &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="Backward compatibility notes" href="backward_compatibility.html"/>
-        <link rel="prev" title="How do I use OpenDaylight with YDK?" href="opendaylight.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Using Restconf with HTTPS</a><ul>
-<li class="toctree-l3"><a class="reference internal" href="#ca-certificate-installation">CA Certificate Installation</a></li>
-<li class="toctree-l3"><a class="reference internal" href="#code-snippet">Code Snippet</a></li>
-</ul>
-</li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>Using Restconf with HTTPS</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="using-restconf-with-https">
-<h1>Using Restconf with HTTPS<a class="headerlink" href="#using-restconf-with-https" title="Permalink to this headline">¶</a></h1>
-<p>By default the RestconfServiceProvider initializes to support HTTP non-secure protocol.
-But YDK also provides partial support for HTTPS protocol. Here &#8216;partial&#8217; means that YDK is capable communicate over secure protocol,
-provides data encryption, checks Restconf server CA certificate, but the peer and host name verifications are permanently disabled.
-This limitation should be addressed in future YDK releases.</p>
-<div class="section" id="ca-certificate-installation">
-<h2>CA Certificate Installation<a class="headerlink" href="#ca-certificate-installation" title="Permalink to this headline">¶</a></h2>
-<p>In order to enable HTTPS protocol, the user must obtain and install the Restconf server CA certificate on application server.
-On Ubuntu the installation procedure is as followed:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span><span class="nb">cd</span> /usr/local/share/ca-certificates/
-sudo mkdir ydk
-cp ~/myrestconf.crt ydk/
-<span class="c1"># Make sure the permissions are OK (755 for the folder, 644 for the file)</span>
-sudo update-ca-certificates
-<span class="c1"># In the output of the last command check that the certificate was added</span>
-</pre></div>
-</div>
-<p>The installation procedure on CentOS-7:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span></span>sudo cp ~/myrestconf.crt /etc/pki/ca-trust/source/anchors/
-sudo update-ca-trust
-</pre></div>
-</div>
-<p>Getting MacOS to trust self-signed SSL Certificates:</p>
-<blockquote>
-<div><ol class="arabic simple">
-<li>Locate your CA certificate file.</li>
-<li>Open up Keychain Access.</li>
-<li>Drag your certificate into Keychain Access.</li>
-<li>Go into the Certificates section and locate the certificate you just added.</li>
-<li>Double click on it, enter the trust section and under “When using this certificate” select “Always Trust”.</li>
-</ol>
-</div></blockquote>
-</div>
-<div class="section" id="code-snippet">
-<h2>Code Snippet<a class="headerlink" href="#code-snippet" title="Permalink to this headline">¶</a></h2>
-<p>In the application the user must explicitly specify HTTPS protocol in the host address.
-The following example shows, how the RestconfServiceProvider is used to read names of all interfaces from secure Restconf server:</p>
-<div class="highlight-python"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 1</span>
-<span class="normal"> 2</span>
-<span class="normal"> 3</span>
-<span class="normal"> 4</span>
-<span class="normal"> 5</span>
-<span class="normal"> 6</span>
-<span class="normal"> 7</span>
-<span class="normal"> 8</span>
-<span class="normal"> 9</span>
-<span class="normal">10</span>
-<span class="normal">11</span>
-<span class="normal">12</span>
-<span class="normal">13</span>
-<span class="normal">14</span>
-<span class="normal">15</span>
-<span class="normal">16</span>
-<span class="normal">17</span>
-<span class="normal">18</span>
-<span class="normal">19</span>
-<span class="normal">20</span>
-<span class="normal">21</span>
-<span class="normal">22</span>
-<span class="normal">23</span>
-<span class="normal">24</span>
-<span class="normal">25</span>
-<span class="normal">26</span>
-<span class="normal">27</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="ch">#!/usr/bin/env python</span>
-<span class="c1">#</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span> <span class="kn">import</span> <span class="n">CRUDService</span>
-<span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">RestconfServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.types</span> <span class="kn">import</span> <span class="n">EncodingFormat</span>
-<span class="kn">from</span> <span class="nn">ydk.path</span> <span class="kn">import</span> <span class="n">Repository</span>
-
-<span class="kn">from</span> <span class="nn">ydk.models.openconfig</span> <span class="kn">import</span> <span class="n">openconfig_interfaces</span>
-
-<span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s1">&#39;__main__&#39;</span><span class="p">:</span>
-
-   <span class="n">repo</span> <span class="o">=</span> <span class="n">Repository</span><span class="p">(</span><span class="s1">&#39;/Users/ygorelik/.ydk/sbx-iosxr-mgmt.cisco.com&#39;</span><span class="p">)</span>
-   <span class="n">provider</span> <span class="o">=</span> <span class="n">RestconfServiceProvider</span><span class="p">(</span>
-       <span class="n">repo</span><span class="p">,</span>
-       <span class="s1">&#39;https://ios-xe-mgmt.cisco.com&#39;</span><span class="p">,</span>   <span class="c1"># Add &#39;https://&#39; prefix to the host name or address</span>
-       <span class="s1">&#39;developer&#39;</span><span class="p">,</span>
-       <span class="s1">&#39;C1sco12345&#39;</span><span class="p">,</span>
-       <span class="mi">9443</span><span class="p">,</span>    <span class="c1"># HTTPS port</span>
-       <span class="n">EncodingFormat</span><span class="o">.</span><span class="n">JSON</span><span class="p">)</span>
-
-   <span class="n">interfaces</span> <span class="o">=</span> <span class="n">openconfig_interfaces</span><span class="o">.</span><span class="n">Interfaces</span><span class="p">()</span>
-
-   <span class="n">crud</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-   <span class="n">all_interfaces</span> <span class="o">=</span> <span class="n">crud</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">interfaces</span><span class="p">)</span>
-
-   <span class="k">for</span> <span class="n">intf</span> <span class="ow">in</span> <span class="n">all_interfaces</span><span class="o">.</span><span class="n">interface</span><span class="p">:</span>
-       <span class="nb">print</span><span class="p">(</span><span class="n">intf</span><span class="o">.</span><span class="n">name</span><span class="p">)</span>
-</pre></div>
-</td></tr></table></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="backward_compatibility.html" class="btn btn-neutral float-right" title="Backward compatibility notes" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="opendaylight.html" class="btn btn-neutral" title="How do I use OpenDaylight with YDK?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/guides/validation.html b/docs/guides/validation.html
deleted file mode 100644
index 8c0734943..000000000
--- a/docs/guides/validation.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>How to Disable Validation &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="../_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="../_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="../index.html"/>
-        <link rel="up" title="Developer Guide" href="../developer_guide.html"/>
-        <link rel="next" title="What are presence classes?" href="presence_class.html"/>
-        <link rel="prev" title="How do I execute RPCs?" href="executor_guide.html"/> 
-
-  
-  <script src="../_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="../index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="../_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul class="current">
-<li class="toctree-l1"><a class="reference internal" href="../about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a></li>
-<li class="toctree-l1 current"><a class="reference internal" href="../developer_guide.html">Developer Guide</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="../api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="../faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="../index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Docs</a> &raquo;</li>
-      
-          <li><a href="../developer_guide.html">Developer Guide</a> &raquo;</li>
-      
-    <li>How to Disable Validation</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="how-to-disable-validation">
-<span id="validation"></span><h1>How to Disable Validation<a class="headerlink" href="#how-to-disable-validation" title="Permalink to this headline">¶</a></h1>
-<p>By default all the data sent to Yang enabled server are validated against Yang model constraints like data type, number range and string patterns.
-This is one of the major features of YDK. However there is sometime a need to disable data validation in order to see how the server reacts to invalid data.
-For this sole purpose the YDK has possibility to disable data validation. This feature currently implemented only for <a class="reference internal" href="../api/providers/netconf_provider.html#ydk.providers.NetconfServiceProvider" title="ydk.providers.NetconfServiceProvider"><code class="xref py py-class docutils literal"><span class="pre">NetconfServiceProvider</span></code></a>
-through <a class="reference internal" href="../api/services/crud_service.html#ydk.services.CRUDService" title="ydk.services.CRUDService"><code class="xref py py-class docutils literal"><span class="pre">CrudService</span></code></a> and <a class="reference internal" href="../api/services/netconf_service.html#ydk.services.NetconfService" title="ydk.services.NetconfService"><code class="xref py py-class docutils literal"><span class="pre">NetconfService</span></code></a>.</p>
-<p>In order to disable validation of object/entity the <a class="reference internal" href="../api/types.html#ydk.types.Entity" title="ydk.types.Entity"><code class="xref py py-class docutils literal"><span class="pre">Entity</span></code></a> class member <cite>ignore_validation</cite> must be set to <code class="docutils literal"><span class="pre">True</span></code>.
-Please note that this setting disables validation on the entire entity including leafs, and children entities.
-If the flag is set to non-top-level entity, the validation will be also disabled on all parent entities up to the top-level.
-Actually, it is important to note, when validation is disabled on non-top-level entity it must be a part of complete hierarchy of a top-level entity.</p>
-<p>Here is an example of a negative test, which demonstrates how YDK validation could be disabled.</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">absolute_import</span>
-<span class="kn">from</span> <span class="nn">__future__</span> <span class="kn">import</span> <span class="n">print_function</span>
-
-<span class="kn">from</span> <span class="nn">ydk.errors</span>    <span class="kn">import</span> <span class="n">YModelError</span><span class="p">,</span> <span class="n">YServiceProviderError</span>
-<span class="kn">from</span> <span class="nn">ydk.providers</span> <span class="kn">import</span> <span class="n">NetconfServiceProvider</span>
-<span class="kn">from</span> <span class="nn">ydk.services</span>  <span class="kn">import</span> <span class="n">CRUDService</span>
-
-<span class="kn">from</span> <span class="nn">ydk.models.ydktest.ydktest_sanity</span> <span class="kn">import</span> <span class="n">Runner</span>
-
-<span class="k">def</span> <span class="nf">run_test</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">uint8_value</span><span class="p">,</span> <span class="n">disable_validation</span><span class="p">):</span>
-
-    <span class="n">crud</span> <span class="o">=</span> <span class="n">CRUDService</span><span class="p">()</span>
-
-    <span class="n">vstr</span> <span class="o">=</span> <span class="s1">&#39;enabled&#39;</span>
-    <span class="k">if</span> <span class="n">disable_validation</span><span class="p">:</span>
-        <span class="n">vstr</span> <span class="o">=</span> <span class="s1">&#39;disabled&#39;</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">Setting uint8 number to </span><span class="si">%s</span><span class="s2"> when validation is </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">uint8_value</span><span class="p">,</span> <span class="n">vstr</span><span class="p">))</span>
-
-    <span class="n">runner</span> <span class="o">=</span> <span class="n">Runner</span><span class="p">()</span>
-    <span class="n">runner</span><span class="o">.</span><span class="n">ignore_validation</span> <span class="o">=</span> <span class="n">disable_validation</span>   <span class="c1"># Set &#39;ignore_validation&#39; flag</span>
-    <span class="n">runner</span><span class="o">.</span><span class="n">ytypes</span><span class="o">.</span><span class="n">built_in_t</span><span class="o">.</span><span class="n">number8</span> <span class="o">=</span> <span class="n">uint8_value</span>
-    <span class="k">try</span><span class="p">:</span>
-        <span class="n">crud</span><span class="o">.</span><span class="n">create</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="n">runner</span><span class="p">)</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;OK&quot;</span><span class="p">)</span>
-    <span class="k">except</span> <span class="n">YServiceProviderError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;NETCONF FAILED with Error:&quot;</span><span class="p">)</span>
-        <span class="nb">print</span><span class="p">(</span><span class="n">err</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;&lt;/error-message&gt;&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;&quot;en&quot;&gt;&#39;</span><span class="p">)[</span><span class="mi">1</span><span class="p">])</span>
-    <span class="k">except</span> <span class="n">YModelError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;YDK VALIDATION FAILED with YModelError:&quot;</span><span class="p">)</span>
-        <span class="nb">print</span><span class="p">(</span><span class="n">err</span><span class="o">.</span><span class="n">message</span><span class="p">)</span>
-
-<span class="k">if</span> <span class="vm">__name__</span> <span class="o">==</span> <span class="s1">&#39;__main__&#39;</span><span class="p">:</span>
-
-    <span class="n">provider</span> <span class="o">=</span> <span class="n">NetconfServiceProvider</span><span class="p">(</span> <span class="s2">&quot;127.0.0.1&quot;</span><span class="p">,</span> <span class="s2">&quot;admin&quot;</span><span class="p">,</span> <span class="s2">&quot;admin&quot;</span><span class="p">,</span> <span class="mi">12022</span><span class="p">)</span>
-
-    <span class="n">run_test</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="mi">88</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
-
-    <span class="n">run_test</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="mi">888</span><span class="p">,</span> <span class="kc">False</span><span class="p">)</span>
-
-    <span class="n">run_test</span><span class="p">(</span><span class="n">provider</span><span class="p">,</span> <span class="mi">888</span><span class="p">,</span> <span class="kc">True</span><span class="p">)</span>   <span class="c1"># Disable YDK validation</span>
-</pre></div>
-</div>
-<p>The script produces the following results:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Setting</span> <span class="n">uint8</span> <span class="n">number</span> <span class="n">to</span> <span class="mi">88</span> <span class="n">when</span> <span class="n">validation</span> <span class="ow">is</span> <span class="n">enabled</span>
-<span class="n">OK</span>
-
-<span class="n">Setting</span> <span class="n">uint8</span> <span class="n">number</span> <span class="n">to</span> <span class="mi">888</span> <span class="n">when</span> <span class="n">validation</span> <span class="ow">is</span> <span class="n">enabled</span>
-<span class="n">YDK</span> <span class="n">VALIDATION</span> <span class="n">FAILED</span> <span class="k">with</span> <span class="n">YModelError</span><span class="p">:</span>
- <span class="n">Invalid</span> <span class="n">value</span> <span class="s2">&quot;888&quot;</span> <span class="ow">in</span> <span class="s2">&quot;number8&quot;</span> <span class="n">element</span><span class="o">.</span> <span class="n">Path</span><span class="p">:</span> <span class="o">/</span><span class="n">ydktest</span><span class="o">-</span><span class="n">sanity</span><span class="p">:</span><span class="n">runner</span><span class="o">/</span><span class="n">ytypes</span><span class="o">/</span><span class="n">built</span><span class="o">-</span><span class="ow">in</span><span class="o">-</span><span class="n">t</span><span class="o">/</span><span class="n">number8</span>
-
-<span class="n">Setting</span> <span class="n">uint8</span> <span class="n">number</span> <span class="n">to</span> <span class="mi">888</span> <span class="n">when</span> <span class="n">validation</span> <span class="ow">is</span> <span class="n">disabled</span>
-<span class="n">NETCONF</span> <span class="n">FAILED</span> <span class="k">with</span> <span class="n">Error</span><span class="p">:</span>
-<span class="s2">&quot;888&quot;</span> <span class="ow">is</span> <span class="ow">not</span> <span class="n">a</span> <span class="n">valid</span> <span class="n">value</span><span class="o">.</span>
-</pre></div>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="presence_class.html" class="btn btn-neutral float-right" title="What are presence classes?" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-        <a href="executor_guide.html" class="btn btn-neutral" title="How do I execute RPCs?" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'../',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="../_static/jquery.js"></script>
-      <script type="text/javascript" src="../_static/underscore.js"></script>
-      <script type="text/javascript" src="../_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="../_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/index.html b/docs/index.html
deleted file mode 100644
index 8fc68a981..000000000
--- a/docs/index.html
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Contents: &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="#"/>
-        <link rel="next" title="About YDK" href="about_ydk.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="#" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul>
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="#">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="#">Docs</a> &raquo;</li>
-      
-    <li>Contents:</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <p>Welcome to YDK&#8217;s Python documentation!</p>
-<div class="section" id="contents">
-<h1>Contents:<a class="headerlink" href="#contents" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="about_ydk.html#license">License</a></li>
-<li class="toctree-l2"><a class="reference internal" href="about_ydk.html#version">Version</a></li>
-<li class="toctree-l2"><a class="reference internal" href="about_ydk.html#release-changes">Release Changes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#overview">Overview</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#backward-compatibility">Backward Compatibility</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#docker">Docker</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#system-requirements">System Requirements</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#core-installation">Core Installation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#bundle-installation">Bundle Installation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#generate-ydk-components">Generate YDK components</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#documentation-and-support">Documentation and Support</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#release-notes">Release Notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="guides/introduction.html">Introduction</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/crud_guide.html">How do I create, update, read and delete?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/codec_guide.html">How do I work with instances of YANG data?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/executor_guide.html">How do I execute RPCs?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/validation.html">How to Disable Validation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/presence_class.html">What are presence classes?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/deviation.html">What are deviations?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/path.html">How do I use the Path API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/opendaylight.html">How do I use OpenDaylight with YDK?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/restconf_https.html">Using Restconf with HTTPS</a></li>
-<li class="toctree-l2"><a class="reference internal" href="guides/backward_compatibility.html">Backward compatibility notes</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="api/class_hierarchy.html">YDK API</a></li>
-<li class="toctree-l2"><a class="reference internal" href="api/path/path.html">YDK Path API</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#how-do-i-report-a-bug-i-found">How do I report a bug I found?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#i-am-interested-in-contributing-how-do-i-do-this">I am interested in contributing. How do I do this?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#can-you-help-me-change-something-in-a-model-bundle-api">Can you help me change something in a model bundle API?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="faq.html#what-version-of-ydk-core-can-be-used-with-ydk-bundles">What version of YDK core can be used with YDK bundles?</a></li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      
-        <a href="about_ydk.html" class="btn btn-neutral float-right" title="About YDK" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      
-      
-    </div>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/objects.inv b/docs/objects.inv
deleted file mode 100644
index ceeb8bd71..000000000
Binary files a/docs/objects.inv and /dev/null differ
diff --git a/docs/search.html b/docs/search.html
deleted file mode 100644
index 77be28ae9..000000000
--- a/docs/search.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>Search &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="#"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="#" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul>
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
-
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>Search</li>
-      <li class="wy-breadcrumbs-aside">
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      Please activate JavaScript to enable the search
-      functionality.
-    </p>
-  </div>
-  </noscript>
-
-  
-  <div id="search-results">
-  
-  </div>
-
-           </div>
-          </div>
-          <footer>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-      <script type="text/javascript" src="_static/searchtools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-  
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("searchindex.js"); });
-  </script>
-  
-  <script type="text/javascript" id="searchindexloader"></script>
-   
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/searchindex.js b/docs/searchindex.js
deleted file mode 100644
index b09fa61b4..000000000
--- a/docs/searchindex.js
+++ /dev/null
@@ -1 +0,0 @@
-Search.setIndex({docnames:["about_ydk","api/class_hierarchy","api/errors","api/filters","api/path/annotation","api/path/capability","api/path/codec","api/path/data_node","api/path/gnmi_session","api/path/netconf_session","api/path/path","api/path/repository","api/path/restconf_session","api/path/root_schema_node","api/path/rpc","api/path/schema_node","api/path/statement","api/providers/codec_provider","api/providers/gnmi_provider","api/providers/netconf_provider","api/providers/odl_provider","api/providers/providers","api/providers/restconf_provider","api/providers/service_provider","api/services/codec_service","api/services/crud_service","api/services/executor_service","api/services/gnmi_service","api/services/netconf_service","api/services/services","api/types","api_guide","developer_guide","faq","getting_started","guides/backward_compatibility","guides/codec_guide","guides/crud_guide","guides/deviation","guides/executor_guide","guides/introduction","guides/opendaylight","guides/path","guides/presence_class","guides/restconf_https","guides/validation","index","ydk.models"],envversion:51,filenames:["about_ydk.rst","api/class_hierarchy.rst","api/errors.rst","api/filters.rst","api/path/annotation.rst","api/path/capability.rst","api/path/codec.rst","api/path/data_node.rst","api/path/gnmi_session.rst","api/path/netconf_session.rst","api/path/path.rst","api/path/repository.rst","api/path/restconf_session.rst","api/path/root_schema_node.rst","api/path/rpc.rst","api/path/schema_node.rst","api/path/statement.rst","api/providers/codec_provider.rst","api/providers/gnmi_provider.rst","api/providers/netconf_provider.rst","api/providers/odl_provider.rst","api/providers/providers.rst","api/providers/restconf_provider.rst","api/providers/service_provider.rst","api/services/codec_service.rst","api/services/crud_service.rst","api/services/executor_service.rst","api/services/gnmi_service.rst","api/services/netconf_service.rst","api/services/services.rst","api/types.rst","api_guide.rst","developer_guide.rst","faq.rst","getting_started.rst","guides/backward_compatibility.rst","guides/codec_guide.rst","guides/crud_guide.rst","guides/deviation.rst","guides/executor_guide.rst","guides/introduction.rst","guides/opendaylight.rst","guides/path.rst","guides/presence_class.rst","guides/restconf_https.rst","guides/validation.rst","index.rst","ydk.models.rst"],objects:{"ydk.entity_utils":{JsonSubtreeCodec:[24,0,1,""],XmlSubtreeCodec:[24,0,1,""]},"ydk.entity_utils.JsonSubtreeCodec":{JsonSubtreeCodec:[24,1,1,""],decode:[24,1,1,""],encode:[24,1,1,""]},"ydk.entity_utils.XmlSubtreeCodec":{XmlSubtreeCodec:[24,1,1,""],decode:[24,1,1,""],encode:[24,1,1,""]},"ydk.errors":{YClientError:[2,3,1,""],YCodecError:[2,3,1,""],YCoreError:[2,3,1,""],YError:[2,3,1,""],YIllegalStateError:[2,3,1,""],YInvalidArgumentError:[2,3,1,""],YModelError:[2,3,1,""],YOperationNotSupportedError:[2,3,1,""],YServiceError:[2,3,1,""],YServiceProviderError:[2,3,1,""]},"ydk.ext.services":{Datastore:[28,0,1,""]},"ydk.ext.services.Datastore":{candidate:[28,4,1,""],na:[28,4,1,""],running:[28,4,1,""],startup:[28,4,1,""],url:[28,4,1,""]},"ydk.filters":{YFilter:[3,0,1,""]},"ydk.filters.YFilter":{"delete":[3,5,1,""],create:[3,5,1,""],merge:[3,5,1,""],not_set:[3,5,1,""],read:[3,5,1,""],remove:[3,5,1,""],replace:[3,5,1,""],update:[3,5,1,""]},"ydk.gnmi":{path:[8,2,0,"-"]},"ydk.gnmi.path":{gNMISession:[8,0,1,""]},"ydk.gnmi.path.gNMISession":{get_root_schema:[8,1,1,""],invoke:[8,1,1,""],subscribe:[8,1,1,""]},"ydk.gnmi.providers":{gNMIServiceProvider:[18,0,1,""]},"ydk.gnmi.services":{gNMIService:[27,0,1,""],gNMISubscription:[27,0,1,""]},"ydk.gnmi.services.gNMIService":{capabilities:[27,1,1,""],get:[27,1,1,""],set:[27,1,1,""],subscribe:[27,1,1,""]},"ydk.path":{Annotation:[4,0,1,""],Capability:[5,0,1,""],Codec:[6,0,1,""],DataNode:[7,0,1,""],NetconfSession:[9,0,1,""],Repository:[11,0,1,""],RestconfSession:[12,0,1,""],RootSchemaNode:[13,0,1,""],Rpc:[14,0,1,""],SchemaNode:[15,0,1,""],Statement:[16,0,1,""]},"ydk.path.DataNode":{__call__:[7,1,1,""],add_annotation:[7,1,1,""],annotations:[7,1,1,""],create_action:[7,1,1,""],create_datanode:[7,1,1,""],find:[7,1,1,""],get_children:[7,1,1,""],get_path:[7,1,1,""],get_root:[7,1,1,""],get_schema_node:[7,1,1,""],get_value:[7,1,1,""],remove_annotation:[7,1,1,""],set_value:[7,1,1,""]},"ydk.path.NetconfSession":{execute_netconf_operation:[9,1,1,""],get_capabilities:[9,1,1,""],get_root_schema:[9,1,1,""],invoke:[9,1,1,""]},"ydk.path.Repository":{create_root_schema:[11,1,1,""]},"ydk.path.RestconfSession":{get_capabilities:[12,1,1,""],get_root_schema:[12,1,1,""],invoke:[12,1,1,""]},"ydk.path.RootSchemaNode":{create_datanode:[13,1,1,""],create_rpc:[13,1,1,""],find:[13,1,1,""],get_parent:[13,1,1,""],get_path:[13,1,1,""],get_root:[13,1,1,""]},"ydk.path.Rpc":{__call__:[14,1,1,""],get_input_node:[14,1,1,""],get_schema_node:[14,1,1,""]},"ydk.path.SchemaNode":{find:[15,1,1,""],get_keys:[15,1,1,""],get_parent:[15,1,1,""],get_path:[15,1,1,""],get_root:[15,1,1,""],get_statement:[15,1,1,""]},"ydk.path.Statement":{arg:[16,5,1,""],keyword:[16,5,1,""]},"ydk.providers":{CodecServiceProvider:[17,0,1,""],NetconfServiceProvider:[19,0,1,""],OpendaylightServiceProvider:[20,0,1,""],RestconfServiceProvider:[22,0,1,""],ServiceProvider:[23,0,1,""]},"ydk.providers.CodecServiceProvider":{get_root_schema:[17,1,1,""],initialize:[17,1,1,""]},"ydk.providers.NetconfServiceProvider":{get_capabilities:[19,1,1,""],get_encoding:[19,1,1,""],get_session:[19,1,1,""]},"ydk.providers.OpendaylightServiceProvider":{get_node_ids:[20,1,1,""],get_node_provider:[20,1,1,""]},"ydk.providers.RestconfServiceProvider":{get_encoding:[22,1,1,""],get_session:[22,1,1,""]},"ydk.services":{CRUDService:[25,0,1,""],CodecService:[24,0,1,""],ExecutorService:[26,0,1,""],NetconfService:[28,0,1,""]},"ydk.services.CRUDService":{"delete":[25,1,1,""],create:[25,1,1,""],read:[25,1,1,""],read_config:[25,1,1,""],update:[25,1,1,""]},"ydk.services.CodecService":{decode:[24,1,1,""],encode:[24,1,1,""]},"ydk.services.ExecutorService":{execute_rpc:[26,1,1,""]},"ydk.services.NetconfService":{cancel_commit:[28,1,1,""],close_session:[28,1,1,""],commit:[28,1,1,""],copy_config:[28,1,1,""],delete_config:[28,1,1,""],discard_changes:[28,1,1,""],edit_config:[28,1,1,""],get:[28,1,1,""],get_config:[28,1,1,""],kill_session:[28,1,1,""],lock:[28,1,1,""],unlock:[28,1,1,""],validate:[28,1,1,""]},"ydk.types":{Bits:[30,0,1,""],Config:[30,0,1,""],Decimal64:[30,0,1,""],Empty:[30,0,1,""],EncodingFormat:[30,0,1,""],Entity:[30,0,1,""],EntityCollection:[30,0,1,""],Enum:[30,0,1,""],Filter:[30,0,1,""],Identity:[30,0,1,""],YLeaf:[30,0,1,""],YLeafList:[30,0,1,""],YList:[30,0,1,""],YType:[30,0,1,""],entity_diff:[30,6,1,""],entity_to_dict:[30,6,1,""]},"ydk.types.Decimal64":{value:[30,5,1,""]},"ydk.types.EncodingFormat":{JSON:[30,4,1,""],XML:[30,4,1,""]},"ydk.types.Entity":{children:[30,1,1,""],clone:[30,1,1,""],get_absolute_path:[30,1,1,""],get_segment_path:[30,1,1,""],has_data:[30,1,1,""],has_list_ancestor:[30,5,1,""],has_operation:[30,1,1,""],ignore_validation:[30,5,1,""],is_presence_container:[30,5,1,""],is_top_level_class:[30,5,1,""],parent:[30,5,1,""],yang_name:[30,5,1,""],yang_parent_name:[30,5,1,""],yfilter:[30,5,1,""],ylist_key:[30,5,1,""],ylist_key_names:[30,5,1,""]},"ydk.types.EntityCollection":{__delitem__:[30,1,1,""],__eq__:[30,1,1,""],__getitem__:[30,1,1,""],__len__:[30,1,1,""],__ne__:[30,1,1,""],clear:[30,1,1,""],entities:[30,1,1,""],get:[30,1,1,""],has_key:[30,1,1,""],keys:[30,1,1,""],pop:[30,1,1,""]},"ydk.types.YLeaf":{operation:[30,5,1,""]},"ydk.types.YType":{"boolean":[30,4,1,""],bits:[30,4,1,""],decimal64:[30,4,1,""],empty:[30,4,1,""],enumeration:[30,4,1,""],identityref:[30,4,1,""],int16:[30,4,1,""],int32:[30,4,1,""],int64:[30,4,1,""],int8:[30,4,1,""],str:[30,4,1,""],uint16:[30,4,1,""],uint32:[30,4,1,""],uint64:[30,4,1,""],uint8:[30,4,1,""]},ydk:{errors:[2,2,0,"-"],path:[16,2,0,"-"],providers:[23,2,0,"-"],types:[30,2,0,"-"]}},objnames:{"0":["py","class","Python class"],"1":["py","method","Python method"],"2":["py","module","Python module"],"3":["py","exception","Python exception"],"4":["py","data","Python data"],"5":["py","attribute","Python attribute"],"6":["py","function","Python function"]},objtypes:{"0":"py:class","1":"py:method","2":"py:module","3":"py:exception","4":"py:data","5":"py:attribute","6":"py:function"},terms:{"6_7_4_post1":34,"abstract":[34,40],"boolean":30,"byte":27,"case":[2,7,13,30,34,40,41,42],"class":[2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19,20,22,23,24,25,26,27,28,30,32,34,36,39,40,41,45,46],"default":[3,8,9,11,12,18,19,20,22,27,28,30,34,36,37,44,45],"enum":[30,35],"export":[18,27,34],"final":[37,40,41],"function":[1,8,9,24,26,27,31,35,41],"import":[4,5,7,11,13,15,16,18,24,27,30,32,35,36,37,38,39,40,42,44,45],"int":[8,9,12,18,19,20,22,28,30,37],"long":[27,40],"new":[10,27,28,35,36,37,42],"public":[8,9,18,19],"return":[6,7,8,9,12,13,14,15,17,19,20,22,24,25,26,27,28,30,37,38,40,41,42],"super":[30,43],"throw":38,"true":[6,7,9,24,25,27,28,30,39,40,42,43,45],"try":[33,38,40,45],"var":18,"void":30,Afs:37,But:44,DNS:[9,19],For:[4,6,7,25,27,28,30,33,34,35,36,37,38,39,41,43,45],IDs:41,IOS:[18,24,34,36,41,42],LTS:34,Not:[2,38,40],One:[20,27,43],QOS:27,Such:34,TLS:18,The:[0,2,3,7,8,9,13,14,15,19,20,22,27,28,30,33,34,35,36,37,38,39,40,41,42,43,44,45],Then:37,There:[34,35],These:[2,34],Use:[2,9],Used:28,Using:[32,46],__call__:[7,14],__delitem__:30,__eq__:30,__exit__:38,__future__:45,__getitem__:30,__init__:[30,43],__iter__:30,__len__:30,__main__:[27,44,45],__name__:[27,44,45],__ne__:30,__setitem__:30,__str__:30,_crud:38,_exc:38,_rais:38,aaa:42,abc:37,abl:40,about:[7,10,22,46],abov:[0,37,38,40,41,42],absolut:[30,42],absolute_import:45,accept:42,accept_rout:30,access:[8,9,10,18,19,20,22,30,34,37,42,44],accord:[7,38,43],accordingli:[24,25,27,28,34],act:[24,36],action:[7,9,30,32,40,41],activ:[24,33,34,36,38],actual:45,add:[7,27,30,34,35,40,41,44],add_annot:7,added:[3,7,34,35,42,44],addhandl:[18,27,40],addit:0,address:[8,9,12,18,19,20,22,24,27,30,36,37,39,40,41,42,44],adhoc_bundl:34,adhoc_bundle_nam:34,admin:[7,13,15,16,18,24,27,41,42,45],advertis:[28,38],af_nam:[37,41],affect:34,afi:[30,40,42],afi_safi:[30,40],afi_safi_nam:[30,40],afisafi:[30,40],afisafifilt:40,afs:37,after:[18,30,33,40,41],against:45,agent:40,agre:0,agreement:0,alia:30,all:[0,2,8,18,25,27,28,30,34,37,38,40,42,44,45],all_interfac:44,all_vrf_nam:37,allow:[0,18,19,27,28,34,37,42],almost:42,along:[8,18],alreadi:[3,34,37,38],also:[0,3,13,24,27,30,33,34,37,40,44,45],altern:34,alwai:[40,42,44],anchor:44,ani:[0,3,14,26,30,33,34,40,41,42],ann:4,annot:[7,10,27,31],anoth:[28,43],answer:46,anyon:33,anyth:34,anyxml:[7,13],apach:[0,34],api:[0,7,13,15,24,25,28,29,30,32,34,46],aplic:3,app:[3,10,32,34,38,42],appear:24,append:[24,27,36,37,38,40,41],appli:[0,32],applic:[0,8,18,34,40,41,44],approach:[36,37,39,42],appropri:42,arg:[11,16,38],argpars:41,argument:[2,7,15,16,17,30,34],argumentpars:41,around:30,artifact:34,as_:[27,30,37,40,41],as_list:30,ascii:27,asctim:[18,27,40],asf:0,assign:[8,18,36,37,43],associ:[4,7,14],assum:[8,18,27,30,34,37,38,41],attach:3,attribut:[3,16,30,34,36,37,40,41,43],aug:42,augment:42,author:[8,18,34],autogener:33,automat:[30,33,34,35],autonom:37,avail:[14,33,34,35,40,41],back:[35,39],backward:[12,32,33,46],base:[0,2,11,13,23,30,34,40,41],bash:34,basi:0,basic:[32,40],becaus:38,been:[0,34],befor:[34,38],behavior:3,behind:11,being:[7,20,22,28,30,38],below:[0,18,27,30,33,34,35,36,37,38,39,40,41,42,43],between:[6,27,30,32,33,40,41],bgp:[5,7,15,16,18,27,30,34,37,40,41,42,43],bgp_cfg:40,bgp_config:37,bgp_filter:37,bgp_oper:35,bgp_read:[18,27],bgp_run:41,bgp_state:35,bgp_xr_opendaylight:41,bgpaddressfamilyenum:41,bgpcondit:43,bgpsessiondirect:30,bgpstatedata:35,big:34,bigger:27,bin:[33,34,44],binari:34,bind:40,bionic:34,bit:30,bitmap:30,bits_typ:30,bits_valu:30,block:[9,19],bool:[6,7,9,24,27,28,30],boron:41,both:34,brief:33,bug:46,build:[0,24,27,40],built:[1,31,34,40,45],built_in_t:45,bundl:[17,18,24,27,30,40,41,42,46],bundle_nam:17,c1sco12345:44,c_include_path:34,ca_file_path:18,cach:[9,11,17,19,20,22,34,41],call:[24,30,34,37,38,41,43],callabl:14,callback:[8,27],callback_funct:27,can:[3,8,10,12,13,14,18,24,27,28,30,34,36,37,38,39,40,41,42,46],cancel:28,cancel_commit:28,candid:[28,42],cannot:[7,28],cap1:5,cap2:5,cap:8,capabl:[9,10,11,12,19,27,28,31,34,43,44],captur:34,cdp:37,cento:[34,44],central:33,certain:40,certif:[8,18,32],cfg:[36,42],chang:[27,28,32,34,39,46],changelog:0,check:[0,33,34,44],checkout:0,child:[30,35,37],children:[7,13,30,45],choic:33,chosen:41,cisco:[0,11,33,34,36,38,39,41,42,44],cisco_ios_x:35,cisco_ios_xe_bgp_op:35,cisco_ios_xr:[24,36,37,39,41],cisco_ios_xr_6_3_1:34,cisco_ios_xr_6_6_3:34,cisco_ios_xr_cdp_cfg:37,cisco_ios_xr_cfgmgr_rollback_act:39,cisco_ios_xr_clns_isis_cfg:37,cisco_ios_xr_ifmgr_cfg:[24,36],cisco_ios_xr_ip_rib_ipv4_op:37,cisco_ios_xr_ipv4_bgp_cfg:41,cisco_ios_xr_ipv4_bgp_datatyp:41,cisco_ios_xr_snmp_agent_cfg:37,ciscodevnet:[0,33,34],clean:[22,34,35],clear:30,click:44,client:[2,18,19,28],clone:[0,30,33,34],close:[22,35],close_sess:28,cmake:34,cmake_library_path:34,code:[15,18,27,32,34,37,40],codec:[0,1,2,10,21,29,31,36,42],codec_provid:37,codec_servic:[37,42],codecservic:[17,24,36,37],codecserviceprovid:[17,24,36,37],collect:[24,25,27,28,30,37,40,41],com:[0,33,34,44],combin:[33,34],command:[0,34,44],comment:39,commit:[28,34],commitid:34,common:[9,40,41],common_cach:9,commun:[0,20,33,34,41,43,44],compar:[24,30,34],compat:[12,32,33,46],compil:34,complet:[30,34,40,41,45],complianc:0,compliant:42,compon:[33,40,46],compos:34,composit:30,concret:[30,40],condit:[0,40,43],config:[3,4,12,18,25,27,28,30,37,40,42],config_url_root:12,configur:[3,24,25,27,28,32,34,36,38,40,41,43],confirm:28,confirm_timeout:28,conform:[2,42],conjunct:[40,41,42],connect:[2,8,9,18,19,22,27,30,34,35,39,40,41,42],consid:[40,42,43],consist:[34,40],constraint:[2,30,45],construct:[9,19,22,24,34],constructor:[7,15],cont:42,contact:33,contain:[2,3,7,8,9,10,16,18,24,25,27,28,30,34,35,36,37,38,39,40,42,43],container2:42,content:28,contextlib:38,continu:28,contribut:46,contributor:0,control:[20,30],convert:[10,32],copi:[0,30],copy_config:28,copyright:[0,34],core:[2,30,40,41,42,46],core_vers:34,correct:34,correl:37,correspond:[3,7,20,24,34,40,41],could:[7,13,15,17,20,30,34,37,38,45],count:39,cplus_include_path:34,cpp:34,cpu0:27,creat:[3,7,9,10,11,12,13,16,18,24,25,26,27,28,30,32,33,34,38,39,40,41,45,46],create_act:[7,42],create_datanod:[7,13,15,16,42],create_root_schema:11,create_rpc:[13,42],criterion:[13,15],crt:44,crud:[0,1,18,24,29,30,31,32,35,38,44,45],crud_servic:[30,38,40,41],crudservic:[18,24,25,30,35,37,40,41,44,45],current:[0,3,7,9,15,19,28,30,33,34,45],current_dt:27,curv:34,custom:11,custom_repo:11,d665b401e363a2dbfbba5258d7705509fd76ba:0,data:[2,3,4,6,7,8,10,12,13,14,24,26,27,28,30,32,34,37,38,40,41,42,43,44,45,46],data_nod:6,datanod:[4,6,8,9,10,12,13,14,15,16,31,42],datastor:[3,28,42],datatyp:34,datetim:27,debug:[18,27,40],decemb:34,deci:30,decim:30,decimal64:30,decimal_valu:30,declar:36,decod:[2,6,17,24,36,40,41],deepli:37,def:[27,43,45],default_oper:28,default_repo:11,default_vrf:41,defaultvrf:41,defin:[4,5,7,8,12,15,17,18,24,26,27,30,34,38,39,40,42,43],definit:30,del:30,delet:[3,25,27,28,30,32,35,40,41,46],delete_config:28,demand:9,demonstr:45,dep:34,depend:33,deprec:34,descend:[13,15],describ:[4,34],descript:[34,36],design:[24,30],desir:[3,34],desri:30,destin:28,destructor:22,detail:[7,10,15,34,35,38,40,41],detect:34,develop:[0,34,40,44,46],devhub:35,deviat:[32,46],devic:[3,8,9,12,18,19,20,22,24,25,27,28,30,38,39,40,41,42,43],dict:24,dictionari:[24,30],differ:[30,32,34],dir:34,direct:24,directli:34,directori:[8,9,11,17,18,19,34],disabl:[30,32,44,46],disable_valid:45,discard_chang:28,discov:33,distribut:[0,41],dnc:12,doc:34,docker:46,document:[0,36,37,39,40,41,46],doe:[3,7,14,19,22,24,28,30,34,38,43],domain:0,done:37,doubl:44,down:40,download:[9,18,22,42],draft:12,drag:44,drive:34,due:[2,34],dummi:[30,37],dure:[30,34],dynam:38,each:[27,30,34,37],earlier:34,easi:41,easili:34,edit:[3,4,28,42],edit_config:28,edit_rpc:42,effect:42,either:[0,18,24,28,34],element:[3,7,14,30,32,34,45],els:41,empti:[5,30,37,41],ems:18,enabl:[9,11,18,27,30,34,40,41,42,44,45],enabled_list:30,encapsul:[6,24,25,27,28],encod:[0,2,6,9,10,12,17,19,20,22,24,27,30,34,36,37,40,41,42],encodingformat:[6,12,17,20,22,30,37,41,42,44],encrypt:44,enough:26,enter:44,entir:[27,28,30,32,45],entiti:[24,25,26,27,28,32,38,40,41,43,45],entity1:30,entity2:30,entity_diff:30,entity_to_dict:30,entity_util:24,entitycollect:[24,27,30],enumer:[30,35],env:[34,44],environ:[18,27,33],eol:34,err:45,error:[1,3,6,15,24,25,26,27,28,30,31,38,40,41,45],error_handl:38,error_msg:2,error_opt:28,establish:[40,41],etc:[35,40,44],evalu:30,everi:42,examin:42,exampl:[1,4,7,11,16,29,31,33,34,35,36,37,38,39,40,41,42,44,45],exc:38,excampl:13,except:[0,2,25,30,38,40,41,45],exec:38,execut:[7,8,9,12,14,26,28,32,34,42,46],execute_netconf_oper:9,execute_rpc:[26,39],executor:[1,29,31,39],executorservic:[26,39],exist:[3,11,27,28,43],exit:[34,40],expandus:11,expect:[11,24,26,27,30,34],experiment:34,explicitli:[34,35,44],explor:41,express:[0,7,10,13,15,34,42],ext:28,extend:30,extens:34,extra:34,f6b4e2d59d4eedf31ae8b2fa3119468e4c38259c:34,fail:[2,25,27,28,34,45],faithfulli:38,fals:[7,9,24,25,27,28,30,45],famili:41,featur:[38,45],fetch:41,few:[30,34],field:[9,19,30,42],file:[0,8,9,18,19,28,34,38,44],filter:[1,18,24,25,27,28,30,31,37,40],find:[7,13,15,18,30,34,40,42],first:[30,34,37,40,41,42],five:39,flag:[24,30,45],focal:34,folder:[18,44],follow:[18,27,30,34,44,45],forc:[28,39,40],fork:33,form:[10,13,34],format:[6,12,17,24,30,34,37,40,41],formatt:[18,27,40],found:[7,20,30,34,38,46],foundat:0,four_byte_a:41,fourbytea:41,framework:38,from:[0,3,4,5,7,9,11,13,15,16,18,24,25,27,28,30,33,35,36,37,38,39,40,41,42,44,45],full:[8,18,34,42],func:[8,27,38],futur:[35,44],gen:[0,24,27,33,34,38],gener:[0,10,11,30,33,40,42,43,46],get:[7,8,13,14,15,16,18,24,28,30,33,37,40,42,44,46],get_absolute_path:30,get_bitmap:30,get_cap:[9,12,19,27],get_children:7,get_config:28,get_encod:[19,22],get_input_nod:[14,42],get_kei:15,get_node_id:[20,41],get_node_provid:[20,41],get_par:[13,15],get_path:[7,13,15],get_root:[7,13,15],get_root_schema:[7,8,9,12,13,15,16,17,24,42],get_schema:42,get_schema_nod:[7,14,15,16],get_segment_path:30,get_sess:[19,22,24],get_stat:[15,16],get_valu:7,getlogg:[18,27,40],git:[0,33,34],github:[0,33,34],give:2,given:[4,7,9,11,12,13,14,15,28,30],global:[30,37,40,41,42],global_:[27,30,37,40,41],global_af:41,globalaf:41,gnmi:[0,1,8,21,24,29,31,40],gnmi_servic:27,gnmiservic:[3,27],gnmiserviceprovid:[18,24,27],gnmisess:[10,31],gnmisubscript:27,goal:34,goe:35,gopath:34,gorelik:0,goroot:34,got:30,govern:0,grace:28,grep:34,grpc:[8,18,27,34],grpc_trace:[18,27],grpc_verbos:[18,27],guid:[33,46],handl:[27,34],handle_runtime_error:38,handler:[18,27,40],hang:4,happen:32,hard:34,has:[2,4,6,9,12,22,24,25,26,27,28,30,34,35,38,45],has_data:30,has_kei:30,has_list_ancestor:30,has_oper:30,have:[0,14,18,27,30,33,34,35,37,38,40,41,42],head:34,header:34,heartbeat_interv:27,hello:30,help:[34,40,46],helper:38,henc:4,here:[30,33,34,37,40,44,45],hierarchi:[40,43,45],hold_tim:30,home:[24,27,34,41],hope:35,host:[8,18,30,40,41,44],hostnam:40,hour:34,how:[7,13,15,32,34,44,46],howev:[7,15,34,40,42,45],http:[0,32,33,34,41,46],human:24,hundr:34,ident:[30,34,35],identifi:[3,7,13,25,27,28,30,42],identityref:30,ietf:[4,34,35,42],ietf_0_1_6:34,ietf_interfac:35,if_json:36,if_xml:36,ifc:24,ifc_filt:24,ifc_read:24,ifmgr:[24,36],ignor:[3,42],ignore_valid:[30,45],illeg:2,illustr:42,imag:34,implement:[0,7,15,22,28,30,40,42,45],impli:0,inbound:30,includ:[3,18,24,27,34,42,45],indent:24,independ:40,index:34,indic:[20,27,30,38,43],individu:34,infinit:[9,19],info:[18,27,35,40],inform:[0,26,28,33,34],inherit:42,initi:[17,27,30,44],inlin:28,input:[14,39,42],ins:37,insecur:[9,19],instal:[18,27,30,32,33,36,39,41,46],install_ydk:[33,34],instanc:[5,6,7,8,9,12,13,14,15,16,17,18,19,20,22,24,25,26,27,28,30,32,37,38,39,40,41,42,43,46],instance_a:41,instance_nam:[37,41],instancea:41,instanti:[7,13,15,18,27,36,37,38,40,41,43],instruct:28,int16:30,int32:30,int64:30,int8:30,int_config:37,int_filt:37,integ:30,interact:41,interest:[34,46],interfac:[8,9,10,12,18,22,24,27,36,37,40,44],interface_configur:[24,36],interface_nam:[24,36],interfaceconfigur:[24,36],interfacetyp:35,interfacetypeident:35,intern:[8,18,30],interpret:34,interv:[27,28],intervent:34,intf:44,introduc:0,introduct:[32,46],invalid:[2,7,15,30,38,45],invok:[2,7,8,9,12,14,30,32,36,42],ios:[33,34,36,39,41,44],iosxr:44,ip_rib_route_table_nam:37,ipribroutetablenam:37,ipv4:[34,36,37],ipv4_afsf:40,ipv4_network:36,ipv4_unicast:41,ipv4unicast:40,ipv6unicast:40,is_config:35,is_presence_contain:30,is_top_level_class:30,isi:37,isn:26,isol:34,issu:[28,33,34,35,37],item:30,iter:37,its:[7,14,22,26,30,34,36,37,40,42],itself:[42,43],jcodec:24,join:[11,33,34],json:[0,12,17,20,22,24,27,30,32,33,34,41,42,44],json_ietf:27,json_provid:36,just:[4,34,35,44],karaf:41,kei:[8,9,13,15,18,19,26,30,37,40,42],key1:42,key2:42,keychain:44,keyword:16,kill_sess:28,kind:[0,4],kit:[0,34],know:37,known:37,kwarg:38,l3vpn_ipv4_unicast:42,l3vpnipv4unicast:30,l3vpnipv6multicast:30,label:39,languag:[0,34,38],last:[13,44],latest:34,law:0,ld_library_path:34,leaf:[3,7,13,32,42,43,45],leaf_typ:30,leaflist_typ:30,learn:34,leav:42,len:37,length:30,let:[34,37,41,43],level:[3,13,24,30,32,35,37,38,45],levelnam:[18,27,40],lib64:34,lib:[34,38,42],librari:[32,34,35,38,40,42],libydk:[34,35],licens:[34,46],like:[3,10,34,37,40,42,45],limit:[0,44],line:[24,34,38],linux:34,list:[3,6,7,9,11,12,13,15,19,20,24,25,27,28,32,34,35,36,40,42],live:27,load:[11,28],local:[8,17,18,28,30,34,44],locat:[11,12,17,18,33,34,40,41,44],lock:28,log:[9,12,18,19,20,22,27,32,35,38,43],logger:[18,27],logic:[34,43],longer:35,look:40,lookup:11,lookup_t:11,loopback0:[24,36],loopback:36,lot:40,machin:[34,40],maco:[34,44],mai:[0,33,35,40],main:[34,40],maintain:33,major:45,make:[28,33,34,40,41,44],manag:[40,41],manual:[30,34,43],map:[11,30,40,41],mark:[3,27,37],match:[13,15,30,42,43],match_community_set:43,matchcommunityset:43,maximum:27,mean:[4,30,42,44],member:[27,30,40,45],merg:[3,4,28],messag:[3,8,18,26,27,34,40,45],meta:34,method:[7,11,13,17,22,27,30,34,35,36,40,41,42],mgmt:44,mgmteth0:27,microsecond:[9,19],microsoft:34,minut:27,misc:18,miss:26,mkdir:[34,44],mode:[18,27,34],model:[0,2,4,5,8,9,10,11,12,14,17,18,19,20,22,24,25,26,27,28,30,32,35,36,37,38,39,42,43,44,45,46],models_path:17,modif:0,modifi:[0,37],modul:[2,5,10,11,13,30,34,37,38,39,40,42],monitor:42,more:[0,25,33,34,40,41,42],most:[39,40],mount:41,multi:[0,24],multipl:[6,25,27,28,30,32,34],multiprocess:27,must:[9,13,18,24,25,27,28,30,34,37,42,44,45],myrestconf:44,nagl:30,name:[4,5,9,12,17,18,19,20,27,30,34,35,36,37,40,42,44],namespac:4,nanosecond:27,nativ:[30,34],navig:34,necessari:41,need:[4,18,22,34,35,36,37,39,40,41,42,43,45],neg:45,neighbor:[27,30,35,40,42],neighbor_address:27,neighbor_af:42,nest:37,netconf:[0,1,3,4,9,12,21,22,29,30,31,38,39,40,42,45],netconf_sess:42,netconfservic:[28,40,45],netconfserviceprovid:[19,28,30,35,39,40,45],netconfsess:[7,10,13,15,16,19,22,31,42],netmask:36,network:[3,36],nevertheless:42,newer:35,next:40,node:[3,4,6,7,10,13,14,15,16,17,20,30,35,36,38,41,42,43],node_id:20,nodetre:7,non:[8,9,18,19,24,32,34,44,45],non_stat:37,none:[7,8,9,12,13,14,17,19,25,26,27,28,30,36,37,38,43],nonstat:37,not_set:3,notat:42,note:[3,10,13,27,32,33,36,37,39,40,41,42,45,46],noth:11,notic:[0,40],now:[27,35,37,40,41],nset:45,number8:45,number:[9,30,37,40,45],object:[2,13,18,24,27,32,34,35,36,37,38,39,41,42,43,45],obtain:[0,28,34,41,44],oc_bgp:30,oc_bgp_typ:30,oc_routing_polici:30,occur:[2,6,24,25,26,27,28,40,41],octob:0,odl:[20,41],odl_provid:41,off:18,offer:37,older:12,omit:42,on_chang:27,on_demand:9,onc:[27,34],one:[0,4,12,24,25,27,28,34,37,40,42,45],ongo:28,onli:[3,16,26,28,34,38,42,45],onward:35,opearaion:18,open:[33,34,44],openconfig:[5,7,15,16,18,27,30,34,37,38,40,42,43,44],openconfig_0_1_9:34,openconfig_bgp:[18,27,30,37,40],openconfig_bgp_typ:[30,40],openconfig_interfac:[27,37,40,44],openconfig_routing_polici:[30,43],openconfig_telemetri:38,opendaylight:[0,1,21,31,32,46],opendaylightserviceprovid:[20,41],oper:[2,3,4,12,18,25,27,28,30,34,36,37,39,40,41,42],opt:34,option:[9,18,26,28,30,34,36,40,42,43],order:[18,28,30,33,34,37,40,41,42,44,45],ordereddict:30,org:0,organ:43,origin:0,other:[30,33,34,35],otherwis:[7,8,11,25,26,28,30],our:[40,41],out:[0,35],output:[9,12,14,27,34,42,44],output_callback_funct:8,output_data:42,output_directori:34,output_xml:42,over:[0,8,37,44],overview:[32,46],overwrit:30,overwritten:28,own:34,owner:33,ownership:0,packag:[26,34,36,38,39,40,42],packet:27,param:[8,12],paramet:[3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19,20,22,24,25,26,27,28,30],parent:[13,15,30,36,37,41,42,45],pars:[11,36,41],part:[13,27,28,34,37,38,42,45],parti:33,partial:[34,44],particular:[37,38],pass:[11,13,40,41],password:[8,9,12,18,19,20,22,24,27,39,40,41,42],path:[2,4,5,6,7,8,9,11,12,13,14,15,16,18,19,24,27,30,31,32,34,38,41,44,45,46],pattern:[30,45],payload:[3,6,10,12,20,22,24,36,38,40,41],peer:[42,44],peer_a:27,peer_typ:30,peertyp:30,peertypeenum:30,pem:18,per:34,perform:[2,4,17,18,24,25,27,28,30,34,36,37,39,40,41],period:27,perman:44,permiss:[0,44],persist:28,persist_id:28,pick:34,pip:34,pki:44,platform:[34,35],pleas:[33,34,35,40,45],plu:34,point:[13,34,40,41],pointer:[9,12,24,30],polici:[34,43],policy_definit:30,policydefinit:[30,43],poll:27,pool:27,pop:30,popul:[14,37,42],port:[8,9,12,18,19,20,22,24,27,39,40,41,44],posit:30,possibl:[26,45],prb:39,pre:34,predefin:33,predic:[13,42],prefer:34,prefix:[6,42,44],prepar:26,presenc:[30,32,36,46],present:[13,24,30,40],pretti:[6,24],previou:[33,42],previous:[28,34],primari:36,print:[8,24,27,30,34,36,37,42,44,45],print_funct:45,print_telemetry_data:27,prior:34,privat:[8,9,18,19],private_kei:[8,18],private_key_path:[9,19],procedur:[34,44],process:[8,27],produc:[24,40,45],profil:33,program:[34,38,40],programm:40,programmat:[39,41],project:33,protect:0,proto:[27,40],protobuf:[8,27],protocol:[0,3,9,10,19,34,40,41,44],provid:[0,1,2,4,5,6,7,9,10,11,12,14,23,24,25,26,27,28,30,31,32,34,35,36,37,38,39,44,45],public_key_path:[9,19],pull:33,purpos:45,put:18,pwd:34,python2:34,python3:[34,38],python:[0,2,6,7,10,13,15,17,22,24,25,27,28,30,33,34,36,38,39,40,41,42,44,46],python_venv:34,qos:27,question:46,quickli:34,rais:[6,7,15,20,24,25,26,27,28,30,38,40,41],ran:34,rang:[30,45],react:45,read:[3,16,18,24,25,27,28,32,35,40,41,44,46],read_config:[25,37],read_filt:[27,37],read_mod:27,readabl:24,readconfig:40,receiv:27,recent:39,recogn:42,recommend:34,recurs:30,reduc:34,refer:[4,33,34,35],referenc:43,regard:0,rel:[13,30,34,42],relat:[3,10,33,34],releas:[28,33,35,44,46],remot:28,remov:[3,7],remove_annot:7,renam:35,replac:[3,27,28,32,35],repli:[9,40,41,42],repo:[8,9,12,17,18,19,20,22,24,27,34,41,44],repo_path:11,report:46,repositori:[8,9,10,12,17,18,19,20,22,24,27,31,34,41,44],repres:[7,9,12,13,14,15,16,19,24,25,27,28,30,36,37,40,43],represent:[7,8,13,27,30],request:[28,33,40],requir:[0,9,19,28,35,46],reserv:0,respect:[10,33,37],respons:[8,9,11,27,40,41],rest:37,restconf:[0,1,12,21,31,32,41,46],restconfserviceprovid:[22,44],restconfsess:[10,31],result:[24,30,37,38,40,41,45],retriev:[18,28,30],revert:28,revis:[5,34,42],rfc:[12,30,42,43],rhel:34,rib:37,rib_op:37,right:[0,2],roll:39,roll_back_configuration_to:39,rollback:[28,32],rollbackconfigurationlast:39,root:[7,11,13,15,17,34,42],root_schema:[7,13,15,16,24,42],root_schema_nod:6,rootschemanod:[6,7,8,9,10,11,12,15,16,17,24,31,42],rout:37,route_table_nam:37,router:[18,30,36],router_id:[30,37],routing_polici:30,routingpolici:[30,43],rp0:27,rpc:[3,4,8,9,10,12,13,26,31,32,40,46],rpc_entiti:26,rtype:15,rule:[37,40],run:[18,25,28,34,37,40,41],run_test:45,runner:[30,45],runtimeerror:6,saf:37,saf_nam:37,safi:[30,40,42],same:[28,30,42],sampl:[27,34,40,41],sample_interv:27,saniti:[30,45],satisfi:[7,13,15,30,34],sbx:44,scene:11,schema:[7,11,13,14,15,16,17,38,41,42],schema_nod:[15,16],schemanod:[7,10,11,13,14,31,42],schematre:[13,15],scope:35,script:[0,24,27,33,42,45],sdk:34,search:11,second:30,section:[34,42,44],secur:[8,9,18,19,44],see:[0,7,13,15,23,30,34,40,41,45],segment:30,select:44,self:[26,30,38,42,43,44],semant:34,send:[9,38],sent:[27,45],separ:34,sequenc:[30,34],server:[2,3,8,9,12,18,19,22,26,27,38,40,42,44,45],server_certif:[8,18],servic:[0,1,2,7,11,14,23,30,31,32,35,36,37,38,39,44,45],service_provid:[7,14],serviceprovid:[1,7,14,20,21,25,26,31,40,41],session:[7,8,9,13,15,16,22,28,40,41,42],session_id:28,set:[3,7,8,11,13,18,24,28,33,34,36,37,40,41,42,43,45],set_filt:30,set_valu:7,setformatt:[18,27,40],setlevel:[18,27,40],share:[24,34,44],shell:34,shortcut:37,should:[7,11,13,27,30,34,40,44],show:[34,40,44],shown:[18,27,34,38,42,43],side:[2,26],sign:44,signal:28,silent:[3,27],similar:9,similarli:40,simpl:[34,40],simpli:[30,34],simplifi:[40,41],sinc:[0,22,43],singl:[6,13,24,25,27,28,30,40,42],site:38,size:34,skip:34,slightli:34,small:[34,42],snippet:[32,40,42],snmp:37,softwar:[0,33,34],sole:45,solut:0,some:[0,4,34,36,37,38,39,40,41,42],someth:46,sometim:45,sourc:[0,28,33,44],source_config:28,southbound:41,sp_instanc:40,special:2,specif:[0,3,18,30,34,37,42],specifi:[8,9,17,18,24,27,28,30,34,40,42,44],split:45,sr2:41,ssh:[9,19,40,43],ssl:44,stamp:40,standard:[34,38,42],start:[40,46],startup:28,state:[2,25,27,28,38,42],state_url_root:12,statement:[10,15,30,31,38,43],std:30,stdout:[8,27],step:[33,34,40,41],still:[40,42],stop:28,storag:28,store:[9,17,19,20,22,34],str:[4,5,6,7,8,9,11,12,13,15,16,17,18,19,20,22,24,27,28,30],straight:40,stream:[27,34],streamhandl:[18,27,40],strftime:27,string:[0,5,6,7,8,9,11,13,15,17,24,27,30,34,36,38,42,45],style:43,subclass:2,subcript:27,submit:33,submodul:[13,42],subpackag:26,subscrib:8,subscriberespons:[8,27],subscript:[8,27,38],subscription_id:38,subscription_mod:27,subset:42,subsystem:34,subtre:24,succe:[7,14,28],success:[25,27],successfulli:25,sudo:[34,44],suffici:42,suggest:35,suppli:[7,30],support:[0,2,3,8,9,12,18,19,20,22,23,24,25,27,28,32,38,42,43,44,46],suppos:42,suppress_redund:27,sur:34,sure:[34,44],syntax:32,sys:41,system:[0,8,27,28,35,37,38,46],tabl:11,table_nam:37,tag:3,take:[14,34],tar:34,target:[3,28,42],target_defin:27,tcp:[9,19,40],telemetri:[27,38],telemetrysystem:38,temporari:9,term:30,termin:[13,28],test:[18,27,28,30,34,39,40,41,42,45],test_opt:28,than:[30,42],thei:42,them:42,therefor:34,thi:[0,2,3,7,8,9,10,11,12,13,14,15,16,17,20,24,27,28,30,34,35,36,37,39,40,41,42,43,44,45,46],thing:38,third:33,those:[34,42],three:34,through:[7,14,15,45],thrown:[2,3,30],time:[27,34,40],timeout:[9,19,28,37],timer:[30,37],tls:18,togeth:37,tool:[0,33,34],top:[13,24,30,32,35,37,38,45],top_ent:26,trace:[18,27],traceback:38,tracker:33,translat:[0,6],transport:[40,41],transport_secur:[18,27],trap:37,travers:40,tree:[11,12,13,14,15,27,40,42],trust:44,tupl:30,two:[30,40,43],type:[1,7,11,12,13,14,15,17,19,20,22,24,25,27,28,31,34,35,36,37,38,40,41,42,43,44,45],types_list:30,typic:34,ubuntu:[34,44],uint16:30,uint32:30,uint64:30,uint8:[30,45],uint8_valu:45,under:[0,24,26,30,34,44],underli:[30,40,41],underneath:32,unicast:37,uniqu:30,unless:0,unlock:28,unsign:30,unsupport:[34,38],updat:[3,25,27,30,32,40,41,44,46],url:[28,34],urllib:41,urlpars:41,usag:[4,11,13,16,30,34,40],use:[0,5,7,11,13,15,24,32,33,34,46],used:[3,8,9,10,11,12,13,14,17,18,19,20,22,24,27,28,30,34,35,36,37,39,40,42,44,46],useful:[4,40,42],user:[7,8,9,15,17,18,19,20,22,27,30,34,37,38,40,41,43,44],usernam:[8,9,12,18,19,20,22,24,27,39,40,41,42],uses:[4,34,40,41],using:[0,10,11,18,24,27,34,35,37,38,40,41,42,43,44],usr:[34,44],usual:24,util:[1,31],val:42,valid:[1,2,7,10,24,28,31,32,42,46],valu:[4,7,8,9,13,18,22,24,27,37,38,42,45],vari:38,variabl:[18,27],variou:[0,3,28,30,35],vector:15,vendor:34,venv:[33,34],verbos:34,veri:42,verif:44,version:[34,38,40,41,46],version_info:41,via:[19,38],view:[2,34],violat:2,virtual:[33,34],vrf:37,vrf_default:37,vrf_list:37,vrf_name:37,vstr:45,wai:[24,40,42],want:[34,37],warranti:0,websit:35,welcom:[33,46],well:24,were:[40,41],what:[32,46],whatev:27,when:[2,3,24,26,27,28,34,35,37,38,40,41,44,45],where:[18,25,30,33,34],whether:[27,34],which:[0,8,9,10,12,13,15,18,19,22,24,27,28,30,34,35,36,37,38,40,42,45],whole:27,window:[32,34],within:34,without:[0,34,42],work:[0,7,18,32,40,46],workaround:34,workspac:27,worri:22,wrapper:[7,15,22,30],write:[0,10,32],written:[40,41,42],wsl:34,www:0,xenial:34,xml:[0,3,9,17,24,30,32,37,40,41,42],xml_encod:37,xml_provid:36,xpath:[7,10,13,15,30,42],xr_6_5_1:33,xr_6_5_3:34,xr_bgp:41,xr_bgp_type:41,xyz:[37,42],yan:[0,24,27],yang:[0,1,2,4,7,8,9,10,11,12,13,14,15,16,17,18,19,24,31,32,33,34,35,37,38,39,40,41,43,45,46],yang_models_loc:[18,27],yang_nam:[30,43],yang_parent_nam:[30,43],yangmodel:34,yclienterror:2,ycodecerror:[2,6],ycoreerror:2,ydk:[2,3,4,5,6,7,8,9,11,12,13,14,15,16,17,18,19,20,22,23,24,25,26,27,28,31,32,35,36,37,39,40,42,43,44,45,46],ydk_venv:34,ydk_vne:34,ydkgen:30,ydkgen_hom:34,ydksolut:34,ydktest:[30,45],ydktest_san:[30,45],yerror:[2,7,40,41],yfilter:[3,27,30,35,37],ygorelik:[0,44],yillegalstateerror:2,yinvalidargumenterror:[2,7,15,24,30],yleaf:[30,37],yleaflist:30,ylist:[30,34,37],ylist_kei:30,ylist_key_nam:30,ymodelerror:[2,30,38,45],yoperationnotsupportederror:2,you:[0,18,27,30,34,37,38,40,41,44,46],your:[3,33,34,40,44],ypatherror:[7,15],ysaniti:30,yserviceerror:[2,24],yserviceprovidererror:[2,3,20,25,26,27,28,45],ytype:[30,45]},titles:["About YDK","YDK API","Errors","Filters","Annotation","Capability","Codec","DataNode","gNMISession","NetconfSession","YDK Path API","Repository","RestconfSession","RootSchemaNode","Rpc","SchemaNode","Statement","Codec Service Provider","gNMI Service Provider","NETCONF Service Provider","Opendaylight Service Provider","Service Providers","RESTCONF Service Provider","ServiceProvider","Codec Services","CRUD Service","Executor Service","gNMI Service API","NETCONF Service","Services","Types","API Guide","Developer Guide","Questions and Answers","Getting Started","Backward compatibility notes","How do I work with instances of YANG data?","How do I create, update, read and delete?","What are deviations?","How do I execute RPCs?","Introduction","How do I use OpenDaylight with YDK?","How do I use the Path API?","What are presence classes?","Using Restconf with HTTPS","How to Disable Validation","Contents:","YDK Model API"],titleterms:{"class":[37,43],"function":30,"import":41,Adding:34,Using:[40,41,44],about:0,action:42,adhoc:34,annot:4,answer:33,api:[1,10,27,31,33,35,40,41,42,47],app:[40,41],append:30,appli:37,assign:30,backward:[34,35],basic:42,between:36,bug:33,build:34,built:30,bundl:[33,34],can:33,capabl:5,certif:44,chang:[0,33,35],code:44,codec:[6,17,24],compat:[34,35],compon:34,configur:[37,42],content:[27,30,34,35,36,37,38,39,40,41,42,46],contribut:33,convert:36,core:[33,34],creat:[37,42],crud:[25,37,40,41],data:36,datanod:7,delet:37,depend:34,develop:32,deviat:38,differ:42,disabl:45,docker:34,document:34,element:37,entir:37,entiti:[30,37],environ:34,error:2,exampl:[18,24,27,30],execut:39,executor:26,filter:3,found:33,from:34,gener:34,get:[27,34],gnmi:[18,27,34],gnmisess:8,guid:[31,32],happen:[40,41],help:33,hood:40,how:[30,33,36,37,38,39,40,41,42,45],http:44,instal:[34,35,44],instanc:36,instanti:30,interest:33,introduct:40,invok:[40,41],json:36,jsonsubtreecodec:24,leaf:[30,37],leav:30,level:40,librari:41,licens:0,limit:40,list:[30,37],log:[40,41],model:[33,34,40,41,47],multipl:37,netconf:[19,28],netconfsess:9,non:40,note:[34,35],object:[30,40],opendaylight:[20,41],overview:[34,38],parti:34,path:[10,42],presenc:[37,43],profil:34,provid:[17,18,19,20,21,22,40,41],question:33,quick:34,read:[30,37],releas:[0,34],replac:37,report:33,repositori:11,requir:34,restconf:[22,44],restconfsess:12,rollback:39,rootschemanod:13,rpc:[14,39,42],runtim:34,schemanod:15,script:34,servic:[17,18,19,20,21,22,24,25,26,27,28,29,34,40,41],serviceprovid:23,set:[27,30],snippet:44,someth:33,sourc:34,start:34,statement:16,subscrib:27,support:[34,35],syntax:42,system:34,tabl:[27,30,34,35,36,37,38,39,40,42],thi:33,third:34,top:40,type:30,under:40,underneath:[40,41],updat:37,usag:24,use:[30,38,40,41,42],used:33,util:30,valid:[30,45],valu:30,variabl:34,version:[0,33],what:[33,38,40,41,42,43],window:35,work:[36,42],write:[40,41],xml:36,xmlsubtreecodec:24,yang:[30,36,42],ydk:[0,1,10,30,33,34,38,41,47],you:33}})
\ No newline at end of file
diff --git a/docs/ydk.models.html b/docs/ydk.models.html
deleted file mode 100644
index 1fb94ad61..000000000
--- a/docs/ydk.models.html
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  
-  <title>YDK Model API &mdash; YANG Development Kit 0.8.6.4 documentation</title>
-  
-
-  
-  
-    <link rel="shortcut icon" href="_static/icon.ico"/>
-  
-
-  
-
-  
-  
-    
-
-  
-
-  
-  
-    <link rel="stylesheet" href="_static/css/width.css" type="text/css" />
-  
-
-  
-
-  
-        <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="YANG Development Kit 0.8.6.4 documentation" href="index.html"/> 
-
-  
-  <script src="_static/js/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          
-
-          
-            <a href="index.html" class="icon icon-home"> YANG Development Kit
-          
-
-          
-            
-            <img src="_static/logo.png" class="logo" />
-          
-          </a>
-
-          
-            
-            
-              <div class="version">
-                0.8.6.4
-              </div>
-            
-          
-
-          
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-
-          
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          
-            
-            
-                <ul>
-<li class="toctree-l1"><a class="reference internal" href="about_ydk.html">About YDK</a></li>
-<li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a></li>
-<li class="toctree-l1"><a class="reference internal" href="developer_guide.html">Developer Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="api_guide.html">API Guide</a></li>
-<li class="toctree-l1"><a class="reference internal" href="faq.html">Questions and Answers</a></li>
-</ul>
-
-            
-          
-        </div>
-      </div>
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="index.html">YANG Development Kit</a>
-      </nav>
-
-
-      
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          
-
- 
-
-
-
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Docs</a> &raquo;</li>
-      
-    <li>YDK Model API</li>
-      <li class="wy-breadcrumbs-aside">
-        
-          
-        
-      </li>
-  </ul>
-  <hr/>
-</div>
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            
-  <div class="section" id="ydk-model-api">
-<h1>YDK Model API<a class="headerlink" href="#ydk-model-api" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-</div>
-</div>
-
-
-           </div>
-          </div>
-          <footer>
-  
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-
-    </p>
-  </div>
-  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>. 
-
-</footer>
-
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  
-
-
-  
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
-            VERSION:'0.8.6.4',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'.html',
-            HAS_SOURCE:  false
-        };
-    </script>
-      <script type="text/javascript" src="_static/jquery.js"></script>
-      <script type="text/javascript" src="_static/underscore.js"></script>
-      <script type="text/javascript" src="_static/doctools.js"></script>
-
-  
-
-  
-  
-    <script type="text/javascript" src="_static/js/theme.js"></script>
-  
-
-  
-  
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-   
-
-</body>
-</html>
\ No newline at end of file
diff --git a/generate.py b/generate.py
index 8ca6cc521..bafa07168 100755
--- a/generate.py
+++ b/generate.py
@@ -234,7 +234,7 @@ def generate_adhoc_bundle(adhoc_bundle_name, adhoc_bundle_files):
     adhoc_bundle = {
         "name": adhoc_bundle_name,
         "version": "0.1.0",
-        "core_version": "0.8.5",
+        "core_version": "0.5.5",
         "author": "Cisco",
         "copyright": "Cisco",
         "description": "Adhoc YDK bundle",
@@ -246,9 +246,9 @@ def generate_adhoc_bundle(adhoc_bundle_name, adhoc_bundle_files):
         "dependency": [
             {
                 "name": "ietf",
-                "version": "0.1.5",
-                "core_version": "0.8.5",
-                "uri": "file://profiles/bundles/ietf_0_1_5.json"
+                "version": "0.1.2",
+                "core_version": "0.5.5",
+                "uri": "file://profiles/bundles/ietf_0_1_2.json"
             }
         ]
     }
@@ -410,6 +410,12 @@ def get_python_version():
         default=False,
         help="Install with sudo access")
 
+    # try:
+    #     arg = sys.argv[1]
+    # except IndexError:
+    #     parser.print_help()
+    #     sys.exit(1)
+
     options = parser.parse_args()
 
     if options.verbose:
diff --git a/install_ydk.sh b/install_ydk.sh
index 79932070a..d07c06108 100755
--- a/install_ydk.sh
+++ b/install_ydk.sh
@@ -21,17 +21,17 @@
 # ------------------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** install_ydk.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** install_ydk.sh | $@ ${NOCOLOR}"
 }
 
 function run_cmd {
-    local cmd=$*
+    local cmd=$@
     print_msg "Running: $cmd"
-    $*
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
@@ -39,116 +39,73 @@ function run_cmd {
 
 function usage {
     MSG_COLOR=$NOCOLOR
-    echo "usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-Options and arguments:
-  --cpp                 install YDK for C++ programming language;
-                        requires sudo access for dependencies and libraries installation
-  --go                  install YDK for Go programming language
-  --py|--python         install YDK for Python programming language
-  --all                 install YDK for all available programming languages;
-                        requires sudo access for dependencies and libraries installation
-  -v|--venv             create python virtual environment
-  -c|--core             install YDK core package
-  -s|--service gnmi     install gNMI service package
-  -n|--no-deps          skip installation of dependencies;
-                        applicable only with --cpp and --all options
-  -h|--help             print this help message and exit
-
-Environment variables:
-YDKGEN_HOME         specifies location of ydk-gen git repository;
-                    if not set, \$HOME/ydk-gen is assumed
-PYTHON_VENV         specifies location of python virtual environment;
-                    if not set, \$HOME/venv is assumed
-GOROOT              specifies installation directory of go software;
-                    if not set, /usr/local/go is assumed
-GOPATH              specifies location of go source directory;
-                    if not set, \$HOME/go is assumed
-C_INCLUDE_PATH      location of C include files;
-                    if not set, /usr/local/include is assumed
-CPLUS_INCLUDE_PATH  location of C++ include files;
-                    if not set, /usr/local/include is assumed
-CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                    if not set, default system library location is assumed"
+    echo "usage: install_ydk [-l [cpp, py, go]] [-s gnmi] [-h] [-n]"
+    echo "Options and arguments:"
+    echo "  -l [cpp, py, go, all] installation language; if not specified Python is assumed"
+    echo "                        'all' corresponds to all available languages"
+    echo "  -c|--core             install YDK core package"
+    echo "  -s|--service gnmi     install gNMI service package"
+    echo "  -n|--no-deps          skip installation of dependencies"
+    echo "  -h|--help             print this help message and exit"
+    echo " "
+    echo "Environment variables:"
+    echo "YDKGEN_HOME         specifies location of ydk-gen git repository;"
+    echo "                    if not set, $HOME/ydk-gen is assumed"
+    echo "GOROOT              specifies installation directory of go software;"
+    echo "                    if not set, /usr/local/go is assumed"
+    echo "GOPATH              specifies location of golang directory;"
+    echo "                    if not set, $HOME/golang is assumed"
+    echo "C_INCLUDE_PATH      location of C include files;"
+    echo "                    if not set, /usr/local/include is assumed"
+    echo "CPLUS_INCLUDE_PATH  location of C++ include files;"
+    echo "                    if not set, /usr/local/include is assumed"
 }
 
-function activate_python_venv() {
-  if [[ -z ${PYTHON_VENV} ]]; then
-    PYTHON_VENV=${HOME}/venv
-    print_msg "Python virtual environment location is set to ${PYTHON_VENV}"
+function check_python_installation {
+  if [[ ! -d ${YDKGEN_HOME}/venv ]]; then
+    print_msg "Creating Python3 virtual environment in ${YDKGEN_HOME}/venv"
+    run_cmd python3 -m venv ${HOME}/venv
   fi
-  if [[ ! -d ${PYTHON_VENV} ]]; then
-    print_msg "Creating Python3 virtual environment in ${PYTHON_VENV}"
-    run_cmd python3 -m venv "${PYTHON_VENV}"
-  fi
-  run_cmd source "${PYTHON_VENV}"/bin/activate
-}
+  run_cmd source ${HOME}/venv/bin/activate
 
-function init_py_env {
-  if [ $install_venv == "yes" ]; then
-    activate_python_venv
-  fi
-  print_msg "Checking python3 version and installation"
-  python3 --version
+  print_msg "Checking python version and installation"
+  python --version
   status=$?
   if [ $status -ne 0 ]; then
     MSG_COLOR=$RED
     print_msg "Could not locate python3 interpretor"
     exit $status
   fi
-
-  print_msg "Checking pip3 version and installation"
-  pip3 -V
+  print_msg "Checking pip version and installation"
+  pip -V
   status=$?
   if [ $status -ne 0 ]; then
     MSG_COLOR=$RED
-    print_msg "Could not locate pip3"
+    print_msg "Could not locate ${PIP_BIN}"
     exit $status
   fi
-  export PIP_DISABLE_PIP_VERSION_CHECK=1
-
-  if [[ $ydk_lang == "py" || $ydk_lang == "all" ]]; then
-    print_msg "Checking installation of python shared libraries"
-    ver=$(python3 -c "import sys;print('{}.{}'.format(sys.version_info.major,sys.version_info.minor))")
-    if [[ $ver. > "3.8." ]]; then
-      print_msg "YDK for python currently is not supported with Python version $ver"
-      print_msg "Please downgrade your Python installation to 3.8 or 3.7"
-      exit 1
-    fi
-    os_type=$(uname)
-    if [[ ${os_type} == "Linux" ]]; then
-      if [[ $ver. > "3.7." ]]; then
-        ext="$ver.so"
-      else
-        ext="$ver"m.so
-      fi
-    elif [[ ${os_type} == "Darwin" ]]; then
-      ext="$ver.dylib"
-    fi
-    lines=($(locate libpython$ext))
-    if [[ ${#lines[@]} -gt 0 ]] && [[ -x ${lines[0]} || -L ${lines[0]} ]]; then
-      if [[ -z $CMAKE_LIBRARY_PATH ]]; then
-        export CMAKE_LIBRARY_PATH=$(dirname ${lines[0]})
-        print_msg "Setting CMAKE_LIBRARY_PATH to $CMAKE_LIBRARY_PATH"
-      fi
-    else
-      print_msg "Could not locate python shared library libpython$ext"
-      print_msg "Try to update locate database, then repeat YDK installation"
-      exit 1
-    fi
+  print_msg "Python location: $(which ${PYTHON_BIN})"
+  print_msg "Pip location: $(which ${PIP_BIN})"
+}
+
+function init_py_env {
+  check_python_installation
+  print_msg "Initializing Python requirements"
+  pip install -r requirements.txt
+  if [[ ${ydk_lang} == "py" || ${ydk_lang} == "all" ]]; then
+    pip install pybind11
   fi
-  print_msg "Checking and installing Python requirements"
-  pip3 install -r requirements.txt
 }
 
 function init_go_env {
-  if [[ ${ydk_lang} == "go" || ${ydk_lang} == "all" ]]; then
     print_msg "Initializing Go environment"
 
     if [[ $(uname) == "Darwin" ]]; then
-        if [[ $GOROOT. == "." ]]; then
-            export GOROOT=/usr/local/go
+        if [[ $GOPATH. == "." ]]; then
+            export GOPATH=$HOME/golang
         fi
         print_msg "GOROOT: $GOROOT"
+        print_msg "GOPATH: $GOPATH"
     else
         if [[ $GOROOT. == "." ]]; then
             export GOROOT=/usr/local/go
@@ -157,64 +114,55 @@ function init_go_env {
             print_msg "GOROOT: $GOROOT"
         fi
         export PATH=$GOROOT/bin:$PATH
-    fi
-    if [[ -z $GOPATH ]]; then
-        export GOPATH=$HOME/go
-        mkdir -p $GOPATH
-        print_msg "Setting GOPATH to $GOPATH"
-    else
-        print_msg "GOPATH: $GOPATH"
+
+        if [[ $GOPATH. == "." ]]; then
+            export GOPATH="$HOME/golang"
+            mkdir -p $GOPATH
+            print_msg "Setting GOPATH to $GOPATH"
+        else
+            print_msg "GOPATH: $GOPATH"
+        fi
     fi
     go_version=$(echo `go version` | awk '{ print $3 }' | cut -d 'o' -f 2)
     print_msg "Current Go version is $go_version"
 
-    if [ ! -d $GOPATH/src/github.com/stretchr/testify ]; then
-        go get github.com/stretchr/testify
-        cd $GOPATH/src/github.com/stretchr/testify
-        git checkout tags/v1.6.1
-        cd -
-    fi
+    go get github.com/stretchr/testify
 
     export CGO_ENABLED=1
     export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
-  fi
 }
 
 function install_cpp_core {
     print_msg "Installing C++ core library"
     cd $YDKGEN_HOME
-    local cpp_sudo_flag
-    if [ $(id -u -n) != "root" ]; then cpp_sudo_flag="s"; fi
-    run_cmd python3 generate.py --core --cpp -i$cpp_sudo_flag
+    run_cmd ./generate.py -is --core --cpp
 }
 
 function install_cpp_gnmi {
     print_msg "Building C++ core gnmi library"
     cd $YDKGEN_HOME
-    local cpp_sudo_flag
-    if [ $(id -u -n) != "root" ]; then cpp_sudo_flag="s"; fi
-    run_cmd python3 generate.py --service profiles/services/gnmi-0.4.0.json --cpp -i$cpp_sudo_flag
+    run_cmd ./generate.py -is --service profiles/services/gnmi-0.4.0.json --cpp
 }
 
 function install_go_core {
     print_msg "Installing Go core packages"
     cd $YDKGEN_HOME
-    run_cmd python3 generate.py -i --core --go
+    run_cmd ./generate.py -i --core --go
 }
 
 function install_go_gnmi {
-    print_msg "Installing Go gNMI service package"
+    print_msg "Installing Go gNMI package"
     cd $YDKGEN_HOME
-    run_cmd python3 generate.py -i --service profiles/services/gnmi-0.4.0.json --go
+    run_cmd ./generate.py -i --service profiles/services/gnmi-0.4.0.json --go
 }
 
 function install_py_core {
     print_msg "Building and installing Python core package"
     cd $YDKGEN_HOME
-    run_cmd python3 generate.py -i --core
+    run_cmd ./generate.py -i --core
 
     print_msg "Verifying Python YDK core package installation"
-    python3 -c "from ydk.path import NetconfSession"
+    python -c "from ydk.path import NetconfSession"
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
@@ -226,10 +174,10 @@ function install_py_core {
 function install_py_gnmi {
     print_msg "Installing gNMI package for Python"
     cd $YDKGEN_HOME
-    run_cmd python3 generate.py -i --service profiles/services/gnmi-0.4.0.json
+    run_cmd ./generate.py -i --service profiles/services/gnmi-0.4.0.json
 
     print_msg "Verifying Python gNMI package installation"
-    python3 -c "from ydk.gnmi.path import gNMISession"
+    python -c "from ydk.gnmi.path import gNMISession"
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
@@ -256,126 +204,38 @@ function instal_dependencies {
     fi
 }
 
-function test_libydk {
-    [ -f "/usr/local/lib/$libydk_path" ] && [[ "$(readlink /usr/local/lib/libydk.a)" == "$libydk_path" ]] && return 0
-
-    MSG_COLOR=$RED
-    print_msg "Missing C++ core library '$libydk_path'. Install it first!"
-    exit 1
-}
-
-function test_libydk_gnmi {
-    [ -f "/usr/local/lib/$libydk_gnmi_path" ] && [[ "$(readlink /usr/local/lib/libydk_gnmi.a)" == "$libydk_gnmi_path" ]] && return 0
-
-    MSG_COLOR=$RED
-    print_msg "Missing C++ gNMI service library '$libydk_gnmi_path'. Install it first!"
-    exit 1
-}
-
 function install_ydk_cpp {
-  if [[ ${ydk_lang} == "cpp" || ${ydk_lang} == "all" ]]; then
     if [[ ${core_package} == "yes" ]]; then
         install_cpp_core
     fi
     if [[ ${service_pkg} == "gnmi" ]]; then
-      if test_libydk; then
         install_cpp_gnmi
-      fi
     fi
-  fi
 }
 
 function install_ydk_py {
     if [[ ${ydk_lang} == "py" || ${ydk_lang} == "all" ]]; then
-      if test_libydk; then
         if [[ ${core_package} == "yes" ]]; then
             install_py_core
         fi
         if [[ ${service_pkg} == "gnmi" ]]; then
-          if test_libydk_gnmi; then
             install_py_gnmi
-          fi
         fi
-      fi
     fi
 }
 
 function install_ydk_go {
     if [[ ${ydk_lang} == "go" || ${ydk_lang} == "all" ]]; then
-      if test_libydk; then
+        init_go_env
         if [[ ${core_package} == "yes" ]]; then
             install_go_core
         fi
         if [[ ${service_pkg} == "gnmi" ]]; then
-          if test_libydk_gnmi; then
             install_go_gnmi
-          fi
         fi
-      fi
     fi
 }
 
-function write_env_file {
-  print_msg "Writing .env file"
-  cd "${YDKGEN_HOME}"
-  rm -f .env
-  echo "# ------------------------------------------------------------------
-# This file has been auto-generated during YDK-$ydk_version installation.
-# PLEASE, DO NOT CHANGE THIS FILE MANUALLY!
-# ------------------------------------------------------------------
-# Run this command once when entering YDK-GEN environment in bash:
-#     source .env
-# ------------------------------------------------------------------
-
-export YDKGEN_HOME=\"${YDKGEN_HOME}\"
-
-export C_INCLUDE_PATH=\"$C_INCLUDE_PATH\"
-export CPLUS_INCLUDE_PATH=\"$CPLUS_INCLUDE_PATH\"
-export PIP_DISABLE_PIP_VERSION_CHECK=1
-" > .env
-  if [[ -n $LD_LIBRARY_PATH ]]; then
-    echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-" >> .env
-  fi
-  if [ $install_venv == "yes" ]; then
-    echo "export PYTHON_VENV=$PYTHON_VENV" >> .env
-    echo "source $PYTHON_VENV/bin/activate" >> .env
-  elif [[ -n $python_location ]]; then
-    echo "export PATH=$python_location/bin:\$PATH
-alias python=python3
-alias pip=pip3
-" >> .env
-  fi
-  if [[ -n $sudo_cmd ]]; then
-    echo "export SUDO_CMD=$sudo_cmd" >> .env
-  fi
-  if [[ $ydk_lang == "go" || $ydk_lang == "all" ]]; then
-    if [[ ${os_type} == "Linux" ]]; then
-      echo "
-if [ -z \$GOROOT ]; then
-    export GOROOT=$GOROOT
-    if [[ $PATH != *\"$GOROOT/bin\"* ]]; then
-        export PATH=$GOROOT/bin:\$PATH
-    fi
-fi
-" >> .env
-    fi
-    echo "
-if [ -z \$GOPATH ]; then
-    export GOPATH=$HOME/go
-fi
-export CXX=/usr/bin/c++
-export CC=/usr/bin/cc
-" >> .env
-  fi
-  if [[ -n $CMAKE_LIBRARY_PATH ]]; then
-    echo "export CMAKE_LIBRARY_PATH=$CMAKE_LIBRARY_PATH
-" >> .env
-  fi
-#  cat .env
-  cd - >& /dev/null
-}
-
 ########################## EXECUTION STARTS HERE #############################
 
 # Terminal colors
@@ -391,9 +251,6 @@ ydk_lang="py"
 service_pkg="no"
 core_package="no"
 dependencies="yes"
-install_venv="no"
-sudo_flag=
-sudo_cmd=
 
 # As long as there is at least one more argument, keep looping
 while [[ $# -gt 0 ]]; do
@@ -409,20 +266,6 @@ while [[ $# -gt 0 ]]; do
                 exit 1
             fi
             ;;
-        --cpp)
-            ydk_lang="cpp"
-            ;;
-        --go)
-            ydk_lang="go"
-            dependencies="no"
-            ;;
-        --py|--python)
-            ydk_lang="py"
-            dependencies="no"
-            ;;
-        --all)
-            ydk_lang="all"
-            ;;
         -n|--no-deps)
             dependencies="no"
             ;;
@@ -441,9 +284,6 @@ while [[ $# -gt 0 ]]; do
                 service_pkg="gnmi"
             fi
             ;;
-        -v|--venv)
-            install_venv="yes"
-            ;;
         *)
             echo "Unknown option '$key'"
             usage
@@ -454,32 +294,7 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
-curr_dir=$(pwd)
-script_dir=$(cd $(dirname ${BASH_SOURCE}) && pwd)
-if [[ -z ${YDKGEN_HOME} || ! -d ${YDKGEN_HOME} ]]; then
-    YDKGEN_HOME=$script_dir
-    print_msg "YDKGEN_HOME is set to $script_dir"
-fi
-cd ${YDKGEN_HOME}
-
-ydk_version=$(grep core sdk/version.json | awk '{print($2)'} | tr -d '"' | tr -d ',')
-gnmi_version=$(grep gnmi-service sdk/version.json | awk '{print($2)'} | tr -d '"' | tr -d ',')
-libydk_path="libydk-$ydk_version.a"
-libydk_gnmi_path="libydk_gnmi-$gnmi_version.a"
-echo "YDK-$ydk_version installation options:"
-if [ ${install_venv} == "no" ]; then
-  if [[ -n $python_location ]]; then
-    echo " - use custom Python installation in ${python_location}"
-  else
-    echo " - use system Python installation"
-  fi
-else
-  echo " - create Python virtual environment = ${install_venv}"
-fi
-echo " - programming language = ${ydk_lang}"
-echo " - install dependencies = ${dependencies}"
-echo " - install core package = ${core_package}"
-echo " - install service package = ${service_pkg}"
+echo "YDK installation options: language=${ydk_lang}, core_package=${core_package}, service_package=${service_pkg}, dependencies=${dependencies}"
 if [[ ${core_package} == "no" && ${service_pkg} == "no" && ${dependencies} == "no" ]]; then
     echo "There are no components to install"
     exit 0
@@ -502,27 +317,21 @@ print_msg "Running OS type: $os_type"
 print_msg "OS info: $os_info"
 if [[ ${os_type} == "Linux" ]]; then
   if [[ ${os_info} == *"Ubuntu"* ]]; then
-    if [[ ${os_info} != *"xenial"* && ${os_info} != *"bionic"* && ${os_info} != *"focal"* ]]; then
+    if [[ ${os_info} != *"xenial"* && ${os_info} != *"bionic"* ]]; then
         print_msg "WARNING! Unsupported Ubuntu distribution found. Will try the best efforts."
     fi
-  elif [[ ${os_info} == *"fedora"* ]]; then
-    rhel_version=$(echo "${os_info}" | grep -w VERSION_ID | awk -F[\"] '{print $2}')
-    if [[ $rhel_version != 7 && $rhel_version != 8 ]]; then
-        print_msg "WARNING! Unsupported Centos/RHEL version. Will try the best efforts."
-    fi
-    if [[ $rhel_version == 8 && ${os_info} == *"CentOS"* ]]; then
-      os_name=$(echo "${os_info}" | grep -w NAME | awk -F[\"] '{print $2}')
-      if [[ $os_name != *"Stream" ]]; then
-        print_msg "Unsupported CentOS version 8 (EOL). Will try the best efforts."
-      fi
-    fi
-  else
+  elif [[ ${os_info} != *"fedora"* ]]; then
     MSG_COLOR=${RED}
     print_msg "Unsupported Linux distribution detected"
     exit 1
   fi
 fi
 
+if [[ -z ${YDKGEN_HOME} || ! -d ${YDKGEN_HOME} ]]; then
+    YDKGEN_HOME=${HOME}/ydk-gen
+    print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
+fi
+
 if [[ -z ${C_INCLUDE_PATH} ]]; then
     export C_INCLUDE_PATH=/usr/local/include
 fi
@@ -531,25 +340,24 @@ if [[ -z ${CPLUS_INCLUDE_PATH} ]]; then
 fi
 
 if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]]; then
-  if [[ $LD_LIBRARY_PATH != *"/usr/local/lib"* ]]; then
-    export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
-  fi
-  if [[ $LD_LIBRARY_PATH != *"/lib64"* ]]; then
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64:/usr/lib64
-  fi
-  print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
+    if [ ${service_pkg} == "gnmi" ]; then
+        export LD_LIBRARY_PATH=$YDKGEN_HOME/grpc/libs/opt:$YDKGEN_HOME/protobuf-3.5.0/src/.libs:$LD_LIBRARY_PATH
+    fi
+    print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
 fi
 
+curr_dir=$(pwd)
+script_dir=$(cd $(dirname ${BASH_SOURCE}) && pwd)
+
+cd ${YDKGEN_HOME}
+
 if [ ${dependencies} == "yes" ]; then
     instal_dependencies
 fi
-if [ -f ~/.profile.python ]; then
-  print_msg "Reading python profile ~/.profile.python"
-  source ~/.profile.python
-fi
 
 CMAKE_BIN=cmake
-command -v cmake3 > /dev/null
+which cmake3 > /dev/null
 status=$?
 if [[ ${status} == 0 ]]; then
     CMAKE_BIN=cmake3
@@ -559,9 +367,6 @@ fi
 # Start installation
 
 init_py_env
-init_go_env
-
-write_env_file
 
 install_ydk_cpp
 
@@ -569,8 +374,5 @@ install_ydk_py
 
 install_ydk_go
 
-if [ ${install_venv} == "yes" ]; then
-  deactivate
-fi
-
+deactivate
 cd ${curr_dir}
diff --git a/profiles/README.md b/profiles/README.md
index ca02f5d60..7cda11c6c 100644
--- a/profiles/README.md
+++ b/profiles/README.md
@@ -34,19 +34,17 @@ This part must include:
 - `"name"` of the bundle; the name also used to form part of the installation path of the bundle
 - `"version"` of the bundle
 - `"core_version"`, which refers to the [version](https://github.com/CiscoDevNet/ydk-gen/releases) of the YDK core package.
-- `"description"`, short description of the bundle
 
-Other components of description part are optional, they will not affect the bundle generation. 
-Here is simple example of description part:
+Other components of description part are optional. Here is simple example of description part:
 
 ```
 {
     "name":"cisco-ios-xr",
     "version": "6.5.3",
     "core_version": "0.8.4",
-    "author": "Cisco",
-    "copyright": "Cisco",
-    "description": "Cisco IOS-XR Native Models From Git",
+    "Author": "Cisco",
+    "Copyright": "Cisco",
+    "Description": "Cisco IOS-XR Native Models From Git",
 ```
 
 ### Bundle Components
diff --git a/profiles/bundles/cisco-ios-xe_16_5_1.json b/profiles/bundles/cisco-ios-xe_16_5_1.json
index 18585daa4..e75e7285b 100644
--- a/profiles/bundles/cisco-ios-xe_16_5_1.json
+++ b/profiles/bundles/cisco-ios-xe_16_5_1.json
@@ -1,7 +1,7 @@
 {
   "name": "cisco-ios-xe",
   "version": "16.5.1",
-  "core_version": "0.8.5",
+  "core_version": "0.5.5",
   "author": "Cisco",
   "copyright": "Cisco",
   "description": "YDK bundle for Cisco IOS XR models",
@@ -344,9 +344,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.2",
+      "core_version": "0.5.5",
+      "uri": "file://profiles/bundles/ietf_0_1_2.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xe_16_6_1.json b/profiles/bundles/cisco-ios-xe_16_6_1.json
index 2b58b150a..abbd8a3db 100644
--- a/profiles/bundles/cisco-ios-xe_16_6_1.json
+++ b/profiles/bundles/cisco-ios-xe_16_6_1.json
@@ -1,10 +1,10 @@
 {
-  "name": "cisco-ios-xe-1661",
+  "name": "cisco-ios-xe",
   "version": "16.6.1",
-  "core_version": "0.8.5",
+  "core_version": "0.6.0",
   "author": "Cisco",
   "copyright": "Cisco",
-  "description": "YDK bundle for Cisco IOS XE 16.6.1 models",
+  "description": "YDK bundle for Cisco IOS XE models",
   "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XE YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XE models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs",
   "models": {
     "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
@@ -38,7 +38,7 @@
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-checkpoint-archive-oper.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-coap.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-controller.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-crypto.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-crypto.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-cts.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-device-sensor.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-device-tracking.yang",
@@ -79,9 +79,9 @@
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-mka.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-mld.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-mmode.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-fwd-oper.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-ldp.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-mpls.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-fwd-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-ldp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-multicast.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-native.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-nat.yang",
@@ -108,7 +108,7 @@
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-rip.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-route-map.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-rpc.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-rsvp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-rsvp.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-sanet.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-segment-routing.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-service-chain.yang",
@@ -123,7 +123,7 @@
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-template.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-track.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-trustsec-oper.yang",
-                     "//_comment_vendor/cisco/xe/1661/Cisco-IOS-XE-tunnel.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-tunnel.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-types.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-udld.yang",
                      "vendor/cisco/xe/1661/Cisco-IOS-XE-utd.yang",
@@ -382,14 +382,14 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     },
     {
       "name": "openconfig",
       "version": "0.1.3",
-      "core_version": "0.8.5",
+      "core_version": "0.6.0",
       "uri": "file://profiles/bundles/openconfig_0_1_3.json"
     }
   ]
diff --git a/profiles/bundles/cisco-ios-xe_16_6_1_post1.json b/profiles/bundles/cisco-ios-xe_16_6_1_post1.json
new file mode 100644
index 000000000..e572d6422
--- /dev/null
+++ b/profiles/bundles/cisco-ios-xe_16_6_1_post1.json
@@ -0,0 +1,396 @@
+{
+  "name": "cisco-ios-xe",
+  "version": "16.6.1-post1",
+  "core_version": "0.6.1",
+  "author": "Cisco",
+  "copyright": "Cisco",
+  "description": "YDK bundle for Cisco IOS XE models",
+  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XE YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XE models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs",
+  "models": {
+    "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+    "git": [
+      {
+        "url": "https://github.com/YangModels/yang.git",
+        "commits": [
+          {
+            "commitid": "779a470185d1b8bcc5af4cde189265c6b5af0dfa",
+            "file": [
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-aaa.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-acl-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-acl.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ap.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-arp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-atm.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bba-group.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bfd-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bfd.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bgp-common-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bgp-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bgp-route-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bgp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-bridge-domain.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-call-home.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-card.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-cdp-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-cdp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-cef.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-cfm-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-checkpoint-archive-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-coap.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-controller.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-crypto.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-cts.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-device-sensor.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-device-tracking.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-dhcp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-diagnostics.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-diffserv-target-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-dot1x.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-eem.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-efp-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-eigrp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-environment-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ethernet.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ezpm.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-features.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-flow-monitor-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-flow.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-http.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-icmp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-igmp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-interface-common.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-interfaces.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ip-sla-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ipv6.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ip.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-isis.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-l2vpn.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-l3vpn.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-license.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-line.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-lisp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-lldp-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-lldp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-logging.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mdt-cfg.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mdt-common-defs.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mdt-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-memory-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mka.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mld.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mmode.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-fwd-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls-ldp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-mpls.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-multicast.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-native.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-nat.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-nbar.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-nd.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-nhrp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ntp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-object-group.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ospfv3.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ospf.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-otv.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-parser.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-pathmgr.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-pfr.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-platform-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-platform-software-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-platform.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-policy.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-power.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-ppp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-process-cpu-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-process-memory-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-qos.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-rip.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-route-map.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-rpc.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-rsvp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-sanet.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-segment-routing.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-service-chain.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-service-discovery.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-service-insertion.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-service-routing.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-sla.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-snmp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-spanning-tree.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-switch-deviation.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-switch.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-template.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-track.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-trustsec-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-tunnel.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-types.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-udld.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-utd.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-virtual-service-oper.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-vlan.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-voice.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-vpdn.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-vservice.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-vstack.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-vtp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-wccp.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-wsma.yang",
+                     "vendor/cisco/xe/1661/Cisco-IOS-XE-zone.yang",
+
+                     "vendor/cisco/xe/1661/cisco-bridge-common.yang",
+                     "vendor/cisco/xe/1661/cisco-bridge-domain.yang",
+                     "vendor/cisco/xe/1661/cisco-ethernet.yang",
+                     "vendor/cisco/xe/1661/cisco-ia.yang",
+                     "vendor/cisco/xe/1661/cisco-odm.yang",
+                     "vendor/cisco/xe/1661/cisco-ospf.yang",
+                     "vendor/cisco/xe/1661/cisco-policy-filters.yang",
+                     "vendor/cisco/xe/1661/cisco-policy-target.yang",
+                     "vendor/cisco/xe/1661/cisco-policy.yang",
+                     "vendor/cisco/xe/1661/cisco-pw.yang",
+                     "vendor/cisco/xe/1661/cisco-qos-common.yang",
+                     "vendor/cisco/xe/1661/cisco-routing-ext.yang",
+                     "vendor/cisco/xe/1661/cisco-self-mgmt.yang",
+                     "vendor/cisco/xe/1661/cisco-storm-control.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-event-notifications-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-ip-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-ipv4-unicast-routing-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-ipv6-unicast-routing-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-ospf-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-routing-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-ietf-yang-push-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-if-ethernet-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-if-ethernet-ext.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-if-ip-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-interfaces-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-interfaces-ext.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-routing-policy-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-terminal-device-deviation.yang",
+                     "vendor/cisco/xe/1661/cisco-xe-openconfig-vlan-deviation.yang",
+
+                     "vendor/cisco/xe/1661/MIBS/ATM-FORUM-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ATM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ATM-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/BGP4-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/BRIDGE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-AAA-SERVER-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-AAA-SESSION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-AAL5-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ATM-EXT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ATM-PVCTRAP-EXTN-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ATM-QOS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-BGP4-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-BGP-POLICY-ACCOUNTING-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-BULK-FILE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CBP-TARGET-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CBP-TARGET-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CBP-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CDP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CEF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CEF-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CONFIG-COPY-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CONFIG-MAN-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-CONTEXT-MAPPING-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-DATA-COLLECTION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-DIAL-CONTROL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-DOT3-OAM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-DYNAMIC-TEMPLATE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-DYNAMIC-TEMPLATE-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-EIGRP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-EMBEDDED-EVENT-MGR-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENHANCED-MEMPOOL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-ALARM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-EXT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-FRU-CONTROL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-QFP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-SENSOR-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENTITY-VENDORTYPE-OID-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ENVMON-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ETHER-CFM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ETHERLIKE-EXT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-FIREWALL-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-FLASH-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-FTP-CLIENT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-HSRP-EXT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-HSRP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-ATM2-PVCTRAP-MIB-EXTN.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-ATM2-PVCTRAP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-BFD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-FRR-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-ISIS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-MPLS-ID-STD-03-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-MPLS-TE-EXT-STD-03-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-ATM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-ENET-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-MPLS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IETF-PW-TDM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IF-EXTENSION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IGMP-FILTER-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IMAGE-LICENSE-MGMT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IMAGE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IP-LOCAL-POOL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPMROUTE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSEC-FLOW-MONITOR-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSEC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSEC-POLICY-MAP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSLA-AUTOMEASURE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSLA-ECHO-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSLA-JITTER-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IPSLA-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IP-TAP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-IP-URPF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-LICENSE-MGMT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-MEDIA-GATEWAY-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-MPLS-LSR-EXT-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-MPLS-TC-EXT-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-NBAR-PROTOCOL-DISCOVERY-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-NETSYNC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-NTP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-OSPF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-OSPF-TRAP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-PIM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-PING-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-PROCESS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-PRODUCTS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-PTP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-QOS-PIB-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-RADIUS-EXT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-RF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-RTTMON-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-RTTMON-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SESS-BORDER-CTRLR-STATS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SIP-UA-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SMI.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SONET-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-STP-EXTENSIONS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-ST-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SUBSCRIBER-IDENTITY-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SUBSCRIBER-SESSION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SUBSCRIBER-SESSION-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-SYSLOG-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-TAP2-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-UBE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-UNIFIED-FIREWALL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VLAN-MEMBERSHIP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VOICE-COMMON-DIAL-CONTROL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VOICE-DIAL-CONTROL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VOICE-DNIS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VPDN-MGMT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/CISCO-VTP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DIAL-CONTROL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DIFFSERV-DSCP-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/DIFFSERV-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DISMAN-EVENT-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DISMAN-EXPRESSION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DRAFT-MSDP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DS1-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/DS3-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ENTITY-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ENTITY-SENSOR-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ENTITY-STATE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ENTITY-STATE-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/EtherLike-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/ETHER-WIS.yang",
+                     "vendor/cisco/xe/1661/MIBS/EXPRESSION-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/FRAME-RELAY-DTE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/HCNUM-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/IANA-ADDRESS-FAMILY-NUMBERS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IANAifType-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IANA-RTPROTO-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IEEE8021-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IGMP-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/INET-ADDRESS-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/INTEGRATED-SERVICES-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/INT-SERV-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IP-FORWARD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IPMROUTE-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/IPV6-FLOW-LABEL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/LLDP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-L3VPN-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-LDP-GENERIC-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-LDP-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-LSR-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-TC-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-TE-STD-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/MPLS-VPN-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/NHRP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/NOTIFICATION-LOG-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/OSPF-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/OSPF-TRAP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/P-BRIDGE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/PerfHist-TC-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/PIM-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/Q-BRIDGE-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/RFC1155-SMI.yang",
+                     "vendor/cisco/xe/1661/MIBS/RFC-1212.yang",
+                     "vendor/cisco/xe/1661/MIBS/RFC1213-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/RFC-1215.yang",
+                     "vendor/cisco/xe/1661/MIBS/RFC1315-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/RMON2-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/RMON-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/RSVP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/SNMP-FRAMEWORK-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/SNMP-PROXY-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/SNMP-TARGET-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/SNMPv2-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/SNMPv2-TC.yang",
+                     "vendor/cisco/xe/1661/MIBS/SONET-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/TCP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/TOKENRING-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/TOKEN-RING-RMON-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/TUNNEL-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/UDP-MIB.yang",
+                     "vendor/cisco/xe/1661/MIBS/VPN-TC-STD-MIB.yang",
+
+                     "vendor/cisco/xe/1661/common-mpls-static-devs.yang",
+                     "vendor/cisco/xe/1661/common-mpls-static.yang",
+                     "vendor/cisco/xe/1661/common-mpls-types.yang",
+                     "vendor/cisco/xe/1661/confd_dyncfg.yang",
+                     "vendor/cisco/xe/1661/nvo-devs.yang",
+                     "vendor/cisco/xe/1661/nvo.yang",
+                     "vendor/cisco/xe/1661/oc-mapping-acl.yang",
+                     "vendor/cisco/xe/1661/pim.yang",
+                     "vendor/cisco/xe/1661/policy-attr.yang",
+                     "vendor/cisco/xe/1661/policy-types.yang",
+                     "vendor/cisco/xe/1661/tailf-cli-extensions.yang",
+                     "vendor/cisco/xe/1661/tailf-common-monitoring.yang",
+                     "vendor/cisco/xe/1661/tailf-common-query.yang",
+                     "vendor/cisco/xe/1661/tailf-common.yang",
+                     "vendor/cisco/xe/1661/tailf-confd-monitoring.yang",
+                     "vendor/cisco/xe/1661/tailf-meta-extensions.yang",
+                     "vendor/cisco/xe/1661/tailf-netconf-inactive.yang",
+                     "vendor/cisco/xe/1661/tailf-netconf-monitoring.yang",
+                     "vendor/cisco/xe/1661/tailf-netconf-query.yang",
+                     "vendor/cisco/xe/1661/tailf-netconf-transactions.yang",
+                     "vendor/cisco/xe/1661/tailf-rest-error.yang",
+                     "vendor/cisco/xe/1661/tailf-rest-query.yang",
+                     "vendor/cisco/xe/1661/tailf-xsd-types.yang"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "dependency": [
+    {
+      "name": "ietf",
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
+    },
+    {
+      "name": "openconfig",
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/openconfig_0_1_3.json"
+    }
+  ]
+}
diff --git a/profiles/bundles/cisco-ios-xe_16_6_2.json b/profiles/bundles/cisco-ios-xe_16_6_2.json
index ec18e6a64..0c8631c59 100644
--- a/profiles/bundles/cisco-ios-xe_16_6_2.json
+++ b/profiles/bundles/cisco-ios-xe_16_6_2.json
@@ -373,9 +373,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xe_16_7_1.json b/profiles/bundles/cisco-ios-xe_16_7_1.json
index 80e00a548..c63ebf74b 100644
--- a/profiles/bundles/cisco-ios-xe_16_7_1.json
+++ b/profiles/bundles/cisco-ios-xe_16_7_1.json
@@ -1,10 +1,10 @@
 {
-  "name": "cisco-ios-xe-1671",
+  "name": "cisco-ios-xe",
   "version": "16.7.1",
-  "core_version": "0.8.5",
+  "core_version": "0.6.2",
   "author": "Cisco",
   "copyright": "Cisco",
-  "description": "YDK bundle for Cisco IOS XE 16.7.1 models",
+  "description": "YDK bundle for Cisco IOS XE models",
   "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XE YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XE models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
   "models": {
     "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
@@ -359,9 +359,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xe_16_9_3.json b/profiles/bundles/cisco-ios-xe_16_9_3.json
index 8f06ffe64..e41aff45c 100644
--- a/profiles/bundles/cisco-ios-xe_16_9_3.json
+++ b/profiles/bundles/cisco-ios-xe_16_9_3.json
@@ -417,6 +417,8 @@
           }
         ]
       }
+    ],
+    "file":[
     ]
   },
   "dependency": [
diff --git a/profiles/bundles/cisco-ios-xr-701.json b/profiles/bundles/cisco-ios-xr-701.json
deleted file mode 100644
index 0b63a94d5..000000000
--- a/profiles/bundles/cisco-ios-xr-701.json
+++ /dev/null
@@ -1,1158 +0,0 @@
-{
-  "name": "cisco-ios-xr-701",
-  "version": "7.0.1",
-  "core_version": "0.8.6",
-  "author": "YDK Solutions",
-  "copyright": "YDK Solutions",
-  "description": "YDK bundle for Cisco IOS XR 7.0.1 models",
-  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XR YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XR models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
-  "models": {
-    "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
-    "git": [
-      {
-        "url": "https://github.com/YangModels/yang.git",
-        "commits": [
-          {
-            "file": [
-              "vendor/cisco/xr/701/Cisco-IOS-XR-alarmgr-server-oper-deviations.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-aaacore-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-diameter-base-mib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-diameter-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-diameter-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-diameter-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-lib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-lib-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-li-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-locald-admin-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-locald-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-locald-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-locald-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-nacm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-nacm-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-nacm-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-protocol-radius-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-protocol-radius-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-protocol-radius-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-protocol-radius-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-tacacs-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-tacacs-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-aaa-tacacs-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-accounting-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-alarmgr-server-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-alarmgr-server-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ascii-ltrace-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ascii-ltrace-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-asic-errors-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-asic-errors-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-ep-port-mode-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-ext-usb-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fab-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fab-health-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fab-health-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fia-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fsi-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-fsi-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-breakout-port-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-ep-breakout-port-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-ethctrl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-ethctrl-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-ethctrl-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-fca-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-fca-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-fca-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lc-pwrglide-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lpts-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-lpts-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-mlan-cmp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-netflow-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-np-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-np-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-prm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-ptp-pd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-ptp-pd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-ptp-pd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-qos-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-qos-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-qos-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-diag-admin-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-diag-admin-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-diag-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-diag-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-envmon-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-envmon-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-sc-invmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-xbar-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-xbar-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-xbar-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-xbar-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asr9k-xbar-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-common-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-atm-vcm-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-authenticated-variable-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-bundlemgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-bundlemgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-bundlemgr-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-bundlemgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-call-home-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cdp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cdp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cdp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cfgmgr-rollback-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ciscoapsmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ciscosonetmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clear-counters-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cli-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cli-diff-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cmproxy-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cmproxy-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-common-acl-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-cfgmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-cfgmgr-exec-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-cfgmgr-exec-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-cfgmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-mda-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-mibs-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-valid-ccv-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-valid-ccv-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-config-valid-ccv-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-ains-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-odu-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-odu-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-odu-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-odu-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-optics-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-optics-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-optics-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-otu-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-otu-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-controller-otu-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-cepki-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-mka-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-mka-if-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-mka-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-mka-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-secy-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-secy-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-mibs-ipsecflowmon-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-sam-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-sam-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-sam-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-ssh-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-ssh-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-ssh-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-ssh-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dot1x-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dot1x-if-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dot1x-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dot1x-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-icpe-ethernet-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-media-eth-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-media-eth-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-media-eth-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-media-eth-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-mpa-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-drivers-vpa-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dwdm-ui-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dwdm-ui-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dwdm-ui-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-eapol-if-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-eigrp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-eigrp-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-eigrp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-eigrp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-es-ace-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-es-acl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-es-acl-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-es-acl-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-es-acl-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-cfm-sat-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-link-oam-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-link-oam-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-link-oam-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-lldp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-lldp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-lldp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ethernet-lldp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Ethernet-SPAN-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-evpn-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-evpn-oper.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub6.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper-sub7.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-common-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-flashmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-flowspec-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-flowspec-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-flowspec-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fpd-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-freqsync-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-freqsync-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-freqsync-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-freqsync-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-freqsync-sat-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ha-eem-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ha-eem-policy-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ha-eem-policy-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-hw-module-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-hwmod-mpa-reload-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub10.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub11.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub12.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub6.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub7.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub8.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper-sub9.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-infra-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-sdacp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-sdacp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-sdacp-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-icpe-sdacp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-iedge4710-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-iedge4710-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-iedge4710-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-iedge4710-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ifmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ifmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ifmgr-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ifmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-igp-topodb-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-igp-topodb-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-alarm-logger-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-alarm-logger-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-alarm-logger-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-alarm-logger-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-ceredundancymib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-confcopymib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-correlator-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-correlator-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-correlator-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-dumper-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-dumper-exception-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-dumper-exception-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-dumper-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-dumper-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-fti-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-fti-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-fti-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-infra-clock-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-infra-clock-linux-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-infra-locale-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-ltrace-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-notification-log-mib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-nsr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-objmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-objmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-objmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-placed-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-policymgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-policymgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rcmd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rcmd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rcmd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rmf-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rmf-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rsi-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rsi-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rsi-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rsi-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rsi-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-rt-check-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-serg-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-serg-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-serg-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-serg-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-sla-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-sla-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-sla-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-statsd-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-statsd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-statsd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-statsd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-syslog-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-syslog-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-syslog-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-systemmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-tc-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-tc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-tc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-agent-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-agent-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-agent-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-agent-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-agent-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-infra-xtc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-installmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-installmgr-admin-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-installmgr-admin-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-installmgr-admin-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invproxy-hwmodule-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-bfd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-bfd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-bfd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-daps-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-daps-mib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-daps-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-daps-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-domain-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-domain-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-domain-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-v4-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-v4-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-v6-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-v6-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iarm-vrf-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-icmp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iep-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iep-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-iep-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-mobileip-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-mobileip-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-mobileip-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-ntp-admin-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-ntp-admin-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-ntp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-ntp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-ntp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-pfilter-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-pfilter-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-pfilter-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-pfilter-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-raw-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rib-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rib-ipv4-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rib-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rib-ipv6-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rip-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rip-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rip-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rsvp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rsvp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-rsvp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-sbfd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-sbfd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-sbfd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-static-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-static-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-static-ipv4-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-static-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-static-ipv6-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-tcp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ip-udp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ace-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-acl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-acl-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-acl-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-acl-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-arp-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-arp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-arp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-arp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-arp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-autorp-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-autorp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-autorp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-autorp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-oc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-oc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-bgp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-cinetd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dc-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dhcpd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dhcpd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dhcpd-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dhcpd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-dhcpd-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-filesystems-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-hsrp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-hsrp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-hsrp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-igmp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-igmp-dyn-tmpl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-igmp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-igmp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-io-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-io-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-io-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-io-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ma-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-mfwd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-msdp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ospf-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-pim-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-pim-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-pim-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-pim-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-ping-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-smiap-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-telnet-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-telnet-mgmt-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-traceroute-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-vrrp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-vrrp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv4-vrrp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ace-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-acl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-acl-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-acl-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-acl-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-io-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-io-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-io-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ma-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-nd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-nd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-nd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-nd-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-new-dhcpv6d-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-new-dhcpv6d-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ospfv3-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ospfv3-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ospfv3-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ospfv3-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-ping-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-smiap-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ipv6-traceroute-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-isis-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-kim-tpa-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2-eth-infra-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2rib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2rib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2rib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-l2vpn-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-keychain-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-keychain-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-keychain-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-keychain-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-mpp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-mpp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-mpp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-type6-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-type6-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-type6-server-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lib-type6-server-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-li-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-os-heap-summary-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-os-heap-summary-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-os-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-os-reboot-history-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lmp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lmp-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lmp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lmp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-ifib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-lib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-pa-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-pa-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-pre-ifib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-pre-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-pre-ifib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-lpts-punt-flowtrap-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-xml-ttyagent-cfg-deviations.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-object-tracking-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-object-tracking-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-object-tracking-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-object-tracking-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-perfmgmt-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-perfmgmt-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-perfmgmt-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-manageability-perfmgmt-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ems-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ems-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ems-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ipsla-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ipsla-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ipsla-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ipsla-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-ipsla-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-netconf-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-netconf-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-netconf-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-xml-ttyagent-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-xml-ttyagent-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-xml-ttyagent-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mdrv-lib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mediasvr-linux-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mediasvr-linux-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mirror-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mirror-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mirror-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-io-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-io-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-io-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-cfg-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-mldp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-mldp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-oper-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-ldp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-lsd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-lsd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-oam-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-oam-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-oam-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-oam-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-over-udp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-static-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-static-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-static-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub6.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub7.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper-sub8.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-te-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-vpn-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-vpn-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-mpls-vpn-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-shmem-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-shmem-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-shprocmem-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-nto-misc-shprocmem-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-opendns-deviceid-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-opticalmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-opticalotsmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-optics-driver-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-optics-driver-quad-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-optics-port-mode-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-otnifmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-parser-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-bng-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-subscriber-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-vrf-policy-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-vservice-ea-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-vservice-ea-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-vservice-mgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pbr-vservice-mgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-perf-meas-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-perf-meas-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-perf-meas-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-perf-meas-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfi-im-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfi-im-cmd-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfi-im-cmd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pfm-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ping-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-ng-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plat-chas-invmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-inventory-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-inventory-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-pifib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platform-pifib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pmengine-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pmengine-clear-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pmengine-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pmengine-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procthreadname-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procthreadname-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-policy-repository-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-policy-repository-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-policy-repository-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ea-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ea-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-fsm-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-ipcp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-ipcpiw-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-lcp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-ssrp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ppp-ma-syslog-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pppoe-ea-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pppoe-ea-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-prm-hwmod-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-prm-hwmod-profile-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-prm-hwmod-sr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-prm-server-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-prm-server-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procfind-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procfind-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procmem-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-procmem-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-qos-ma-bng-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-qos-ma-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-qos-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-qos-ma-sat-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-qos-mibs-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-reboot-history-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-remote-attestation-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rgmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rgmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rgmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rsi-agent-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rsi-agent-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sdr-invmgr-diag-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sdr-invmgr-diag-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sdr-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sdr-invmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-se-cgn-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-common-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-ms-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-srv6-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-srv6-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-srv6-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-segment-routing-srv6-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-copy-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-delete-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-filesystem-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-filesystem-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shellutil-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-show-fpd-loc-ng-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-show-fpd-loc-ng-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skp-qos-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skp-qos-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skp-qos-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skywarp-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skywarp-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-skywarp-netflow-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub6.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper-sub7.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-agent-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-bridgemib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-ciscopkimib-traps-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-ciscosensormib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-entityextmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-entitymib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-entitymib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-entitymib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-entstatemib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-frucontrolmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-ifmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-ifmib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-ifmib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-mib-rfmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-sensormib-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-sensormib-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-sensormib-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-syslogmib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-snmp-test-trap-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-cgn-nat64-stless-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-corehelper-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-install-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spirit-install-instmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-accounting-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-accounting-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-accounting-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-Subscriber-infra-subdb-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-infra-tmplmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-ipsub-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-ipsub-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-ipsub-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-pppoe-ma-cmd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-pppoe-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-pppoe-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-pppoe-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-session-mon-mibs-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-session-mon-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-session-mon-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-srg-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-srg-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-subscriber-srg-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-aaa-aaa-show.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-aaa-command-accounting.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-aaa-disaster-recovery.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-alarm-mgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-cm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-debug-trace.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ds.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-dumper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-entity-mib.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-entity-sensor-mib.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-entity-state-mib.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-entity-state-tc-mib.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-envmon-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-envmon-ui.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpdserv-ctrace.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd-service.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fpd-infra-cli-shhwfpd.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-hw-module.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-issu.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-led-mgr-ui.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-nto-misc-set-hostname.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-obfl-conf.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-obfl.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-pm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-rvm-mgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sdr-mgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-services.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ship.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-diag.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-inv.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-media.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-obfl.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-cm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-debug-agent.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-instagt.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-instmgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-vmm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sm-hw-mod.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-syslog.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-system.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-tacacs-show-tacacs.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-tacacs-tacacs-server.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-tacacs-test-tacacs.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-time-of-day-timezone.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-vm-mgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-wdmon.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysdb-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-syslog-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysmgr-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysmgr-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysmgr-oper.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tamsvcs-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tamsvcs-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-telemetry-model-driven-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-telemetry-model-driven-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-telemetry-model-driven-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-traceroute-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-traffmon-netflow-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-cmd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-management-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper-sub4.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper-sub5.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-server-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tty-vty-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-gre-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-gre-datatypes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-ip-ea-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-ip-ea-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-ip-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-ip-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-l2tun-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-l2tun-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-l2tun-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-l2tun-proto-mibs-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-nve-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-nve-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-nve-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-vpdn-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-vpdn-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tunnel-vpdn-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-types.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-arp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-grpc-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-if-bundle-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-if-ethernet-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-if-ip-address-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-if-mpls-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-if-tunnel-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-interface-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-lacp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-mpls-l3vpn-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-mpls-te-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-netconf-yang-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-bgp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-isis-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-ospf-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-ospfv3-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-rib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-router-static-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-rsvp-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-snmp-server-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-um-vrf-cfg.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-upgrade-fpd-admin-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-upgrade-fpd-ng-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-upgrade-fpd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-upgrade-fpd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-vservice-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wanphy-ui-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wanphy-ui-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wanphy-ui-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-watchd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wdsysmon-fd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wdsysmon-fd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wdsysmon-fd-proc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-wdsysmon-fd-proc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-zapdisk-act.yang",
-
-              "vendor/cisco/xr/701/cisco-semver.yang",
-              "vendor/cisco/xr/701/ccc.yang",
-              "vendor/cisco/xr/701/CISCO-ENTITY-FRU-CONTROL-MIB.yang",
-              "vendor/cisco/xr/701/fit.yang",
-              "vendor/cisco/xr/701/gaspp.yang",
-
-              "vendor/cisco/xr/701/INET-ADDRESS-MIB.yang",
-              "vendor/cisco/xr/701/IPV6-TC.yang",
-              "vendor/cisco/xr/701/modena_driver_types.yang",
-              "vendor/cisco/xr/701/modena_driver.yang",
-              "vendor/cisco/xr/701/nc-notifications.yang",
-              "vendor/cisco/xr/701/notifications.yang",
-
-              "vendor/cisco/xr/701/opertest1.yang",
-              "vendor/cisco/xr/701/SNMP-COMMUNITY-MIB.yang",
-              "vendor/cisco/xr/701/SNMP-FRAMEWORK-MIB.yang",
-              "vendor/cisco/xr/701/SNMP-MPD-MIB.yang",
-              "vendor/cisco/xr/701/SNMP-NOTIFICATION-MIB.yang",
-              "vendor/cisco/xr/701/SNMP-TARGET-MIB.yang",
-              "vendor/cisco/xr/701/SNMP-USER-BASED-SM-MIB.yang",
-              "vendor/cisco/xr/701/SNMPv2-MIB.yang",
-              "vendor/cisco/xr/701/SNMPv2-SMI.yang",
-              "vendor/cisco/xr/701/SNMPv2-TC.yang",
-              "vendor/cisco/xr/701/SNMP-VIEW-BASED-ACM-MIB.yang",
-              "vendor/cisco/xr/701/tailf-aaa.yang",
-              "vendor/cisco/xr/701/tailf-actions.yang",
-              "vendor/cisco/xr/701/tailf-cli-extensions.yang",
-              "vendor/cisco/xr/701/tailf-common-monitoring.yang",
-              "vendor/cisco/xr/701/tailf-common-query.yang",
-              "vendor/cisco/xr/701/tailf-common.yang",
-              "vendor/cisco/xr/701/tailf-confd-monitoring.yang",
-              "vendor/cisco/xr/701/tailf-meta-extensions.yang",
-              "vendor/cisco/xr/701/tailf-netconf-query.yang",
-              "vendor/cisco/xr/701/tailf-xsd-types.yang",
-              "vendor/cisco/xr/701/valtest.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asic-errors-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asic-errors-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-asic-errors-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-clns-isis-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-pl-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-crypto-macsec-pl-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-driver-fabric-plane-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-driver-fabric-plane-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-driver-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-driver-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-netflow-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-port-mapper-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dnx-port-mapper-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dpa-port-mapper-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-dpa-port-mapper-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-envmon-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-envmon-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-envmon-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-envmon-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fabhfr-mib-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fabric-fgid-stats-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fabric-fgid-stats-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fia-hw-profile-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fia-internal-tcam-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fia-internal-tcam-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fretta-bcm-dpa-npu-stats-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fretta-bcm-dpa-npu-stats-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-gnss-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-gnss-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-gnss-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-iedge4710-oper-sub3.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ikev2-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ikev2-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ikev2-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-augmented-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-augmented-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-augmented-oper-sub2.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-augmented-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-install-search-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-diag-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-invmgr-diag-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-keyring-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-keyring-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-keyring-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ledmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ledmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-xlnc-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-xlnc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-linux-xlnc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-http-lighttpd-yang-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-man-restconf-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ofa-dpt-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ofa-dpt-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ofa-npu-stats-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ofa-npu-stats-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platforms-ofa-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platforms-ofa-table-stats-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-platforms-ofa-table-stats-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plim-ether-stats-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-plim-ether-stats-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-pd-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-pd-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-ptp-pd-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-pwrmgmt-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rptiming-dti-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rptiming-dti-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rptiming-tmg-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-rptiming-tmg-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-syncc-controller-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-syncc-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-syncc-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-asic-errors-ael.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-card-mgr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-admin-exec.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-bridge.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-clear.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-debug.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-fdb.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-mac.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-mgmt-agent.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-mlap.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-reachable.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-sdr.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-serdes.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-sfp.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-statistics.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-summary.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-trace.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-trunk.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-vlan.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-external-usb.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-driver-sfe.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-mgr-fgid.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fretta-envmon-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fretta-envmon-ui.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-hw-module-xrv9k.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-uea-envmon-types.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-uea-envmon-ui.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-vm.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-zapdisk.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tmgctrl-dti-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tmgctrl-dti-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tmgctrl-tmg-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-tmgctrl-tmg-oper.yang",
-              "vendor/cisco/xr/701/canb_cli_clear.yang",
-              "vendor/cisco/xr/701/ntp.yang",
-              "vendor/cisco/xr/701/vplatform.yang",
-
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cofo-csi-ma-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cofo-csi-ma-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cofo-infra-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-cofo-infra-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-fib-cef-lba-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-hw-module-led-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-hwmod-bcc-disable-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-macsec-ctrlr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-macsec-ctrlr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-osa-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-osa-controller-optics-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-osa-controller-optics-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-osa-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-osa-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-otnsec-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-otnsec-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-otnsec-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-patch-panel-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-shelfmgr-act.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-slice-mgr-proxy-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spi-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-spi-invmgr-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sse-span-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sse-span-oper.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-clear.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-console.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-controllers.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-ethsw-esdma-cli.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-cxp-ncs6k.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-groups.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-mgr-fsdb-aggregator.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric-mgr-fsdb-server.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-fabric.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-obfl-clear.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sdm-diag.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sdr-connect.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-sdr-console.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-show-trace-slice-manager.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-sysadmin-usb.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-terminal-device-cfg.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-terminal-device-oper-sub1.yang",
-              "vendor/cisco/xr/701/Cisco-IOS-XR-terminal-device-oper.yang",
-
-              "vendor/cisco/xr/701/cpak_driver.yang",
-              "vendor/cisco/xr/701/cpak_driver_types.yang",
-              "vendor/cisco/xr/701/cxp_driver.yang",
-              "vendor/cisco/xr/701/cxp_driver_types.yang",
-              "vendor/cisco/xr/701/dual_gearbox_driver.yang",
-              "vendor/cisco/xr/701/dual_gearbox_driver_types.yang",
-              "vendor/cisco/xr/701/gearbox2_driver.yang",
-              "vendor/cisco/xr/701/gearbox2_driver_types.yang",
-              "vendor/cisco/xr/701/gearbox_driver.yang",
-              "vendor/cisco/xr/701/gearbox_driver_types.yang",
-              "vendor/cisco/xr/701/modena_driver.yang",
-              "vendor/cisco/xr/701/modena_driver_types.yang",
-              "vendor/cisco/xr/701/slice_control.yang",
-              "vendor/cisco/xr/701/slice_control_types.yang",
-              "vendor/cisco/xr/701/zen.yang"
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "dependency": [
-    {
-      "name": "ietf",
-      "version": "0.1.6",
-      "core_version": "0.8.6",
-      "uri": "file://profiles/bundles/ietf_0_1_6.json"
-    }
-  ]
-}
diff --git a/profiles/bundles/cisco-ios-xr-702.json b/profiles/bundles/cisco-ios-xr-702.json
deleted file mode 100644
index 9f04249c0..000000000
--- a/profiles/bundles/cisco-ios-xr-702.json
+++ /dev/null
@@ -1,1113 +0,0 @@
-{
-  "name": "cisco-ios-xr-702",
-  "version": "7.0.2",
-  "core_version": "0.8.6",
-  "author": "YDK Solutions",
-  "copyright": "YDK Solutions",
-  "description": "YDK bundle for Cisco IOS XR 7.0.2 models",
-  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XR YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XR models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
-  "models": {
-    "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
-    "git": [
-      {
-        "url": "https://github.com/YangModels/yang.git",
-        "commits": [
-          {
-            "file": [
-              "vendor/cisco/xr/702/Cisco-IOS-XR-alarmgr-server-oper-deviations.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-aaacore-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-diameter-base-mib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-diameter-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-diameter-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-diameter-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-lib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-lib-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-li-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-locald-admin-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-locald-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-locald-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-locald-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-nacm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-nacm-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-nacm-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-protocol-radius-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-protocol-radius-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-protocol-radius-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-protocol-radius-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-tacacs-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-tacacs-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-aaa-tacacs-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-accounting-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-alarmgr-server-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-alarmgr-server-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ascii-ltrace-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ascii-ltrace-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-asic-errors-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-asic-errors-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-ep-port-mode-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-ext-usb-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fab-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fab-health-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fab-health-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fia-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fsi-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-fsi-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-breakout-port-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-ep-breakout-port-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-ethctrl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-ethctrl-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-ethctrl-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-fca-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-fca-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-fca-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lc-pwrglide-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lpts-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-lpts-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-mlan-cmp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-netflow-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-np-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-np-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-prm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-ptp-pd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-ptp-pd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-ptp-pd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-qos-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-qos-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-qos-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-diag-admin-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-diag-admin-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-diag-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-diag-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-envmon-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-envmon-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-sc-invmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-xbar-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-xbar-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-xbar-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-xbar-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asr9k-xbar-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-common-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-atm-vcm-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-authenticated-variable-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-bundlemgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-bundlemgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-bundlemgr-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-bundlemgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-call-home-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cdp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cdp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cdp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cfgmgr-rollback-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ciscoapsmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ciscosonetmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clear-counters-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cli-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cli-diff-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cmproxy-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-cmproxy-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-common-acl-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-cfgmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-cfgmgr-exec-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-cfgmgr-exec-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-cfgmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-mda-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-mibs-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-valid-ccv-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-valid-ccv-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-config-valid-ccv-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-ains-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-odu-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-odu-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-odu-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-odu-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-optics-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-optics-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-optics-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-otu-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-otu-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-controller-otu-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-cepki-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-cepki-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-mka-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-mka-if-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-mka-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-mka-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-secy-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-secy-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-mibs-ipsecflowmon-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-sam-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-sam-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-sam-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-ssh-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-ssh-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-ssh-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-ssh-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dot1x-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dot1x-if-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dot1x-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dot1x-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-icpe-ethernet-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-media-eth-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-media-eth-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-media-eth-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-media-eth-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-mpa-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-drivers-vpa-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dwdm-ui-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dwdm-ui-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dwdm-ui-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-eapol-if-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-eigrp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-eigrp-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-eigrp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-eigrp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-es-ace-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-es-acl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-es-acl-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-es-acl-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-es-acl-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-cfm-sat-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-link-oam-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-link-oam-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-link-oam-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-lldp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-lldp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-lldp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ethernet-lldp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Ethernet-SPAN-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-evpn-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-evpn-oper.yang",
-
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub6.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper-sub7.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fib-common-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-flashmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-flowspec-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-flowspec-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-flowspec-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fpd-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-freqsync-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-freqsync-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-freqsync-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-freqsync-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-freqsync-sat-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ha-eem-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ha-eem-policy-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ha-eem-policy-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-hw-module-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-hwmod-mpa-reload-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub10.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub11.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub12.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub6.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub7.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub8.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper-sub9.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-infra-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-sdacp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-sdacp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-sdacp-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-icpe-sdacp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-iedge4710-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-iedge4710-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-iedge4710-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-iedge4710-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ifmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ifmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ifmgr-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ifmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-igp-topodb-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-igp-topodb-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-alarm-logger-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-alarm-logger-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-alarm-logger-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-alarm-logger-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-ceredundancymib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-confcopymib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-correlator-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-correlator-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-correlator-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-dumper-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-dumper-exception-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-dumper-exception-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-dumper-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-dumper-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-fti-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-fti-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-fti-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-infra-clock-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-infra-clock-linux-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-infra-locale-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-ltrace-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-notification-log-mib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-nsr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-objmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-objmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-objmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-placed-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-policymgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-policymgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rcmd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rcmd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rcmd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rmf-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rmf-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rsi-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rsi-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rsi-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rsi-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rsi-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-rt-check-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-serg-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-serg-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-serg-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-serg-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-sla-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-sla-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-sla-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-statsd-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-statsd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-statsd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-statsd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-syslog-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-syslog-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-syslog-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-systemmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-tc-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-tc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-tc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-agent-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-agent-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-agent-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-agent-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-agent-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-infra-xtc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-installmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-installmgr-admin-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-installmgr-admin-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-installmgr-admin-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invproxy-hwmodule-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-bfd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-bfd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-bfd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-daps-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-daps-mib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-daps-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-daps-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-domain-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-domain-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-domain-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-v4-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-v4-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-v6-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-v6-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iarm-vrf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-icmp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iep-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iep-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-iep-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-mobileip-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-mobileip-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-mobileip-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-ntp-admin-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-ntp-admin-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-ntp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-ntp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-ntp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-pfilter-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-pfilter-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-pfilter-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-pfilter-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-raw-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-ipv4-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-ipv6-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-ipv6-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rip-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rip-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rip-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rsvp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rsvp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rsvp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-sbfd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-sbfd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-sbfd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-static-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-static-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-static-ipv4-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-static-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-static-ipv6-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-tcp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-udp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ace-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-acl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-acl-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-acl-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-acl-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-arp-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-arp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-arp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-arp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-arp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-autorp-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-autorp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-autorp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-autorp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-oc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-oc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-bgp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-cinetd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dc-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dhcpd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dhcpd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dhcpd-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dhcpd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-dhcpd-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-filesystems-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-hsrp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-hsrp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-hsrp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-igmp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-igmp-dyn-tmpl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-igmp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-igmp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-io-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-io-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-io-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-io-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ma-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ma-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-mfwd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-msdp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ospf-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-pim-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-pim-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-pim-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-pim-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-ping-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-smiap-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-telnet-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-telnet-mgmt-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-traceroute-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-vrrp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-vrrp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv4-vrrp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ace-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-acl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-acl-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-acl-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-acl-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-io-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-io-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-io-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ma-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ma-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-nd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-nd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-nd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-nd-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-new-dhcpv6d-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-new-dhcpv6d-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ospfv3-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ospfv3-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ospfv3-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ospfv3-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-ping-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-smiap-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ipv6-traceroute-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-isis-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-kim-tpa-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2-eth-infra-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2rib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2rib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2rib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-l2vpn-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-keychain-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-keychain-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-keychain-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-keychain-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-mpp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-mpp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-mpp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-type6-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-type6-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-type6-server-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lib-type6-server-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-li-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-os-heap-summary-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-os-heap-summary-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-os-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-os-reboot-history-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lmp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lmp-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lmp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lmp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-ifib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-lib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-pa-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-pa-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-pre-ifib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-pre-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-pre-ifib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-lpts-punt-flowtrap-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-xml-ttyagent-cfg-deviations.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-object-tracking-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-object-tracking-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-object-tracking-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-object-tracking-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-perfmgmt-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-perfmgmt-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-perfmgmt-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-manageability-perfmgmt-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ems-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ems-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ems-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ipsla-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ipsla-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ipsla-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ipsla-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-ipsla-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-netconf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-netconf-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-netconf-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-xml-ttyagent-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-xml-ttyagent-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-xml-ttyagent-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mdrv-lib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mediasvr-linux-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mediasvr-linux-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mirror-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mirror-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mirror-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-io-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-io-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-io-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-cfg-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-mldp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-mldp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-oper-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-ldp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-lsd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-lsd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-oam-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-oam-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-oam-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-oam-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-over-udp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-static-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-static-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-static-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub6.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub7.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper-sub8.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-te-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-vpn-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-vpn-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-mpls-vpn-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-shmem-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-shmem-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-shprocmem-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-nto-misc-shprocmem-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-opendns-deviceid-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-opticalmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-opticalotsmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-optics-driver-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-optics-driver-quad-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-optics-port-mode-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-otnifmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-parser-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-bng-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-subscriber-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-vrf-policy-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-vservice-ea-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-vservice-ea-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-vservice-mgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pbr-vservice-mgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-perf-meas-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-perf-meas-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-perf-meas-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-perf-meas-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfi-im-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfi-im-cmd-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfi-im-cmd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pfm-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ping-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-ng-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plat-chas-invmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-inventory-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-inventory-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-pifib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-pifib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pmengine-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pmengine-clear-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pmengine-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pmengine-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procthreadname-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procthreadname-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-policy-repository-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-policy-repository-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-policy-repository-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ea-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ea-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-fsm-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-ipcp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-ipcpiw-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-lcp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-ssrp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ppp-ma-syslog-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pppoe-ea-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pppoe-ea-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-prm-hwmod-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-prm-hwmod-profile-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-prm-hwmod-sr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-prm-server-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-prm-server-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procfind-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procfind-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procmem-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-procmem-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-qos-ma-bng-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-qos-ma-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-qos-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-qos-ma-sat-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-qos-mibs-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-reboot-history-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-remote-attestation-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rgmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rgmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rgmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rsi-agent-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rsi-agent-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sdr-invmgr-diag-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sdr-invmgr-diag-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sdr-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sdr-invmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-se-cgn-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-common-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-ms-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-srv6-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-srv6-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-srv6-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-segment-routing-srv6-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-copy-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-delete-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-filesystem-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-filesystem-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-shellutil-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-show-fpd-loc-ng-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-show-fpd-loc-ng-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skp-qos-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skp-qos-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skp-qos-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skywarp-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skywarp-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-skywarp-netflow-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub6.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper-sub7.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-agent-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-bridgemib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-ciscopkimib-traps-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-ciscosensormib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-entityextmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-entitymib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-entitymib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-entitymib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-entstatemib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-frucontrolmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-ifmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-ifmib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-ifmib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-mib-rfmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-sensormib-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-sensormib-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-sensormib-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-syslogmib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-snmp-test-trap-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-cgn-nat64-stless-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-corehelper-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-install-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-spirit-install-instmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-accounting-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-accounting-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-accounting-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-Subscriber-infra-subdb-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-infra-tmplmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-ipsub-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-ipsub-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-ipsub-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-pppoe-ma-cmd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-pppoe-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-pppoe-ma-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-pppoe-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-session-mon-mibs-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-session-mon-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-session-mon-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-srg-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-srg-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-subscriber-srg-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-aaa-aaa-show.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-aaa-command-accounting.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-aaa-disaster-recovery.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-alarm-mgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-cm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-debug-trace.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ds.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-dumper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-entity-mib.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-entity-sensor-mib.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-entity-state-mib.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-entity-state-tc-mib.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-envmon-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-envmon-ui.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpdserv-ctrace.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd-service.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fpd-infra-cli-shhwfpd.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-hw-module.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-issu.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-led-mgr-ui.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-nto-misc-set-hostname.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-obfl-conf.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-obfl.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-pm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-rvm-mgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-sdr-mgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-services.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ship.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-diag.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-inv.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-media.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-obfl.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace-cm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace-debug-agent.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace-instagt.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace-instmgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace-vmm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-show-trace.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-sm-hw-mod.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-sm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-syslog.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-system.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-tacacs-show-tacacs.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-tacacs-tacacs-server.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-tacacs-test-tacacs.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-time-of-day-timezone.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-vm-mgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-wdmon.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysdb-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-syslog-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysmgr-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysmgr-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysmgr-oper.yang",
-
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tamsvcs-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tamsvcs-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-telemetry-model-driven-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-telemetry-model-driven-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-telemetry-model-driven-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-traceroute-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-traffmon-netflow-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-cmd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-management-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper-sub4.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper-sub5.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-server-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tty-vty-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-gre-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-gre-datatypes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-ip-ea-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-ip-ea-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-ip-ma-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-ip-ma-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-l2tun-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-l2tun-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-l2tun-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-l2tun-proto-mibs-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-nve-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-nve-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-nve-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-vpdn-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-vpdn-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tunnel-vpdn-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-types.yang",
-
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-arp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-grpc-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-arp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-bundle-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-ethernet-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-ip-address-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-mpls-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-tunnel-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-if-vrf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-interface-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-lacp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-mpls-l3vpn-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-mpls-te-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-netconf-yang-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-bgp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-isis-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-ospf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-ospfv3-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-rib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-router-static-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-rsvp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-snmp-server-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-traps-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-um-vrf-cfg.yang",
-
-              "vendor/cisco/xr/702/Cisco-IOS-XR-upgrade-fpd-admin-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-upgrade-fpd-ng-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-upgrade-fpd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-upgrade-fpd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-vservice-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wanphy-ui-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wanphy-ui-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wanphy-ui-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-watchd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wdsysmon-fd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wdsysmon-fd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wdsysmon-fd-proc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-wdsysmon-fd-proc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-zapdisk-act.yang",
-
-              "vendor/cisco/xr/702/cisco-semver.yang",
-              "vendor/cisco/xr/702/ccc.yang",
-              "vendor/cisco/xr/702/CISCO-ENTITY-FRU-CONTROL-MIB.yang",
-              "vendor/cisco/xr/702/fit.yang",
-              "vendor/cisco/xr/702/gaspp.yang",
-
-              "vendor/cisco/xr/702/INET-ADDRESS-MIB.yang",
-              "vendor/cisco/xr/702/IPV6-TC.yang",
-              "vendor/cisco/xr/702/modena_driver_types.yang",
-              "vendor/cisco/xr/702/modena_driver.yang",
-              "vendor/cisco/xr/702/nc-notifications.yang",
-              "vendor/cisco/xr/702/notifications.yang",
-
-              "vendor/cisco/xr/702/opertest1.yang",
-              "vendor/cisco/xr/702/SNMP-COMMUNITY-MIB.yang",
-              "vendor/cisco/xr/702/SNMP-FRAMEWORK-MIB.yang",
-              "vendor/cisco/xr/702/SNMP-MPD-MIB.yang",
-              "vendor/cisco/xr/702/SNMP-NOTIFICATION-MIB.yang",
-              "vendor/cisco/xr/702/SNMP-TARGET-MIB.yang",
-              "vendor/cisco/xr/702/SNMP-USER-BASED-SM-MIB.yang",
-              "vendor/cisco/xr/702/SNMPv2-MIB.yang",
-              "vendor/cisco/xr/702/SNMPv2-SMI.yang",
-              "vendor/cisco/xr/702/SNMPv2-TC.yang",
-              "vendor/cisco/xr/702/SNMP-VIEW-BASED-ACM-MIB.yang",
-              "vendor/cisco/xr/702/tailf-aaa.yang",
-              "vendor/cisco/xr/702/tailf-actions.yang",
-              "vendor/cisco/xr/702/tailf-cli-extensions.yang",
-              "vendor/cisco/xr/702/tailf-common-monitoring.yang",
-              "vendor/cisco/xr/702/tailf-common-query.yang",
-              "vendor/cisco/xr/702/tailf-common.yang",
-              "vendor/cisco/xr/702/tailf-confd-monitoring.yang",
-              "vendor/cisco/xr/702/tailf-meta-extensions.yang",
-              "vendor/cisco/xr/702/tailf-netconf-query.yang",
-              "vendor/cisco/xr/702/tailf-xsd-types.yang",
-              "vendor/cisco/xr/702/valtest.yang",
-
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asic-errors-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asic-errors-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-asic-errors-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-clns-isis-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-pl-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-crypto-macsec-pl-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-driver-fabric-plane-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-driver-fabric-plane-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-driver-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-driver-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-netflow-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-port-mapper-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dnx-port-mapper-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dpa-port-mapper-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-dpa-port-mapper-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-envmon-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-envmon-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-envmon-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-envmon-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fabhfr-mib-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fabric-fgid-stats-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fabric-fgid-stats-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fia-hw-profile-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fia-internal-tcam-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fia-internal-tcam-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fretta-bcm-dpa-npu-stats-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-fretta-bcm-dpa-npu-stats-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-gnss-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-gnss-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-gnss-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-iedge4710-oper-sub3.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ikev2-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ikev2-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ikev2-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-augmented-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-augmented-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-augmented-oper-sub2.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-augmented-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-install-search-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-diag-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-invmgr-diag-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ip-rib-iid-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-keyring-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-keyring-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-keyring-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ledmgr-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ledmgr-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-xlnc-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-xlnc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-linux-xlnc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-http-lighttpd-yang-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-man-restconf-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ofa-dpt-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ofa-dpt-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ofa-npu-stats-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ofa-npu-stats-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-event-history-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platform-event-history-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platforms-ofa-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platforms-ofa-table-stats-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-platforms-ofa-table-stats-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plim-ether-stats-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-plim-ether-stats-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-pd-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-pd-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-ptp-pd-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-pwrmgmt-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rptiming-dti-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rptiming-dti-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rptiming-tmg-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-rptiming-tmg-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-syncc-controller-cfg.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-syncc-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-syncc-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-asic-errors-ael.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-asr9k-envmon-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-asr9k-envmon-ui.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-card-mgr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-clear-asr9k.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-controllers-asr9k.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-admin-exec.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-bridge.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-clear.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-cli-asr9k.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-debug.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-fdb.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-mac.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-mgmt-agent.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-mlap.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-reachable.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-sdr.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-serdes.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-sfp.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-statistics.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-summary.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-trace.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-trunk.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-ethsw-esdma-vlan.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-external-usb.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fabric-driver-sfe.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fabric-mgr-fgid.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fabric-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fretta-envmon-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-fretta-envmon-ui.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-hw-module-xrv9k.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-uea-envmon-types.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-uea-envmon-ui.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-vm.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-sysadmin-zapdisk.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-system-reboot-act.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tmgctrl-dti-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tmgctrl-dti-oper.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tmgctrl-tmg-oper-sub1.yang",
-              "vendor/cisco/xr/702/Cisco-IOS-XR-tmgctrl-tmg-oper.yang",
-              "vendor/cisco/xr/702/canb_cli_clear.yang",
-              "vendor/cisco/xr/702/ntp.yang",
-              "vendor/cisco/xr/702/vplatform.yang"
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "dependency": [
-    {
-      "name": "ietf",
-      "version": "0.1.6",
-      "core_version": "0.8.6",
-      "uri": "file://profiles/bundles/ietf_0_1_6.json"
-    }
-  ]
-}
diff --git a/profiles/bundles/cisco-ios-xr_0_1_0.json b/profiles/bundles/cisco-ios-xr_0_1_0.json
new file mode 100644
index 000000000..02e51b2a3
--- /dev/null
+++ b/profiles/bundles/cisco-ios-xr_0_1_0.json
@@ -0,0 +1,422 @@
+{
+   "name":"cisco-ios-xr",
+   "description":"YDK bundle for Cisco IOS XR models",
+   "version":"0.1.0",
+   "core_version": "0.5.0",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "models":{
+      "_descr_git":"Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+      "git":[
+         {
+            "url":"https://github.com/YangModels/yang.git",
+            "commits":[
+               {
+                  "commitid":"ddf208f3fa265e9eb7656abe3fc3f110479d329b",
+                  "file":[
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-Ethernet-SPAN-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-lib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-locald-admin-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-locald-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-locald-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-locald-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-protocol-radius-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-protocol-radius-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-protocol-radius-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-protocol-radius-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-tacacs-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-tacacs-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-aaa-tacacs-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-netflow-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-policymgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-asr9k-qos-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-common-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-atm-vcm-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-bundlemgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-bundlemgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-bundlemgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-bundlemgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-cdp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-cdp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-cdp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-clns-isis-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-clns-isis-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-clns-isis-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-clns-isis-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-cmproxy-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-cmproxy-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-common-acl-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-config-mda-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-config-mibs-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-optics-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-optics-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-optics-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-otu-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-otu-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-controller-otu-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-sam-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-sam-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-sam-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-ssh-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-ssh-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-crypto-ssh-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-driver-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-driver-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-dnx-netflow-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-drivers-media-eth-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-drivers-media-eth-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-drivers-media-eth-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-cfm-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-link-oam-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-link-oam-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-link-oam-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-lldp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-lldp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ethernet-lldp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fib-common-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fib-common-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fib-common-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fib-common-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fib-common-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fretta-bcm-dpa-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-fretta-bcm-dpa-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ha-eem-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ha-eem-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ha-eem-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub6.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper-sub7.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-icpe-infra-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ifmgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ifmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ifmgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ifmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-alarm-logger-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-alarm-logger-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-alarm-logger-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-alarm-logger-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-ceredundancymib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-dumper-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-infra-clock-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-infra-clock-linux-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-infra-locale-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-objmgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-objmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-objmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-policymgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-policymgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-policymgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rcmd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rcmd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rcmd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rmf-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rmf-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rsi-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rsi-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rsi-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rsi-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-rsi-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-sla-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-sla-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-sla-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-statsd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-statsd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-statsd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-syslog-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-syslog-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-syslog-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-infra-systemmib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-invmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-invmgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-invmgr-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-invmgr-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-invmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-bfd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-bfd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-bfd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-domain-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-domain-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-domain-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-iarm-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-iep-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-iep-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-iep-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-ntp-admin-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-ntp-admin-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-ntp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-ntp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-ntp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-pfilter-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-pfilter-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-pfilter-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rib-ipv4-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rib-ipv4-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rib-ipv6-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rib-ipv6-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rsvp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rsvp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-rsvp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-static-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-tcp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ip-udp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ace-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-acl-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-acl-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-acl-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-acl-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-arp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-arp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-arp-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-arp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-bgp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-bgp-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-bgp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-bgp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-io-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-io-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-io-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-io-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ma-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ma-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ma-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ma-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ospf-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ospf-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-ospf-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-telnet-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv4-telnet-mgmt-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ace-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-acl-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-acl-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-acl-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-acl-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-io-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-io-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-io-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ma-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ma-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ma-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ma-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-nd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-nd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-nd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-nd-subscriber-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-new-dhcpv6d-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ospfv3-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ospfv3-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ipv6-ospfv3-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2-eth-infra-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-l2vpn-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-keychain-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-keychain-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-keychain-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-mpp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-mpp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lib-mpp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-linux-os-reboot-history-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-linux-os-reboot-history-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lpts-lib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-lpts-pre-ifib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-man-ems-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-man-netconf-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-man-xml-ttyagent-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-man-xml-ttyagent-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-man-xml-ttyagent-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-cfg-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-oper-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-ldp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-lsd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-lsd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-lsd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-oam-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-static-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-static-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-static-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub6.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub7.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-headless-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-headless-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-lldp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-pi-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-pi-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-policymgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-qos-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-qos-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-qos-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs5500-qos-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-nto-misc-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-nto-misc-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-nto-misc-shprocmem-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-nto-misc-shprocmem-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-parser-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pbr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pbr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pbr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pfi-im-cmd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pfi-im-cmd-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pfi-im-cmd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-plat-chas-invmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-plat-chas-invmgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-plat-chas-invmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pmengine-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pmengine-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-pmengine-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-policy-repository-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-policy-repository-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-policy-repository-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-procmem-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-procmem-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-qos-ma-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-qos-ma-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-qos-ma-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-rgmgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-rgmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-rgmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-sdr-invmgr-diag-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-sdr-invmgr-diag-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-sdr-invmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-segment-routing-ms-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-segment-routing-ms-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-segment-routing-ms-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-shellutil-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-shellutil-filesystem-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-shellutil-filesystem-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-shellutil-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-shellutil-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-skp-policymgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-skp-qos-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper-sub6.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-agent-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-entitymib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-entstatemib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-frucontrolmib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-ifmib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-ifmib-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-ifmib-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-snmp-syslogmib-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-spirit-corehelper-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-spirit-install-instmgr-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-subscriber-infra-tmplmgr-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-traffmon-netflow-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-cmd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-cmd-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-datatypes.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-management-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper-sub2.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper-sub3.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper-sub4.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper-sub5.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-server-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-tty-vty-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-types.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wanphy-ui-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wanphy-ui-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wanphy-ui-oper.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-watchd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wd-cfg.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wdsysmon-fd-oper-sub1.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-wdsysmon-fd-oper.yang"
+                  ]
+               },
+               {
+                  "commitid":"6a9316e7b527ff8225b6a0f03685e0977aedf736",
+                  "file":[
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-mpls-te-oper-sub8.yang",
+                     "vendor/cisco/xr/600/Cisco-IOS-XR-ncs1k-mxp-lldp-oper-sub1.yang"
+                  ]
+               }
+            ]
+         }
+      ]
+   },
+   "dependency":[
+      {
+         "name":"ietf",
+         "version":"0.1.0",
+         "core_version":"0.5.0",
+         "uri":"file://profiles/bundles/ietf_0_1_0.json"
+      }
+   ]
+}
diff --git a/profiles/bundles/cisco-ios-xr_6_1_1.json b/profiles/bundles/cisco-ios-xr_6_1_1.json
index f5cd04c81..c5694e1dc 100644
--- a/profiles/bundles/cisco-ios-xr_6_1_1.json
+++ b/profiles/bundles/cisco-ios-xr_6_1_1.json
@@ -580,15 +580,15 @@
    "dependency":[
       {
          "name":"ietf",
-         "version":"0.1.5",
+         "version":"0.1.1",
          "core_version":"0.5.1",
-         "uri":"file://profiles/bundles/ietf_0_1_5.json"
+         "uri":"file://profiles/bundles/ietf_0_1_1.json"
       },
       {
          "name":"openconfig",
-         "version":"0.1.3",
+         "version":"0.1.1",
          "core_version":"0.5.1",
-         "uri":"file://profiles/bundles/openconfig_0_1_3.json"
+         "uri":"file://profiles/bundles/openconfig_0_1_1.json"
       }
    ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_1_2.json b/profiles/bundles/cisco-ios-xr_6_1_2.json
index d35221a63..87da8b5bb 100644
--- a/profiles/bundles/cisco-ios-xr_6_1_2.json
+++ b/profiles/bundles/cisco-ios-xr_6_1_2.json
@@ -604,15 +604,15 @@
    "dependency":[
       {
          "name":"ietf",
-         "version":"0.1.5",
-         "core_version":"0.8.5",
-         "uri":"file://profiles/bundles/ietf_0_1_5.json"
+         "version":"0.1.1",
+         "core_version":"0.5.1",
+         "uri":"file://profiles/bundles/ietf_0_1_1.json"
       },
       {
          "name":"openconfig",
-         "version":"0.1.3",
-         "core_version":"0.8.5",
-         "uri":"file://profiles/bundles/openconfig_0_1_3.json"
+         "version":"0.1.1",
+         "core_version":"0.5.1",
+         "uri":"file://profiles/bundles/openconfig_0_1_1.json"
       }
    ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_2_1.json b/profiles/bundles/cisco-ios-xr_6_2_1.json
index 484d350bb..d66ec2c96 100644
--- a/profiles/bundles/cisco-ios-xr_6_2_1.json
+++ b/profiles/bundles/cisco-ios-xr_6_2_1.json
@@ -711,15 +711,15 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.1",
+      "core_version": "0.5.1",
+      "uri": "file://profiles/bundles/ietf_0_1_1.json"
     },
     {
       "name": "openconfig",
-      "version": "0.1.3",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/openconfig_0_1_3.json"
+      "version": "0.1.2",
+      "core_version": "0.5.4",
+      "uri": "file://profiles/bundles/openconfig_0_1_2.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_2_2.json b/profiles/bundles/cisco-ios-xr_6_2_2.json
index 925c4c830..b18bc76a5 100644
--- a/profiles/bundles/cisco-ios-xr_6_2_2.json
+++ b/profiles/bundles/cisco-ios-xr_6_2_2.json
@@ -731,14 +731,14 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     },
     {
       "name": "openconfig",
       "version": "0.1.3",
-      "core_version": "0.8.5",
+      "core_version": "0.6.0",
       "uri": "file://profiles/bundles/openconfig_0_1_3.json"
     }
   ]
diff --git a/profiles/bundles/cisco-ios-xr_6_3_1.json b/profiles/bundles/cisco-ios-xr_6_3_1.json
index b49db25bd..32205e906 100644
--- a/profiles/bundles/cisco-ios-xr_6_3_1.json
+++ b/profiles/bundles/cisco-ios-xr_6_3_1.json
@@ -1,7 +1,7 @@
 {
   "name": "cisco-ios-xr",
   "version": "6.3.1",
-  "core_version": "0.8.5",
+  "core_version": "0.6.1",
   "author": "Cisco",
   "copyright": "Cisco",
   "description": "YDK bundle for Cisco IOS XR models",
@@ -778,9 +778,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5-post2",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5_post2.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_3_2.json b/profiles/bundles/cisco-ios-xr_6_3_2.json
index 0112db07c..1299cca4c 100644
--- a/profiles/bundles/cisco-ios-xr_6_3_2.json
+++ b/profiles/bundles/cisco-ios-xr_6_3_2.json
@@ -924,9 +924,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5-post2",
-      "core_version": "0.7.3",
-      "uri": "file://profiles/bundles/ietf_0_1_5_post2.json"
+      "version": "0.1.5",
+      "core_version": "0.7.1",
+      "uri": "file://profiles/bundles/ietf_0_1_5.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_4_1.json b/profiles/bundles/cisco-ios-xr_6_4_1.json
index 29751b488..bfe369c29 100644
--- a/profiles/bundles/cisco-ios-xr_6_4_1.json
+++ b/profiles/bundles/cisco-ios-xr_6_4_1.json
@@ -894,9 +894,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5-post2",
-      "core_version": "0.7.3",
-      "uri": "file://profiles/bundles/ietf_0_1_5_post2.json"
+      "version": "0.1.5-post1",
+      "core_version": "0.7.2",
+      "uri": "file://profiles/bundles/ietf_0_1_5_post1.json"
     }
   ]
 }
diff --git a/profiles/bundles/cisco-ios-xr_6_7_3.json b/profiles/bundles/cisco-ios-xr_6_7_3.json
deleted file mode 100644
index 109db9df3..000000000
--- a/profiles/bundles/cisco-ios-xr_6_7_3.json
+++ /dev/null
@@ -1,993 +0,0 @@
-{
-  "name": "cisco-ios-xr",
-  "version": "6.7.3",
-  "core_version": "0.8.6",
-  "author": "YDK Solutions",
-  "copyright": "YDK Solutions",
-  "description": "YDK bundle for Cisco IOS XR 6.7.3 models",
-  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for Cisco IOS XR YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for Cisco IOS XR models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
-  "models": {
-    "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
-    "git": [
-      {
-        "url": "https://github.com/YangModels/yang.git",
-        "commits": [
-          {
-            "commitid": "78c79db80fd45b01199df54fadf5ec635e556f60",
-            "file": [
-              "vendor/cisco/xr/673/Cisco-IOS-XR-alarmgr-server-oper-deviations.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-aaacore-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-diameter-base-mib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-diameter-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-diameter-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-diameter-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-lib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-lib-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-li-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-locald-admin-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-locald-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-locald-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-locald-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-nacm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-nacm-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-nacm-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-protocol-radius-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-protocol-radius-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-protocol-radius-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-protocol-radius-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-tacacs-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-tacacs-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-aaa-tacacs-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-accounting-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-alarmgr-server-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-alarmgr-server-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ascii-ltrace-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ascii-ltrace-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-asic-errors-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-asic-errors-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-ep-port-mode-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-ext-usb-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fab-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fab-health-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fab-health-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fia-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fsi-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-fsi-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-breakout-port-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-ep-breakout-port-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-ethctrl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-ethctrl-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-ethctrl-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-fca-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-fca-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-fca-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lc-pwrglide-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lpts-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-lpts-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-mlan-cmp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-netflow-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-np-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-np-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-prm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-ptp-pd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-ptp-pd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-ptp-pd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-qos-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-qos-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-qos-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-diag-admin-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-diag-admin-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-diag-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-diag-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-envmon-admin-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-envmon-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-envmon-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-invmgr-admin-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-sc-invmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-xbar-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-xbar-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-xbar-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-xbar-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-asr9k-xbar-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-common-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-atm-vcm-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-authenticated-variable-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-bundlemgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-bundlemgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-bundlemgr-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-bundlemgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-call-home-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cdp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cdp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cdp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cfgmgr-rollback-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ciscoapsmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ciscosonetmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clear-counters-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cli-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cli-diff-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clns-isis-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clns-isis-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clns-isis-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clns-isis-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-clns-isis-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cmproxy-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-cmproxy-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-common-acl-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-cfgmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-cfgmgr-exec-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-cfgmgr-exec-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-cfgmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-mda-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-mibs-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-valid-ccv-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-valid-ccv-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-config-valid-ccv-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-ains-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-odu-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-odu-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-odu-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-odu-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-optics-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-optics-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-optics-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-otu-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-otu-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-controller-otu-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-cepki-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-cepki-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-mka-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-mka-if-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-mka-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-mka-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-secy-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-macsec-secy-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-mibs-ipsecflowmon-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-sam-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-sam-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-sam-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-ssh-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-ssh-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-ssh-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-crypto-ssh-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dot1x-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dot1x-if-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dot1x-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dot1x-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-icpe-ethernet-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-media-eth-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-media-eth-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-media-eth-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-media-eth-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-mpa-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-drivers-vpa-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dwdm-ui-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dwdm-ui-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-dwdm-ui-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-eapol-if-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-eigrp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-eigrp-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-eigrp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-eigrp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-es-ace-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-es-acl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-es-acl-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-es-acl-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-es-acl-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-cfm-sat-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-link-oam-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-link-oam-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-link-oam-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-lldp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-lldp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-lldp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ethernet-lldp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Ethernet-SPAN-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-evpn-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-evpn-oper.yang",
-
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub6.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper-sub7.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fib-common-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-flashmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-flowspec-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-flowspec-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-flowspec-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-fpd-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-freqsync-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-freqsync-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-freqsync-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-freqsync-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-freqsync-sat-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ha-eem-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ha-eem-policy-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ha-eem-policy-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-hw-module-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-hwmod-mpa-reload-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub10.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub11.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub12.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub6.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub7.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub8.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper-sub9.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-infra-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-sdacp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-sdacp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-sdacp-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-icpe-sdacp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-iedge4710-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-iedge4710-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-iedge4710-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-iedge4710-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ifmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ifmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ifmgr-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ifmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-igp-topodb-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-igp-topodb-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-alarm-logger-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-alarm-logger-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-alarm-logger-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-alarm-logger-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-ceredundancymib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-confcopymib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-correlator-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-correlator-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-correlator-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-dumper-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-dumper-exception-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-dumper-exception-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-dumper-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-dumper-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-fti-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-fti-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-fti-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-infra-clock-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-infra-clock-linux-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-infra-locale-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-ltrace-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-notification-log-mib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-nsr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-objmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-objmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-objmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-placed-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-policymgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-policymgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rcmd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rcmd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rcmd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rmf-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rmf-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rsi-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rsi-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rsi-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rsi-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rsi-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-rt-check-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-serg-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-serg-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-serg-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-serg-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-sla-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-sla-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-sla-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-statsd-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-statsd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-statsd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-statsd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-syslog-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-syslog-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-syslog-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-systemmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-tc-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-tc-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-tc-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-agent-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-agent-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-agent-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-agent-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-agent-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-infra-xtc-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-install-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-install-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-install-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-installmgr-admin-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-installmgr-admin-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-installmgr-admin-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-installmgr-admin-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-invproxy-hwmodule-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-bfd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-bfd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-bfd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-daps-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-daps-mib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-daps-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-daps-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-domain-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-domain-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-domain-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-v4-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-v4-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-v6-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-v6-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iarm-vrf-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-icmp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iep-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iep-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-iep-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-mobileip-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-mobileip-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-mobileip-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-ntp-admin-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-ntp-admin-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-ntp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-ntp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-ntp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-pfilter-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-pfilter-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-pfilter-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-pfilter-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-raw-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-ipv4-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-ipv6-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rib-ipv6-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rip-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rip-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rip-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rsvp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rsvp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-rsvp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-sbfd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-sbfd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-sbfd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-static-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-static-ipv4-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-static-ipv4-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-static-ipv6-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-static-ipv6-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-tcp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ip-udp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ace-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-acl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-acl-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-acl-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-acl-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-arp-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-arp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-arp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-arp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-arp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-autorp-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-autorp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-autorp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-autorp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-oc-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-oc-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-bgp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-cinetd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dc-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dhcpd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dhcpd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dhcpd-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dhcpd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-dhcpd-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-filesystems-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-hsrp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-hsrp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-hsrp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-igmp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-igmp-dyn-tmpl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-igmp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-igmp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-io-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-io-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-io-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-io-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ma-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ma-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-mfwd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-msdp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ospf-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-pim-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-pim-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-pim-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-pim-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-ping-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-smiap-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-telnet-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-telnet-mgmt-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-traceroute-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-vrrp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-vrrp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv4-vrrp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ace-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-acl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-acl-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-acl-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-acl-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-io-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-io-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-io-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ma-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ma-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ma-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-nd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-nd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-nd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-nd-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-new-dhcpv6d-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-new-dhcpv6d-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-new-dhcpv6d-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ospfv3-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ospfv3-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ospfv3-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ospfv3-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-ping-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-smiap-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ipv6-traceroute-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-isis-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-kim-tpa-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2-eth-infra-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2rib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2rib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2rib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-l2vpn-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-keychain-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-keychain-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-keychain-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-keychain-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-mpp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-mpp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-mpp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-type6-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-type6-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-type6-server-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lib-type6-server-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-li-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-linux-os-heap-summary-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-linux-os-heap-summary-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-linux-os-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-linux-os-reboot-history-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lmp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lmp-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lmp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lmp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-ifib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-lib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-pa-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-pa-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-pre-ifib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-pre-ifib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-pre-ifib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-lpts-punt-flowtrap-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-xml-ttyagent-cfg-deviations.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-object-tracking-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-object-tracking-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-object-tracking-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-object-tracking-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-perfmgmt-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-perfmgmt-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-perfmgmt-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-manageability-perfmgmt-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ems-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ems-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ems-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ipsla-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ipsla-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ipsla-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ipsla-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-ipsla-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-netconf-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-netconf-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-netconf-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-xml-ttyagent-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-xml-ttyagent-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-man-xml-ttyagent-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mdrv-lib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mediasvr-linux-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mediasvr-linux-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mirror-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mirror-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mirror-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-io-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-io-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-io-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-cfg-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-mldp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-mldp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-oper-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-ldp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-lsd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-lsd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-oam-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-oam-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-oam-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-oam-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-over-udp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-static-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-static-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-static-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub6.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub7.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper-sub8.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-te-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-vpn-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-vpn-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-mpls-vpn-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ncs5k-fea-pfilter-nonatomic-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-shmem-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-shmem-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-shprocmem-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-nto-misc-shprocmem-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-opendns-deviceid-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-opticalmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-opticalotsmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-optics-driver-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-optics-driver-quad-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-optics-port-mode-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-otnifmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-parser-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-bng-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-subscriber-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-vrf-policy-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-vservice-ea-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-vservice-ea-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-vservice-mgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pbr-vservice-mgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-perf-meas-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-perf-meas-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-perf-meas-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-perf-meas-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfi-im-cmd-ctrlr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfi-im-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfi-im-cmd-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfi-im-cmd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pfm-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ping-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-ng-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-ng-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-plat-chas-invmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-inventory-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-inventory-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-pifib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-platform-pifib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pmengine-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pmengine-clear-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pmengine-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pmengine-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procthreadname-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procthreadname-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-policy-repository-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-policy-repository-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-policy-repository-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ea-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ea-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-fsm-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-ipcp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-ipcpiw-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-lcp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-ssrp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ppp-ma-syslog-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pppoe-ea-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-pppoe-ea-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-prm-hwmod-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-prm-hwmod-profile-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-prm-hwmod-sr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-prm-server-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-prm-server-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procfind-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procfind-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procmem-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-procmem-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ptp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ptp-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ptp-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-ptp-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-qos-ma-bng-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-qos-ma-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-qos-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-qos-ma-sat-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-qos-mibs-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-reboot-history-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-reboot-history-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-remote-attestation-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-rgmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-rgmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-rgmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-rsi-agent-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-rsi-agent-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sdr-invmgr-diag-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sdr-invmgr-diag-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sdr-invmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sdr-invmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-se-cgn-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-common-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-ms-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-srv6-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-srv6-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-srv6-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-segment-routing-srv6-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-copy-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-delete-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-filesystem-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-filesystem-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-shellutil-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-show-fpd-loc-ng-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-show-fpd-loc-ng-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skp-qos-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skp-qos-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skp-qos-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skywarp-netflow-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skywarp-netflow-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-skywarp-netflow-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub6.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper-sub7.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-agent-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-bridgemib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-ciscopkimib-traps-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-ciscosensormib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-entityextmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-entitymib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-entitymib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-entitymib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-entstatemib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-frucontrolmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-ifmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-ifmib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-ifmib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-mib-rfmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-sensormib-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-sensormib-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-sensormib-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-syslogmib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-snmp-test-trap-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-cgn-nat64-stless-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-corehelper-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-install-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-spirit-install-instmgr-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-accounting-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-accounting-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-accounting-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Subscriber-infra-subdb-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-Subscriber-infra-subdb-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-infra-tmplmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-ipsub-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-ipsub-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-ipsub-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-pppoe-ma-cmd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-pppoe-ma-gbl-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-pppoe-ma-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-pppoe-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-session-mon-mibs-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-session-mon-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-session-mon-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-srg-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-srg-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-subscriber-srg-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-aaa-aaa-show.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-aaa-command-accounting.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-aaa-disaster-recovery.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-alarm-mgr.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-cm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-debug-trace.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-ds.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-dumper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-entity-mib.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-entity-sensor-mib.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-entity-state-mib.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-entity-state-tc-mib.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-envmon-types.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-envmon-ui.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-fm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpdserv-ctrace.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd-service.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-fpd-infra-cli-fpd.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-fpd-infra-cli-shhwfpd.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-hw-module.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-issu.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-led-mgr-ui.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-nto-misc-set-hostname.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-obfl-conf.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-obfl.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-pm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-rvm-mgr.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-sdr-mgr.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-services.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-ship.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-diag.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-inv.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-media.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-obfl.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace-cm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace-debug-agent.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace-instagt.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace-instmgr.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace-vmm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-show-trace.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-sm-hw-mod.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-sm.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-syslog.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-system.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-tacacs-show-tacacs.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-tacacs-tacacs-server.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-tacacs-test-tacacs.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-time-of-day-timezone.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-types.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-vm-mgr.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysadmin-wdmon.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysdb-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-syslog-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysmgr-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysmgr-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysmgr-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-sysmgr-oper.yang",
-              
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tamsvcs-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tamsvcs-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-telemetry-model-driven-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-telemetry-model-driven-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-telemetry-model-driven-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-traceroute-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-traffmon-netflow-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-cmd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-cmd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-management-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper-sub2.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper-sub3.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper-sub4.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper-sub5.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-server-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tty-vty-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-gre-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-gre-datatypes.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-ip-ea-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-ip-ea-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-ip-ma-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-ip-ma-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-l2tun-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-l2tun-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-l2tun-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-l2tun-proto-mibs-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-nve-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-nve-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-nve-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-vpdn-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-vpdn-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-tunnel-vpdn-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-types.yang",
-
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-arp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-grpc-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-arp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-bundle-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-ethernet-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-ip-address-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-mpls-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-tunnel-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-if-vrf-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-interface-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-lacp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-mpls-l3vpn-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-mpls-lsd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-mpls-te-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-netconf-yang-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-bgp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-isis-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-ospf-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-ospfv3-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-rib-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-router-static-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-rsvp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-snmp-server-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-telemetry-model-driven-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-traps-mpls-ldp-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-um-vrf-cfg.yang",
-
-              "vendor/cisco/xr/673/Cisco-IOS-XR-upgrade-fpd-admin-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-upgrade-fpd-ng-act.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-upgrade-fpd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-upgrade-fpd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-vservice-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wanphy-ui-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wanphy-ui-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wanphy-ui-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-watchd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wd-cfg.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wdsysmon-fd-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wdsysmon-fd-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wdsysmon-fd-proc-oper-sub1.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-wdsysmon-fd-proc-oper.yang",
-              "vendor/cisco/xr/673/Cisco-IOS-XR-zapdisk-act.yang",
-
-              "vendor/cisco/xr/673/cisco-semver.yang",
-              "vendor/cisco/xr/673/ccc.yang",
-              "vendor/cisco/xr/673/CISCO-ENTITY-FRU-CONTROL-MIB.yang",
-              "vendor/cisco/xr/673/fit.yang",
-              "vendor/cisco/xr/673/gaspp.yang",
-
-              "vendor/cisco/xr/673/INET-ADDRESS-MIB.yang",
-              "vendor/cisco/xr/673/IPV6-TC.yang",
-              "vendor/cisco/xr/673/modena_driver_types.yang",
-              "vendor/cisco/xr/673/modena_driver.yang",
-              "vendor/cisco/xr/673/nc-notifications.yang",
-              "vendor/cisco/xr/673/notifications.yang",
-
-              "vendor/cisco/xr/673/opertest1.yang",
-              "vendor/cisco/xr/673/SNMP-COMMUNITY-MIB.yang",
-              "vendor/cisco/xr/673/SNMP-FRAMEWORK-MIB.yang",
-              "vendor/cisco/xr/673/SNMP-MPD-MIB.yang",
-              "vendor/cisco/xr/673/SNMP-NOTIFICATION-MIB.yang",
-              "vendor/cisco/xr/673/SNMP-TARGET-MIB.yang",
-              "vendor/cisco/xr/673/SNMP-USER-BASED-SM-MIB.yang",
-              "vendor/cisco/xr/673/SNMPv2-MIB.yang",
-              "vendor/cisco/xr/673/SNMPv2-SMI.yang",
-              "vendor/cisco/xr/673/SNMPv2-TC.yang",
-              "vendor/cisco/xr/673/SNMP-VIEW-BASED-ACM-MIB.yang",
-              "vendor/cisco/xr/673/tailf-aaa.yang",
-              "vendor/cisco/xr/673/tailf-actions.yang",
-              "vendor/cisco/xr/673/tailf-cli-extensions.yang",
-              "vendor/cisco/xr/673/tailf-common-monitoring.yang",
-              "vendor/cisco/xr/673/tailf-common-query.yang",
-              "vendor/cisco/xr/673/tailf-common.yang",
-              "vendor/cisco/xr/673/tailf-confd-monitoring.yang",
-              "vendor/cisco/xr/673/tailf-meta-extensions.yang",
-              "vendor/cisco/xr/673/tailf-netconf-query.yang",
-              "vendor/cisco/xr/673/tailf-xsd-types.yang",
-              "vendor/cisco/xr/673/valtest.yang"
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "dependency": [
-    {
-      "name": "ietf",
-      "version": "0.1.6",
-      "core_version": "0.8.6",
-      "uri": "file://profiles/bundles/ietf_0_1_6.json"
-    }
-  ]
-}
diff --git a/profiles/bundles/ietf_0_1_0.json b/profiles/bundles/ietf_0_1_0.json
new file mode 100644
index 000000000..260da3d87
--- /dev/null
+++ b/profiles/bundles/ietf_0_1_0.json
@@ -0,0 +1,47 @@
+{
+   "name":"ietf",
+   "version":"0.1.0",
+   "core_version":"0.5.0",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "description":"YDK bundle for IETF models",
+   "models":{
+       "file" : [
+           "profiles/bundles/yang/ietf/ietf-interfaces-ext.yang"
+       ],
+      "git": [
+          {
+          "url": "https://github.com/YangModels/yang.git",
+          "commits": [
+                      {
+                          "commitid": "a5e3d7f27e0e846cac6b6357ff460b8facc810a8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-inet-types.yang",
+                                  "standard/ietf/RFC/ietf-interfaces.yang",
+                                  "standard/ietf/RFC/ietf-netconf-acm.yang",
+                                  "standard/ietf/RFC/ietf-yang-smiv2.yang",
+                                  "standard/ietf/RFC/ietf-yang-types.yang",
+                                  "standard/ietf/RFC/iana-if-type.yang",
+                                  "standard/ietf/RFC/ietf-netconf.yang",
+                                  "standard/ietf/RFC/ietf-netconf-with-defaults.yang"
+                                  ]
+                      },
+
+                      {
+                          "commitid": "be8ff2197e1179c2193433c38ba766a65aca5828",
+                          "file": [
+                                  "standard/ietf/RFC/iana-crypt-hash.yang"
+                                  ]
+                      },
+
+                      {
+                          "commitid": "ead44523cefc2d0f029056f61253c3b36ab38da8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-system@2014-08-06.yang"
+                                  ]
+                      }
+                      ]
+          }
+       ]
+  }
+}
diff --git a/profiles/bundles/ietf_0_1_1.json b/profiles/bundles/ietf_0_1_1.json
new file mode 100644
index 000000000..ca3f843ca
--- /dev/null
+++ b/profiles/bundles/ietf_0_1_1.json
@@ -0,0 +1,57 @@
+{
+   "name":"ietf",
+   "version":"0.1.1",
+   "core_version":"0.5.1",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "description":"YDK bundle for IETF models",
+   "long_description":"This YANG Development Kit (YDK) bundle provides APIs for IETF YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for IETF models uses the YDK core package.",
+   "models":{
+     "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+       "file" : [
+           "profiles/bundles/yang/ietf/ietf-interfaces-ext.yang"
+       ],
+      "git": [
+          {
+          "url": "https://github.com/YangModels/yang.git",
+          "commits": [
+                      {
+                          "commitid": "89a389eed81e85d5c283aaa24c06f16e260d8cbe",
+                          "file": [
+                                  "standard/ietf/DRAFT/ietf-syslog-types.yang"
+                                  ]
+                      },
+                      {
+
+                          "commitid": "a5e3d7f27e0e846cac6b6357ff460b8facc810a8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-inet-types.yang",
+                                  "standard/ietf/RFC/ietf-interfaces.yang",
+                                  "standard/ietf/RFC/ietf-netconf-acm.yang",
+                                  "standard/ietf/RFC/ietf-yang-smiv2.yang",
+                                  "standard/ietf/RFC/ietf-yang-types.yang",
+                                  "standard/ietf/RFC/iana-if-type.yang",
+                                  "standard/ietf/RFC/ietf-netconf.yang",
+                                  "standard/ietf/RFC/ietf-netconf-with-defaults.yang"
+                                  ]
+                      },
+
+                      {
+                          "commitid": "be8ff2197e1179c2193433c38ba766a65aca5828",
+                          "file": [
+                                  "standard/ietf/RFC/iana-crypt-hash.yang"
+                                  ]
+                      },
+
+                      {
+                          "commitid": "ead44523cefc2d0f029056f61253c3b36ab38da8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-system@2014-08-06.yang",
+                                  "standard/ietf/RFC/ietf-netconf-monitoring@2010-10-04.yang"
+                                  ]
+                      }
+                      ]
+          }
+       ]
+  }
+}
diff --git a/profiles/bundles/ietf_0_1_2.json b/profiles/bundles/ietf_0_1_2.json
new file mode 100644
index 000000000..d9a2c1aac
--- /dev/null
+++ b/profiles/bundles/ietf_0_1_2.json
@@ -0,0 +1,58 @@
+{
+   "name":"ietf",
+   "version":"0.1.2",
+   "core_version":"0.5.5",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "description":"YDK bundle for IETF models",
+   "long_description":"This YANG Development Kit (YDK) bundle provides APIs for IETF YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for IETF models uses the YDK core package.",
+   "models":{
+      "file":[
+           "profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-classifier.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-policy.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-target.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-inet-types.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-interfaces-ext.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-interfaces.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-ip.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-key-chain.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-netconf-acm.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-netconf-monitoring.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-netconf-notifications.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-netconf-with-defaults.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-ospf.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-restconf-monitoring.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-routing.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-syslog-types.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-yang-library.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-yang-smiv2.yang",
+           "profiles/bundles/yang/ietf/0.1.2/ietf-yang-types.yang",
+           "profiles/bundles/yang/ietf/0.1.2/iana-crypt-hash.yang",
+           "profiles/bundles/yang/ietf/0.1.2/iana-if-type.yang"
+
+      ],
+      "git": [
+          {
+          "url": "https://github.com/YangModels/yang.git",
+          "commits": [
+                      {
+
+                          "commitid": "a5e3d7f27e0e846cac6b6357ff460b8facc810a8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-netconf.yang"
+                                  ]
+                      },
+                      {
+                          "commitid": "ead44523cefc2d0f029056f61253c3b36ab38da8",
+                          "file": [
+                                  "standard/ietf/RFC/ietf-system@2014-08-06.yang"
+                                  ]
+                      }
+                      ]
+          }
+       ]
+
+  }
+}
diff --git a/profiles/bundles/ietf_0_1_3.json b/profiles/bundles/ietf_0_1_3.json
new file mode 100644
index 000000000..2fcc91037
--- /dev/null
+++ b/profiles/bundles/ietf_0_1_3.json
@@ -0,0 +1,42 @@
+{
+   "name":"ietf",
+   "version":"0.1.3",
+   "core_version":"0.6.0",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "description":"YDK bundle for IETF models",
+   "long_description":"This YANG Development Kit (YDK) bundle provides APIs for IETF YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for IETF models uses the YDK core package.  You can find the SDK documentation at http://ydk.cisco.com/py/docs",
+   "models":{
+      "file":[
+
+              "profiles/bundles/yang/ietf/0.1.3/iana-crypt-hash.yang",
+              "profiles/bundles/yang/ietf/0.1.3/iana-if-type.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-classifier.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-policy.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-target.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-event-notifications.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-inet-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-interfaces-ext.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-interfaces.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ipv4-unicast-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ipv6-unicast-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ip.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-key-chain.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-monitoring.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-notifications.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-with-defaults.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ospf.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-syslog-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-library.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-push.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-smiv2.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-action.yang",
+              "profiles/bundles/yang/ietf/0.1.3/policy-types.yang"
+
+      ]
+  }
+}
diff --git a/profiles/bundles/ietf_0_1_4.json b/profiles/bundles/ietf_0_1_4.json
new file mode 100644
index 000000000..ed47364cf
--- /dev/null
+++ b/profiles/bundles/ietf_0_1_4.json
@@ -0,0 +1,42 @@
+{
+   "name":"ietf",
+   "version":"0.1.4",
+   "core_version":"0.6.1",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "description":"YDK bundle for IETF models",
+   "long_description":"This YANG Development Kit (YDK) bundle provides APIs for IETF YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for IETF models uses the YDK core package.  You can find the SDK documentation at http://ydk.cisco.com/py/docs",
+   "models":{
+      "file":[
+
+              "profiles/bundles/yang/ietf/0.1.3/iana-crypt-hash.yang",
+              "profiles/bundles/yang/ietf/0.1.3/iana-if-type.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-classifier.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-policy.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-target.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-event-notifications.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-inet-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-interfaces-ext.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-interfaces.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ipv4-unicast-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ipv6-unicast-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ip.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-key-chain.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-monitoring.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-notifications.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf-with-defaults.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-netconf.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-ospf.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-routing.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-syslog-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-library.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-push.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-smiv2.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-yang-types.yang",
+              "profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-action.yang",
+              "profiles/bundles/yang/ietf/0.1.3/policy-types.yang"
+
+      ]
+  }
+}
diff --git a/profiles/bundles/ietf_0_1_5.json b/profiles/bundles/ietf_0_1_5.json
index 62adaf9ff..90c0312b4 100644
--- a/profiles/bundles/ietf_0_1_5.json
+++ b/profiles/bundles/ietf_0_1_5.json
@@ -35,7 +35,7 @@
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-push.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-smiv2.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-types.yang",
-        "profiles/bundles/yang/ietf/0.1.5/policy-types.yang"
+        "profiles/bundles/yang/ietf/0.1.3/policy-types.yang"
       ]
   }
 }
diff --git a/profiles/bundles/ietf_0_1_5_post1.json b/profiles/bundles/ietf_0_1_5_post1.json
index 864b0b74b..6030ba845 100644
--- a/profiles/bundles/ietf_0_1_5_post1.json
+++ b/profiles/bundles/ietf_0_1_5_post1.json
@@ -35,7 +35,7 @@
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-push.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-smiv2.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-types.yang",
-        "profiles/bundles/yang/ietf/0.1.5/policy-types.yang"
+        "profiles/bundles/yang/ietf/0.1.3/policy-types.yang"
       ]
   }
 }
diff --git a/profiles/bundles/ietf_0_1_5_post2.json b/profiles/bundles/ietf_0_1_5_post2.json
index f2cb3fb23..9bd29378d 100644
--- a/profiles/bundles/ietf_0_1_5_post2.json
+++ b/profiles/bundles/ietf_0_1_5_post2.json
@@ -35,7 +35,7 @@
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-push.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-smiv2.yang",
         "profiles/bundles/yang/ietf/0.1.5/ietf-yang-types.yang",
-        "profiles/bundles/yang/ietf/0.1.5/policy-types.yang"
+        "profiles/bundles/yang/ietf/0.1.3/policy-types.yang"
       ]
   }
 }
diff --git a/profiles/bundles/ietf_0_1_6.json b/profiles/bundles/ietf_0_1_6.json
deleted file mode 100644
index 770fea9a7..000000000
--- a/profiles/bundles/ietf_0_1_6.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-   "name":"ietf",
-   "version":"0.1.6",
-   "core_version":"0.8.6",
-   "author":"Cisco",
-   "copyright":"Cisco",
-   "description":"YDK bundle for IETF models revision 2018-02-14",
-   "long_description":"This YANG Development Kit (YDK) bundle provides APIs for IETF YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for IETF models uses the YDK core package.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
-   "models":{
-      "file":[
-        "profiles/bundles/yang/ietf/0.1.5/iana-crypt-hash.yang",
-        "profiles/bundles/yang/ietf/0.1.5/iana-if-type.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-diffserv-action.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-diffserv-classifier.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-diffserv-policy.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-diffserv-target.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-event-notifications.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-interfaces-ext.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-ipv4-unicast-routing.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-ipv6-unicast-routing.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-ip.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-key-chain.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-netconf-notifications.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-netconf-with-defaults.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-ospf.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-routing.yang",
-        "profiles/bundles/yang/ietf/0.1.5/ietf-yang-push.yang",
-        "profiles/bundles/yang/ietf/0.1.5/policy-types.yang",
-
-        "profiles/bundles/yang/ietf/0.1.6/ietf-datastores.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-inet-types.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-interfaces.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-netconf-acm.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-netconf-monitoring.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-netconf.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-restconf-monitoring.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-syslog-types.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-yang-library.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-yang-smiv2.yang",
-        "profiles/bundles/yang/ietf/0.1.6/ietf-yang-types.yang"
-      ]
-  }
-}
diff --git a/profiles/bundles/openconfig_0_1_0.json b/profiles/bundles/openconfig_0_1_0.json
new file mode 100644
index 000000000..ba66d56c3
--- /dev/null
+++ b/profiles/bundles/openconfig_0_1_0.json
@@ -0,0 +1,52 @@
+{
+   "name":"openconfig",
+   "description":"YDK bundle for OpenConfig models",
+   "version":"0.1.0",
+   "core_version":"0.5.0",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "models":{
+      "file":[
+         "profiles/bundles/yang/openconfig/bgp@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/bgp-policy@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/bgp-multiprotocol@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/bgp-operational@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/bgp-types@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/oc-xr-mapping@2015-02-10.yang",
+         "profiles/bundles/yang/openconfig/policy-types@2015-05-15.yang",
+         "profiles/bundles/yang/openconfig/routing-policy@2015-05-15.yang"
+      ],
+      "_descr_git":"Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+      "git":[
+         {
+            "url":"https://github.com/openconfig/public.git",
+            "commits":[
+               {
+                  "commitid":"4ab22755c2484e893b2c2b6d88f800b8dd41bb09",
+                  "dir":[
+                     "release/models/interfaces",
+                     "release/models/inventory",
+                     "release/models/mpls",
+                     "release/models/optical-transport",
+                     "release/models/rpc",
+                     "release/models/telemetry",
+                     "release/models/vlan"
+                  ],
+                  "file":[
+                     "release/models/openconfig-extensions.yang",
+                     "release/models/openconfig-types.yang"
+                  ]
+               }
+            ]
+         }
+      ]
+   },
+   "dependency":[
+      {
+         "name":"ietf",
+         "version":"0.1.0",
+         "core_version":"0.5.0",
+         "uri":"file://profiles/bundles/ietf_0_1_0.json"
+      }
+   ]
+}
diff --git a/profiles/bundles/openconfig_0_1_1.json b/profiles/bundles/openconfig_0_1_1.json
new file mode 100644
index 000000000..75d0fedca
--- /dev/null
+++ b/profiles/bundles/openconfig_0_1_1.json
@@ -0,0 +1,76 @@
+{
+   "name":"openconfig",
+   "description":"YDK bundle for OpenConfig models",
+   "version":"0.1.1",
+   "core_version":"0.5.1",
+   "author":"Cisco",
+   "copyright":"Cisco",
+   "models":{
+      "description":"Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+      "git":[
+         {
+            "url":"https://github.com/openconfig/public.git",
+            "commits":[
+               {
+                  "commitid":"bfb2695faed5a2bc0dd2ce14b2fc15f6abc713ae",
+                  "dir":[
+                     "release/models/bgp",
+                     "release/models/policy",
+                     "release/models/vlan"
+                  ]
+               },
+               {   
+                  "commitid":"0e7126a860bf377e114f74aa93b90e7859e0bb2f",
+                  "dir":[
+                     "release/models/interfaces"
+                  ]  
+               },  
+               {   
+                  "commitid":"488059e3a39c43cfdc33aa3471ff4e33c1726c8c",
+                  "dir":[
+                     "release/models/mpls"
+                  ]  
+               },  
+               {   
+                  "commitid":"4ab22755c2484e893b2c2b6d88f800b8dd41bb09",
+                  "dir":[
+                     "release/models/telemetry"
+                  ]  
+               },  
+               {   
+                  "commitid":"b4c672738ee17d4023c885b153a19ae4c6551ce4",
+                  "dir":[
+                     "release/models/platform"
+                  ]  
+               },  
+               {   
+                  "commitid":"0fa0db66b686d7c6d1fd8451cace55f95103dce0",
+                  "file":[
+                     "release/models/optical-transport/openconfig-transport-types.yang"
+                  ]  
+               },  
+               {   
+                  "commitid":"c97d7cbbf1fdad8b5a6e90543440463551b275b6",
+                  "file":[
+                     "release/models/openconfig-types.yang"
+                  ]  
+               },  
+               {   
+                  "commitid":"2946f009accbce16fa8f98da12cd9ec9164bd2a9",
+                  "file":[
+                     "release/models/openconfig-extensions.yang"
+                  ]  
+               }  
+            ]
+         }
+      ]
+   },
+   "dependency":[
+      {
+         "name":"ietf",
+         "version":"0.1.1",
+         "core_version":"0.5.1",
+         "uri":"file://profiles/bundles/ietf_0_1_1.json"
+      }
+   ]
+}
diff --git a/profiles/bundles/openconfig_0_1_2.json b/profiles/bundles/openconfig_0_1_2.json
new file mode 100644
index 000000000..31fe75c1f
--- /dev/null
+++ b/profiles/bundles/openconfig_0_1_2.json
@@ -0,0 +1,65 @@
+{
+  "name": "openconfig",
+  "version": "0.1.2",
+  "core_version": "0.5.4",
+  "author": "Cisco",
+  "copyright": "Cisco",
+  "description": "YDK bundle for OpenConfig models",
+  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for OpenConfig YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for OpenConfig models uses the YDK core package and additional model bundles.",
+  "models": {
+    "description": "Each element on the list has details on git repositories to source models from, including commit ids and relative paths inside the repositories. If no commit id is specified, HEAD is taken. This is unwise. The nested dir and file references are interpreted the same way as specific dir and file references above.",
+    "git": [
+      {
+        "url": "https://github.com/YangModels/yang.git",
+        "commits": [
+          {
+            "commitid": "96883adbf612605f02271523d7eaa731ded46b61",
+            "file": [
+              "vendor/cisco/xr/621/cisco-xr-openconfig-bgp-types.yang",
+              "vendor/cisco/xr/621/cisco-xr-openconfig-interfaces-types.yang",
+              "vendor/cisco/xr/621/openconfig-bgp-multiprotocol.yang",
+              "vendor/cisco/xr/621/openconfig-bgp-operational.yang",
+              "vendor/cisco/xr/621/openconfig-bgp-policy.yang",
+              "vendor/cisco/xr/621/openconfig-bgp-types.yang",
+              "vendor/cisco/xr/621/openconfig-bgp.yang",
+              "vendor/cisco/xr/621/openconfig-extensions.yang",
+              "vendor/cisco/xr/621/openconfig-if-aggregate.yang",
+              "vendor/cisco/xr/621/openconfig-if-ethernet.yang",
+              "vendor/cisco/xr/621/openconfig-if-ip.yang",
+              "vendor/cisco/xr/621/openconfig-interfaces.yang",
+              "vendor/cisco/xr/621/openconfig-local-routing.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-igp.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-ldp.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-rsvp.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-sr.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-static.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-te.yang",
+              "vendor/cisco/xr/621/openconfig-mpls-types.yang",
+              "vendor/cisco/xr/621/openconfig-mpls.yang",
+              "vendor/cisco/xr/621/openconfig-platform-transceiver.yang",
+              "vendor/cisco/xr/621/openconfig-platform-types.yang",
+              "vendor/cisco/xr/621/openconfig-platform.yang",
+              "vendor/cisco/xr/621/openconfig-policy-types.yang",
+              "vendor/cisco/xr/621/openconfig-rib-bgp-types.yang",
+              "vendor/cisco/xr/621/openconfig-rib-bgp.yang",
+              "vendor/cisco/xr/621/openconfig-routing-policy.yang",
+              "vendor/cisco/xr/621/openconfig-telemetry.yang",
+              "vendor/cisco/xr/621/openconfig-terminal-device.yang",
+              "vendor/cisco/xr/621/openconfig-transport-types.yang",
+              "vendor/cisco/xr/621/openconfig-types.yang",
+              "vendor/cisco/xr/621/openconfig-vlan.yang"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "dependency": [
+    {
+      "name": "ietf",
+      "version": "0.1.1",
+      "core_version": "0.5.1",
+      "uri": "file://profiles/bundles/ietf_0_1_1.json"
+    }
+  ]
+}
diff --git a/profiles/bundles/openconfig_0_1_3.json b/profiles/bundles/openconfig_0_1_3.json
index fb9bf9763..ffb11cf4c 100644
--- a/profiles/bundles/openconfig_0_1_3.json
+++ b/profiles/bundles/openconfig_0_1_3.json
@@ -63,9 +63,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     }
   ]
 }
diff --git a/profiles/bundles/openconfig_0_1_4.json b/profiles/bundles/openconfig_0_1_4.json
index 9a186514f..754742a48 100644
--- a/profiles/bundles/openconfig_0_1_4.json
+++ b/profiles/bundles/openconfig_0_1_4.json
@@ -66,9 +66,9 @@
   "dependency": [
     {
       "name": "ietf",
-      "version": "0.1.5",
-      "core_version": "0.8.5",
-      "uri": "file://profiles/bundles/ietf_0_1_5.json"
+      "version": "0.1.3",
+      "core_version": "0.6.0",
+      "uri": "file://profiles/bundles/ietf_0_1_3.json"
     }
   ]
 }
diff --git a/profiles/bundles/openconfig_0_1_9.json b/profiles/bundles/openconfig_0_1_9.json
deleted file mode 100644
index 49d3b5887..000000000
--- a/profiles/bundles/openconfig_0_1_9.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "name": "openconfig",
-  "version": "0.1.9",
-  "core_version": "0.8.6",
-  "author": "Yan Gorelik",
-  "copyright": "Yan Gorelik, YDK Solution",
-  "description": "YDK bundle for openconfig models revision 2020-05-06",
-  "long_description": "This YANG Development Kit (YDK) bundle provides API for openconfig YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for OpenConfig models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
-  "models": {
-    "description": "Each element in the list has details of git repositories and sources of YANG models, including GitHub commit ID and relative paths inside the repositories. If no commit ID is specified, HEAD is assumed.",
-    "git": [
-      {
-        "url": "https://github.com/YangModels/yang.git",
-        "commits": [
-          {
-            "file": [
-              "vendor/cisco/xr/673/openconfig-aaa-radius.yang",
-              "vendor/cisco/xr/673/openconfig-aaa-tacacs.yang",
-              "vendor/cisco/xr/673/openconfig-aaa-types.yang",
-              "vendor/cisco/xr/673/openconfig-aaa.yang",
-              "vendor/cisco/xr/673/openconfig-acl.yang",
-              "vendor/cisco/xr/673/openconfig-aft-common.yang",
-              "vendor/cisco/xr/673/openconfig-aft-ethernet.yang",
-              "vendor/cisco/xr/673/openconfig-aft-ipv4.yang",
-              "vendor/cisco/xr/673/openconfig-aft-ipv6.yang",
-              "vendor/cisco/xr/673/openconfig-aft-mpls.yang",
-              "vendor/cisco/xr/673/openconfig-aft-network-instance.yang",
-              "vendor/cisco/xr/673/openconfig-aft-pf.yang",
-              "vendor/cisco/xr/673/openconfig-aft-types.yang",
-              "vendor/cisco/xr/673/openconfig-aft.yang",
-              "vendor/cisco/xr/673/openconfig-alarms.yang",
-              "vendor/cisco/xr/673/openconfig-alarm-types.yang",
-              "vendor/cisco/xr/673/openconfig-bfd.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-common-multiprotocol.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-common-structure.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-common.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-global.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-neighbor.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-peer-group.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-policy.yang",
-              "vendor/cisco/xr/673/openconfig-bgp-types.yang",
-              "vendor/cisco/xr/673/openconfig-bgp.yang",
-              "vendor/cisco/xr/673/openconfig-channel-monitor.yang",
-              "vendor/cisco/xr/673/openconfig-extensions.yang",
-              "vendor/cisco/xr/673/openconfig-if-aggregate.yang",
-              "vendor/cisco/xr/673/openconfig-if-ethernet.yang",
-              "vendor/cisco/xr/673/openconfig-if-ethernet-ext.yang",
-              "vendor/cisco/xr/673/openconfig-if-ip.yang",
-              "vendor/cisco/xr/673/openconfig-if-ip-ext.yang",
-              "vendor/cisco/xr/673/openconfig-if-tunnel.yang",
-              "vendor/cisco/xr/673/openconfig-if-types.yang",
-              "vendor/cisco/xr/673/openconfig-inet-types.yang",
-              "vendor/cisco/xr/673/openconfig-interfaces.yang",
-              "vendor/cisco/xr/673/openconfig-isis-lsdb-types.yang",
-              "vendor/cisco/xr/673/openconfig-isis-lsp.yang",
-              "vendor/cisco/xr/673/openconfig-isis-policy.yang",
-              "vendor/cisco/xr/673/openconfig-isis-routing.yang",
-              "vendor/cisco/xr/673/openconfig-isis-types.yang",
-              "vendor/cisco/xr/673/openconfig-isis.yang",
-              "vendor/cisco/xr/673/openconfig-lacp.yang",
-              "vendor/cisco/xr/673/openconfig-lldp-types.yang",
-              "vendor/cisco/xr/673/openconfig-lldp.yang",
-              "vendor/cisco/xr/673/openconfig-local-routing.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-igp.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-ldp.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-rsvp.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-sr.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-static.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-te.yang",
-              "vendor/cisco/xr/673/openconfig-mpls-types.yang",
-              "vendor/cisco/xr/673/openconfig-mpls.yang",
-              "vendor/cisco/xr/673/openconfig-network-instance-l2.yang",
-              "vendor/cisco/xr/673/openconfig-network-instance-l3.yang",
-              "vendor/cisco/xr/673/openconfig-network-instance-types.yang",
-              "vendor/cisco/xr/673/openconfig-network-instance.yang",
-              "vendor/cisco/xr/673/openconfig-optical-amplifier.yang",
-              "vendor/cisco/xr/673/openconfig-packet-match-types.yang",
-              "vendor/cisco/xr/673/openconfig-packet-match.yang",
-              "vendor/cisco/xr/673/openconfig-platform-cpu.yang",
-              "vendor/cisco/xr/673/openconfig-platform-ext.yang",
-              "vendor/cisco/xr/673/openconfig-platform-fan.yang",
-              "vendor/cisco/xr/673/openconfig-platform-linecard.yang",
-              "vendor/cisco/xr/673/openconfig-platform-port.yang",
-              "vendor/cisco/xr/673/openconfig-platform-psu.yang",
-              "vendor/cisco/xr/673/openconfig-platform-transceiver.yang",
-              "vendor/cisco/xr/673/openconfig-platform-types.yang",
-              "vendor/cisco/xr/673/openconfig-platform.yang",
-              "vendor/cisco/xr/673/openconfig-policy-types.yang",
-              "vendor/cisco/xr/673/openconfig-procmon.yang",
-              "vendor/cisco/xr/673/openconfig-rib-bgp-types.yang",
-              "vendor/cisco/xr/673/openconfig-rib-bgp.yang",
-              "vendor/cisco/xr/673/openconfig-routing-policy.yang",
-              "vendor/cisco/xr/673/openconfig-rsvp-sr-ext.yang",
-              "vendor/cisco/xr/673/openconfig-segment-routing.yang",
-              "vendor/cisco/xr/673/openconfig-system-logging.yang",
-              "vendor/cisco/xr/673/openconfig-system-management.yang",
-              "vendor/cisco/xr/673/openconfig-system-terminal.yang",
-              "vendor/cisco/xr/673/openconfig-system.yang",
-              "vendor/cisco/xr/673/openconfig-telemetry.yang",
-              "vendor/cisco/xr/673/openconfig-transport-line-common.yang",
-              "vendor/cisco/xr/673/openconfig-transport-line-protection.yang",
-              "vendor/cisco/xr/673/openconfig-transport-types.yang",
-              "vendor/cisco/xr/673/openconfig-types.yang",
-              "vendor/cisco/xr/673/openconfig-vlan-types.yang",
-              "vendor/cisco/xr/673/openconfig-vlan.yang",
-              "vendor/cisco/xr/673/openconfig-yang-types.yang",
-
-              "vendor/cisco/xr/711/openconfig-terminal-device.yang"
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "dependency": [
-    {
-      "name": "ietf",
-      "version": "0.1.6",
-      "core_version": "0.8.6",
-      "uri": "file://profiles/bundles/ietf_0_1_6.json"
-    }
-  ]
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces.yang b/profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-interfaces.yang
similarity index 97%
rename from profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces.yang
rename to profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-interfaces.yang
index 6246071a1..264c632af 100644
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces.yang
+++ b/profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-interfaces.yang
@@ -42,30 +42,6 @@ submodule Cisco-IOS-XE-interfaces {
   // =========================================================================
   // REVISION
   // =========================================================================
-  revision 2018-11-27 {
-    description
-      "Fix ip address annotations, remove no-address container";
-  }
-  revision 2018-11-26 {
-    description
-      "Changed ip vrf forwarding from type leafref to string beacuse pyang fails";
-  } 
-  revision 2018-09-07 {
-    description
-      "Add must constraint to vrf forwaring, on vrf address-family";
-  }
-  revision 2018-08-29 {
-    description
-      "added must constraint on no ip address";
-  }
-  revision 2018-07-11 {
-    description
-      "Add .* to cli-preformatted, apply input validation to disallow newlines";
-  }
-  revision 2018-07-10 {
-    description
-      "Add interface vrf forwarding downstream. Increase hold-queue size.";
-  }
   revision 2018-06-28 {
     description
       "added must constraints for deleting vrf, changing to switchport from no switchport";
@@ -450,7 +426,6 @@ submodule Cisco-IOS-XE-interfaces {
       description
         "Interface specific description";
       type string {
-        pattern '.*';
         length "0..240";
       }
     }
@@ -825,7 +800,6 @@ submodule Cisco-IOS-XE-interfaces {
     container bfd {
       description
         "BFD interface configuration commands";
-
       // @mount Cisco-IOS-XE-bfd
     }
 
@@ -975,8 +949,8 @@ submodule Cisco-IOS-XE-interfaces {
         }
       }
       leaf queue-length {
-        type uint32 {
-          range "0..240000";
+        type uint16 {
+          range "0..4096";
         }
       }
     }
@@ -1000,9 +974,9 @@ submodule Cisco-IOS-XE-interfaces {
               description
                 "Configure forwarding table";
               type string;
-              //type leafref {
-              //  path "/ios:native/ios:ip/ios:vrf/ios:name";
-              //}
+              // type leafref {
+              //   path "/ios:native/ios:ip/ios:vrf/ios:name";
+              // }
             }
           }
         }
@@ -1010,31 +984,18 @@ submodule Cisco-IOS-XE-interfaces {
       container vrf {
         description
           "VPN Routing/Forwarding parameters on the interface";
-        // interface * / vrf forwarding
+          // interface * / vrf forwarding
         leaf forwarding {
           description
             "Configure forwarding table";
           must "/ios:native/ios:vrf/ios:definition[ios:name=current()]" { 
 	    error-message "VRF must be created 1st, deleted last";
           }
-          must "not(../../ip/address) or " +
-               "/ios:native/ios:vrf/ios:definition[ios:name=current()]/ios:address-family/ios:ipv4" {
-            error-message "Address-family ipv4 in VRF must be created 1st, deleted last";
-          }
 	  must "not (../../switchport-conf/switchport) or (../../switchport-conf/switchport = 'false')" {
 	    error-message "To configure vrf forwarding, set switchport to false 1st; To change switchport from false to true, delete vrf forwarding 1st";
           }
           type string;
         }
-        leaf downstream {
-          description
-            "Configure different VRF for downstream traffic";
-          when "../forwarding";
-          must "/ios:native/ios:vrf/ios:definition[ios:name=current()]" { 
-	    error-message "VRF must be created 1st, deleted last";
-          }
-          type string;
-        }
       }
     }
 
@@ -1187,6 +1148,12 @@ submodule Cisco-IOS-XE-interfaces {
             "Enable IP processing without an explicit address";
           type string;
         }
+        // interface * / no ip address
+        container no-address {
+          leaf address {
+            type boolean;
+          }
+        }
         // interface * / ip address XXX
         container address {
           description
@@ -1357,7 +1324,6 @@ submodule Cisco-IOS-XE-interfaces {
       container pim {
         description
           "PIM interface commands";
-
         // @mount Cisco-IOS-XE-mcast
       }
 
@@ -3005,9 +2971,6 @@ submodule Cisco-IOS-XE-interfaces {
         list Port-channel {
           key "name";
           leaf name {
-	    must "/ios:native/ios:interface/ios:Port-channel[ios:name=number(substring-before(current(), '.'))]" {
-	      error-message "To create a Port-channel subinterface, the Port-channel interface needs to be created 1st; vice versa for delete.";
-	    }
             type string;
           }
           uses interface-common-grouping;
diff --git a/profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-ospf.yang b/profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-ospf.yang
new file mode 100644
index 000000000..ebbcb716f
--- /dev/null
+++ b/profiles/bundles/yang/cisco-ios-xe/16.9.1/Cisco-IOS-XE-ospf.yang
@@ -0,0 +1,2988 @@
+module Cisco-IOS-XE-ospf {
+  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-ospf";
+  prefix ios-ospf;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+
+  import Cisco-IOS-XE-types {
+    prefix ios-types;
+  }
+
+  import Cisco-IOS-XE-interface-common {
+    prefix ios-ifc;
+  }
+
+  import Cisco-IOS-XE-native {
+    prefix ios;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    "Cisco Systems, Inc.
+     Customer Service
+
+     Postal: 170 W Tasman Drive
+     San Jose, CA 95134
+
+     Tel: +1 1800 553-NETS
+
+     E-mail: cs-yang@cisco.com";
+
+  description
+    "Cisco XE Native Open Shortest Path First (OSPF) Yang model.
+     Copyright (c) 2016-2018 by Cisco Systems, Inc.
+     All rights reserved.";
+
+  // =========================================================================
+  // REVISION
+  // =========================================================================
+   revision 2018-06-28{
+    description
+        "Added must constraints for deleting vrf, changing switchport from no switchport";
+  }
+
+  revision 2018-05-21 {
+     description
+       "change ip ospf id to type leafref under an interafce";
+  }
+  revision 2018-01-19 {
+     description
+       "fix issue in redistribute maximum-prefix <number> <threshold> warning-only";
+  }
+
+  revision 2017-11-27 {
+     description
+       "Added Change 25GE name";
+  }
+
+  revision 2017-11-16 {
+    description
+      "fix area 0 range <ipv4> <ipv4-mask> issue";
+  }
+
+  revision 2017-11-14 {
+    description
+      "Add 40 and 100GE interface";
+  }
+
+  revision 2017-10-20 {
+    description
+      "To allow support of ip osfp authentication-key <string> under interface";
+  }
+
+  revision 2017-08-18 {
+    description
+      "This revision has changes for new 5gig and 25gig interfaces addition";
+  }
+
+  revision 2017-08-15 {
+    description
+      "add full nsf support and ospf support for BDI interfaces";
+  }
+  revision 2017-04-28 {
+    description
+      "inet:ipv6-prefix changed to ios-types:ipv6-prefix";
+  }
+  revision 2017-03-28 {
+    description
+      "Added NED Yang Data Model support for MPLS-TE";
+  }
+
+  revision 2017-02-07 {
+    description
+      "Initial revision";
+  }
+
+  typedef redist-ospf-external-type {
+    type enumeration {
+      enum "1";
+      enum "2";
+    }
+  }
+
+  grouping authentication-ipsec-grouping {
+    container ipsec {
+      description
+        "Use IPsec authentication";
+      leaf spi {
+        description
+          "Set the SPI (Security Parameters Index)";
+        type uint64 {
+          range "256..4294967295";
+        }
+      }
+      container md5 {
+        description
+          "Use MD5 authentication";
+        container key-string {
+          leaf encrypt {
+            type enumeration {
+              enum "0";
+              enum "7";
+            }
+          }
+          leaf string {
+            type string;
+          }
+        }
+      }
+      container sha1 {
+        description
+          "Use SHA-1 authentication";
+        container key-string {
+          leaf encrypt {
+            type enumeration {
+              enum "0";
+              enum "7";
+            }
+          }
+          leaf string {
+            type string;
+          }
+        }
+      }
+    }
+  }
+
+  grouping interface-ospf-neighbor-grouping {
+    list neighbor {
+      description
+        "OSPF neighbor";
+      ordered-by user;
+      must "count(*) > 1" {
+      }
+      key "id";
+      leaf id {
+        type inet:ipv6-address;
+      }
+      leaf cost {
+        description
+          "OSPF cost for point-to-multipoint neighbor";
+        type uint16 {
+          range "1..65535";
+        }
+      }
+      container database-filter {
+        description
+          "Filter OSPF LSA during synchronization and flooding for point-to-multipoint neighbor";
+        choice database {
+          leaf all {
+            description
+              "Filter all LSA";
+            type enumeration {
+              enum "out";
+            }
+          }
+        }
+      }
+      leaf poll-interval {
+        description
+          "OSPF dead-router polling interval";
+        type uint32 {
+          range "0..65535";
+        }
+      }
+      leaf priority {
+        description
+          "OSPF priority of non-broadcast neighbor";
+        type uint8 {
+          range "0..255";
+        }
+      }
+    }
+  }
+
+  grouping interface-ospf-encryption-grouping {
+    container encryption {
+      description
+        "Enable encryption";
+      leaf null {
+        description
+          "No IPsec encryption on this interface";
+        type empty;
+      }
+      container ipsec {
+        description
+          "Use IPsec encryption";
+        leaf spi {
+          description
+            "Set the SPI (Security Parameters Index)";
+          type uint64;
+        }
+        leaf esp {
+          description
+            "Use ESP encapsulation";
+          type empty;
+        }
+        container ipsec_3des {
+          description
+            "Use 3DES encryption";
+          container key-string {
+            leaf encrypt {
+              type enumeration {
+                enum "0";
+                enum "7";
+              }
+            }
+            leaf string {
+              type string;
+            }
+          }
+        }
+        container aes-cbc {
+          description
+            "Use AES-CBC encryption";
+          container aes-cbc-128 {
+            description
+              "Use 128 bit key";
+            container key-string {
+              leaf encrypt {
+                type enumeration {
+                  enum "0";
+                  enum "7";
+                }
+              }
+              leaf string {
+                type string;
+              }
+            }
+          }
+          container aes-192 {
+            description
+              "Use 192 bit key";
+            container key-string {
+              leaf encrypt {
+                type enumeration {
+                  enum "0";
+                  enum "7";
+                }
+              }
+              leaf string {
+                type string;
+              }
+            }
+          }
+          container aes-256 {
+            description
+              "Use 256 bit key";
+            container key-string {
+              leaf encrypt {
+                type enumeration {
+                  enum "0";
+                  enum "7";
+                }
+              }
+              leaf string {
+                type string;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping interface-ospf-dead-interval-grouping {
+    leaf dead-interval {
+      description
+        "Interval after which a neighbor is declared dead";
+      type uint16 {
+        range "1..65535";
+      }
+    }
+  }
+
+  grouping interface-ospf-hello-interval-grouping {
+    leaf hello-interval {
+      description
+        "Time between HELLO packets";
+      type uint32 {
+        range "1..65535";
+      }
+    }
+  }
+
+  grouping interface-ospf-prefix-suppression-grouping {
+    container prefix-suppression {
+      description
+        "OSPF prefix suppression";
+      presence "true";
+      leaf disable {
+        description
+          "Disable prefix suppression";
+        type empty;
+      }
+    }
+  }
+
+  grouping interface-ospf-priority-grouping {
+    leaf priority {
+      description
+        "Router priority";
+      type uint8 {
+        range "0..255";
+      }
+    }
+  }
+
+  grouping interface-ospf-retransmit-interval-grouping {
+    leaf retransmit-interval {
+      description
+        "Time between retransmitting lost link state advertisements";
+      type uint32 {
+        range "1..65535";
+      }
+    }
+  }
+
+  grouping interface-ospf-transmit-delay-grouping {
+    leaf transmit-delay {
+      description
+        "Link state transmit delay";
+      type uint32 {
+        range "1..65535";
+      }
+    }
+  }
+
+  grouping interface-ospf-bfd-grouping {
+    container bfd {
+      description
+        "Enable BFD on this interface";
+      presence "true";
+      leaf disable {
+        description
+          "Disable BFD on this interface";
+        type empty;
+      }
+    }
+  }
+
+  grouping interface-ospf-network-grouping {
+    container network {
+      description
+        "Network type";
+      leaf broadcast {
+        description
+          "Specify OSPF broadcast multi-access network";
+        type empty;
+      }
+      leaf manet {
+        description
+          "Specify MANET OSPF interface type";
+        type empty;
+      }
+      leaf non-broadcast {
+        description
+          "Specify OSPF NBMA network";
+        type empty;
+      }
+      container point-to-multipoint {
+        description
+          "Specify OSPF point-to-multipoint network";
+        presence "true";
+        leaf non-broadcast {
+          description
+            "Specify non-broadcast point-to-mpoint network";
+          type empty;
+        }
+      }
+      leaf point-to-point {
+        description
+          "Specify OSPF point-to-point network";
+        type empty;
+      }
+    }
+  }
+
+
+  // interface * / ip ospf
+  grouping config-interface-ip-ospf-grouping {
+    container ospf {
+      description
+        "OSPF interface commands";
+      list process-id {
+	must "not (../../../ios:switchport-conf/ios:switchport) or (../../../ios:switchport-conf/ios:switchport = 'false')" {
+	  error-message "To configure ip ospf, set switchport to false 1st; To change switchport from false to true, delete ip ospf 1st ";
+        }
+        key "id";
+        leaf id {
+          type leafref {
+	    path "/ios:native/ios:router/ios-ospf:ospf/ios-ospf:id";
+          }
+        }
+        leaf area {
+          type ios-types:ospf-area-type;
+        }
+        leaf secondaries {
+          description
+            "Include or exclude secondary IP addresses";
+          type empty;
+        }
+        leaf none {
+          description
+            "Do not include secondary IP addresses";
+          type empty;
+        }
+      }
+
+      // interface * / ip ospf authentication
+      container authentication {
+        description
+          "Enable authentication";
+        presence "Enable authentication";
+        container key-chain {
+          description
+            "Use a key-chain for cryptographic authentication keys";
+          leaf name {
+            type string;
+          }
+        }
+        leaf message-digest {
+          description
+            "Use message-digest authentication";
+          type empty;
+        }
+        leaf null {
+          description
+            "Use no authentication";
+          type empty;
+        }
+      }
+
+      // interface * / ip ospf authentication-key
+      uses ospf-authentication-key-grouping;
+
+      // interface * / ip ospf network
+      leaf network {
+        description
+          "Network type";
+        type enumeration {
+          enum "broadcast";
+          enum "non-broadcast";
+          enum "point-to-multipoint";
+          enum "point-to-point";
+        }
+      }
+      // interface * / ip ospf bfd
+
+      uses interface-ospf-bfd-grouping;
+      // interface * / ip ospf cost
+      leaf cost {
+        description
+          "Interface cost";
+        type uint16 {
+          range "1..65535";
+        }
+      }
+
+      // interface * / ip ospf database-filter
+      container database-filter {
+        description
+          "Filter OSPF LSA during synchronization and flooding";
+        leaf all {
+          description
+            "Filter all LSA";
+          type empty;
+        }
+        leaf out {
+          description
+            "Outgoing LSA";
+          type empty;
+        }
+      }
+
+      // interface * / ip ospf dead-interval
+      container dead-interval {
+        description
+          "Interval after which a neighbor is declared dead";
+        leaf value {
+          type uint32 {
+            range "1..65535";
+          }
+        }
+        container minimal {
+          description
+            "Set to 1 second";
+          leaf hello-multiplier {
+            description
+              "Set multiplier for Hellos";
+            type uint8;
+          }
+        }
+      }
+
+      // interface * / ip ospf demand-circuit
+      container demand-circuit {
+        description
+          "OSPF Demand Circuit";
+        presence "true";
+        leaf ignore {
+          description
+            "Ignore demand circuit auto-negotiation requests";
+          type empty;
+        }
+      }
+
+      // interface * / ip ospf fast-reroute
+      container fast-reroute {
+        description
+          "LFA FastReroute parameters";
+        container per-prefix {
+          description
+            "Per-prefix LFA FRR parameters";
+          container candidate {
+            description
+              "If interface can be protecting";
+            presence "true";
+            leaf disable {
+              description
+                "Disable LFA FRR interface protection";
+              type empty;
+            }
+          }
+          container protection {
+            description
+              "If interface can be protected";
+            presence "true";
+            leaf disable {
+              description
+                "Disable LFA FRR interface protection";
+              type empty;
+            }
+          }
+        }
+      }
+
+      // interface * / ip ospf flood-reduction
+      leaf flood-reduction {
+        description
+          "OSPF Flood Reduction";
+        type empty;
+      }
+
+      // interface * / ip ospf hello-interval
+      uses interface-ospf-hello-interval-grouping;
+
+      // interface * / ip ospf lls
+      container lls {
+        description
+          "Link-local Signaling (LLS) support";
+        presence "true";
+        leaf disable {
+          description
+            "disable LLS";
+          type empty;
+        }
+      }
+
+      // interface * / ip ospf message-digest-key
+      list message-digest-key {
+        description
+          "Set message digest key";
+        key "id";
+        leaf id {
+          type uint8 {
+            range "1 .. 255";
+          }
+        }
+        container md5 {
+          description
+            "Use MD5 algorithm";
+          leaf auth-type {
+            type uint8 {
+              range "0 .. 7";
+            }
+          }
+          leaf auth-key {
+            type string;
+          }
+        }
+      }
+
+      // interface * / ip ospf mtu-ignore
+      leaf mtu-ignore {
+        description
+          "Ignores the MTU in DBD packets";
+        type empty;
+      }
+
+      // interface * / ip ospf multi-area
+      container multi-area {
+        description
+          "Set the OSPF multi-area ID";
+        leaf id {
+          type union {
+            type uint32 {
+              range "0..4294967295";
+            }
+            type inet:ipv4-address;
+          }
+        }
+        leaf cost {
+          description
+            "Interface cost";
+          type uint32 {
+            range "1..65535";
+          }
+        }
+      }
+
+      // interface * / ip ospf prefix-suppression
+      uses interface-ospf-prefix-suppression-grouping;
+
+      // interface * / ip ospf priority
+      uses interface-ospf-priority-grouping;
+
+      // interface * / ip ospf resync-timeout
+      leaf resync-timeout {
+        description
+          "Interval after which adjacency is reset if oob-resync is not started";
+        type uint32 {
+          range "1..65535";
+        }
+      }
+
+      // interface * / ip ospf retransmit-interval
+      uses interface-ospf-retransmit-interval-grouping;
+      // interface * / ip ospf shutdown
+      leaf shutdown {
+        description
+          "Set OSPF protocol's state to disable under current interface";
+        type empty;
+      }
+      // interface * / ip ospf transmit-delay
+      uses interface-ospf-transmit-delay-grouping;
+      // interface * / ip ospf ttl-security
+      container ttl-security {
+        description
+          "TTL security check";
+        presence "true";
+        leaf diable {
+          description
+            "disable TTL security check";
+          type empty;
+        }
+        leaf hops {
+          description
+            "IP hops";
+          type uint8 {
+            range "1..254";
+          }
+        }
+      }
+    }
+  }
+
+  // interface * ipv6 ospf
+  grouping config-interface-ipv6-ospf-grouping {
+    container ospf {
+      description
+        "OSPF interface commands";
+      list process {
+        key "id";
+        leaf id {
+          type uint16 {
+            range "1..65535";
+          }
+        }
+        leaf area {
+          description
+            "Set the OSPF area ID";
+          type union {
+            type uint32 {
+              range "0..4294967295";
+            }
+            type inet:ipv4-address;
+          }
+        }
+        leaf instance {
+          description
+            "Set the OSPF instance";
+          type union {
+            type uint8 {
+              range "0..31";
+            }
+            type uint8 {
+              range "32..255";
+            }
+          }
+        }
+      }
+
+      // interface * / ipv6 ospf authentication
+      container authentication {
+        description
+          "Enable authentication";
+        leaf null {
+          description
+            "Use no authentication";
+          type empty;
+        }
+        uses authentication-ipsec-grouping;
+      }
+
+      // interface * / ipv6 ospf bfd
+      uses interface-ospf-bfd-grouping;
+
+      // interface * / ipv6 ospf cost
+      leaf cost {
+        description
+          "Route cost of this interface";
+        type uint16 {
+          range "1..65535";
+        }
+      }
+
+      // interface * / ipv6 ospf database-filter
+      container database-filter {
+        description
+          "Filter OSPF LSA during synchronization and flooding";
+        choice database {
+          leaf all {
+            description
+              "Filter all LSA";
+            type enumeration {
+              enum "out";
+            }
+          }
+          leaf disable {
+            description
+              "Disable LSA Filter on this interface";
+            type empty;
+          }
+        }
+      }
+      // interface * / ipv6 ospf dead-interval
+      uses interface-ospf-dead-interval-grouping;
+
+      // interface * / ipv6 ospf demand-circuit
+      container demand-circuit {
+        description
+          "OSPF demand circuit";
+        presence "true";
+        leaf disable {
+          description
+            "Disable demand circuit on this interface";
+          type empty;
+        }
+        leaf ignore {
+          description
+            "Ignore demand circuit auto-negotiation requests";
+          type empty;
+        }
+      }
+
+      // interface * / ipv6 ospf encryption
+      uses interface-ospf-encryption-grouping;
+
+      // interface * / ipv6 ospf flood-reduction
+      container flood-reduction {
+        description
+          "OSPF Flood Reduction";
+        presence "true";
+        leaf disable {
+          description
+            "Disable Flood Reduction on this interface";
+          type empty;
+        }
+      }
+
+      // interface * / ipv6 ospf hello-interval
+      uses interface-ospf-hello-interval-grouping;
+
+      // interface * / ipv6 ospf mtu-ignore
+      container mtu-ignore {
+        description
+          "Ignores the MTU in DBD packets";
+        presence "true";
+        leaf disable {
+          description
+            "Disable Ingore MTU on this interface";
+          type empty;
+        }
+      }
+
+      // interface * / ipv6 ospf neighbor
+      uses interface-ospf-neighbor-grouping;
+
+      //  interface * / ipv6 ospf network
+      uses interface-ospf-network-grouping;
+
+      // interface * / ipv6 ospf priority
+      uses interface-ospf-priority-grouping;
+      // interface * / ipv6 ospf retransmit-interval
+
+      uses interface-ospf-retransmit-interval-grouping;
+
+      // interface * / ipv6 ospf shutdown
+      container shutdown {
+        description
+          "Shut down the interface in OSPFv3";
+        presence "true";
+        leaf disable {
+          description
+            "Disable inherited shutdown";
+          type empty;
+        }
+      }
+
+      // interface * / ipv6 ospf transmit-delay
+      uses interface-ospf-transmit-delay-grouping;
+    }
+  }
+
+  grouping ospf-ospfv3-common-address-family-grouping {
+    container capability {
+      description
+        "Enable specific OSPF feature";
+      leaf capability-type {
+        type enumeration {
+          enum "lls";
+          enum "opaque";
+          enum "transit";
+          enum "vrf-lite";
+        }
+      }
+    }
+    container compatible {
+      description
+        "OSPF compatibility list";
+      leaf rfc1583 {
+        description
+          "Compatible with RFC 1583";
+        type empty;
+      }
+      leaf rfc1587 {
+        description
+          "Compatible with RFC 1587";
+        type empty;
+      }
+      leaf rfc5243 {
+        description
+          "Compatible with RFC 5243";
+        type empty;
+      }
+    }
+    container default-information {
+      description
+        "Control distribution of default information";
+      container originate {
+        description
+          "Distribute a default route";
+        presence "Distribute a default route";
+        leaf always {
+          description
+            "Always advertise default route";
+          type empty;
+        }
+        leaf metric {
+          description
+            "OSPF default metric";
+          type uint32 {
+            range "0 .. 16777214";
+          }
+        }
+        leaf metric-type {
+          description
+            "OSPF metric type for default routes";
+          type ios-types:ospf-metric-type;
+        }
+        leaf route-map {
+          description
+            "Route map reference";
+          type string;
+        }
+      }
+    }
+    leaf default-metric {
+      description
+        "Set metric of redistributed routes";
+      type uint32 {
+        range "1 .. 16777214";
+      }
+    }
+    container discard-route {
+      description
+        "Enable or disable discard-route installation";
+      presence "Enable or disable discard-route installation";
+      leaf external {
+        description
+          "Discard route for redistributed summarised routes";
+        type empty;
+      }
+      leaf internal {
+        description
+          "Discard route for summarised internal routes";
+        type empty;
+      }
+      leaf metric {
+        type uint32 {
+          range "1 .. 255";
+        }
+      }
+    }
+    container distance {
+      description
+        "Define an administrative distance";
+      container ospf-distance {
+        leaf distance {
+          type uint32 {
+            range "1 .. 255";
+          }
+        }
+        leaf ip {
+          type inet:ipv4-address;
+        }
+        leaf wildcard {
+          type inet:ipv4-address;
+        }
+        leaf acl-name {
+          type ios-types:access-list-standard-id-type;
+        }
+      }
+      container ospf {
+        description
+          "OSPF routes Administrative distance";
+        leaf external {
+          description
+            "External routes";
+          type uint32 {
+            range "1 .. 255";
+          }
+        }
+        leaf inter-area {
+          description
+            "Inter-area routes";
+          type uint32 {
+            range "1 .. 255";
+          }
+        }
+        leaf intra-area {
+          description
+            "Intra-area routes";
+          type uint32 {
+            range "1 .. 255";
+          }
+        }
+      }
+    }
+    leaf maximum-paths {
+      description
+        "Forward packets over multiple paths";
+      type uint32 {
+        range "1 .. 32";
+      }
+    }
+    container redistribute {
+      description
+        "Redistribute information from another routing protocol";
+      uses ospf-redistribute-top-grouping;
+      container maximum-prefix {
+        description
+          "Maximum number of prefixes redistributed to protocol";
+        leaf number {
+          type uint32 {
+            range "1 .. 4294967295";
+          }
+        }
+        container threshold-warning-only-container {
+          leaf threshold {
+            type uint32 {
+              range "1 .. 100";
+            }
+          }
+          leaf warning-only {
+            description
+              "Only give warning message when limit is exceeded";
+            type empty;
+          }
+        }
+      }
+      container vrf {
+        description
+          "Specify a source VRF";
+        list non-global-vrf {
+          key "name";
+          leaf name {
+	    must "/ios:native/ios:vrf/ios:definition[ios:name=current()] or /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
+	      error-message "VRF must be created 1st, deleted last";
+            }
+            type string;
+          }
+          uses ospf-redistribute-top-grouping;
+        }
+        container global {
+          description
+            "global VRF";
+          uses ospf-redistribute-top-grouping;
+        }
+      }
+    }
+  }
+
+  grouping ospf-ospfv3-common-grouping {
+    list area {
+      description
+        "OSPF area parameters";
+      key "id";
+      leaf id {
+        type ios-types:ospf-area-type;
+      }
+      container authentication {
+        description
+          "Enable authentication";
+        presence "true";
+        leaf message-digest {
+          description
+            "Use message-digest authentication";
+          type empty;
+        }
+      }
+      container capability {
+        description
+          "Enable area specific capability";
+        leaf default-exclusion {
+          description
+            "Enable exclusion of links from base topology";
+          type empty;
+        }
+      }
+      leaf default-cost {
+        description
+          "Set the summary default-cost of a NSSA/stub area";
+        type uint32 {
+          range "0 .. 16777215";
+        }
+      }
+      list filter-list {
+        description
+          "Filter networks between OSPF areas";
+        key "in-out";
+        leaf in-out {
+          type enumeration {
+            enum "in";
+            enum "out";
+          }
+        }
+        leaf prefix {
+          mandatory true;
+          description
+            "Filter prefixes between OSPF areas";
+          type string;
+        }
+      }
+      container nssa {
+        description
+          "Specify a NSSA area";
+        presence "Specify a NSSA area";
+        container default-information-originate {
+          description
+            "Originate Type 7 default into NSSA area";
+          presence "Originate Type 7 default into NSSA area";
+          leaf metric {
+            description
+              "OSPF default metric";
+            type int32 {
+              range "0 .. 16777214";
+            }
+          }
+          leaf metric-type {
+            description
+              "OSPF metric type for default routes";
+            type ios-types:ospf-metric-type;
+          }
+          leaf no-ext-capability {
+            description
+              "Do not send domain specific capabilities into NSSA";
+            type empty;
+          }
+          leaf no-redistribution {
+            description
+              "No redistribution into this NSSA area";
+            type empty;
+          }
+          leaf no-summary {
+            description
+              "Do not send summary LSA into NSSA";
+            type empty;
+          }
+          leaf nssa-only {
+            description
+              "Limit default advertisement to this NSSA area";
+            type empty;
+          }
+          container translate {
+            description
+              "Translate LSA";
+            container type7 {
+              description
+                "From Type 7 to Type 5";
+              leaf always {
+                description
+                  "Always translate LSAs on this ABR";
+                type empty;
+              }
+              leaf suppress-fa {
+                description
+                  "Suppress forwarding address in translated LSAs";
+                type empty;
+              }
+            }
+          }
+        }
+        leaf no-ext-capability {
+          description
+            "Do not send domain specific capabilities into NSSA";
+          type empty;
+        }
+        leaf no-redistribution {
+          description
+            "No redistribution into this NSSA area";
+          type empty;
+        }
+        leaf no-summary {
+          description
+            "Do not send summary LSA into NSSA";
+          type empty;
+        }
+        leaf nssa-only {
+          description
+            "Limit default advertisement to this NSSA area";
+          type empty;
+        }
+        container translate {
+          description
+            "Translate LSA";
+          container type7 {
+            description
+              "From Type 7 to Type 5";
+            leaf always {
+              description
+                "Always translate LSAs on this ABR";
+              type empty;
+            }
+            leaf suppress-fa {
+              description
+                "Suppress forwarding address in translated LSAs";
+              type empty;
+            }
+          }
+        }
+      }
+      container ipv4-range {
+        list range {
+          description 
+            "Summarize routes matching address/mask (border routers only)";
+          key "ip mask";
+          leaf ip {
+            type inet:ipv4-address;
+          }
+          leaf mask {
+            type inet:ipv4-address;
+          }
+          choice advertise-choice {
+            leaf advertise {
+              description 
+                "Advertise this range (default)";
+              type empty;
+            }
+            leaf not-advertise {
+              description 
+                "DoNotAdvertise this range";
+              type empty;
+            }
+          }
+          leaf cost {
+            description 
+              "User specified metric for this range";
+            type uint32 {
+              range "0 .. 16777215";
+            }
+          }
+        }
+      } 
+      container ipv6-range {
+        list range {
+          description 
+            "Summarize routes matching address/mask (border routers only)";
+          key "ip";
+          leaf ip {
+            type ios-types:ipv6-prefix;
+          }
+          choice advertise-choice {
+            leaf advertise {
+              description 
+                "Advertise this range (default)";
+              type empty;
+            }
+            leaf not-advertise {
+              description 
+                "DoNotAdvertise this range";
+              type empty;
+            }
+          }
+          leaf cost {
+            description 
+              "User specified metric for this range";
+            type uint32 {
+              range "0 .. 16777215";
+            }
+          }
+        }
+      } 
+      list sham-link {
+        description
+          "Define a sham link and its parameters";
+        key "source dest";
+        leaf source {
+          type inet:ip-address;
+        }
+        leaf dest {
+          type inet:ip-address;
+        }
+        leaf cost {
+          description
+            "Associate a cost with the sham-link";
+          type uint16 {
+            range "0 .. 65535";
+          }
+        }
+        container ttl-security {
+          description
+            "TTL security check";
+          leaf hops {
+            description
+              "IP hops";
+            type uint8;
+          }
+        }
+      }
+      container stub {
+        description
+          "Specify a stub area";
+        presence "Specify a stub area";
+        leaf no-ext-capability {
+          description
+            "Do not send domain specific capabilities into stub area";
+          type empty;
+        }
+        leaf no-summary {
+          description
+            "Do not send summary LSA into stub area";
+          type empty;
+        }
+      }
+      list virtual-link {
+        description
+          "Define a virtual link and its parameters";
+        key "id";
+        leaf id {
+          type inet:ip-address;
+        }
+        container authentication {
+          description
+            "Set authentication type";
+          uses ospf-area-virtual-link-grouping;
+          container key-chain {
+            description
+              "Use a key-chain for cryptographic authentication keys";
+            leaf name {
+              type string;
+            }
+            uses ospf-area-virtual-link-grouping;
+          }
+          container message-digest {
+            description
+              "Message-digest authentication";
+            uses ospf-area-virtual-link-grouping;
+          }
+          leaf null {
+            description
+              "No authentication";
+            type empty;
+          }
+        }
+        container hello-interval {
+          description
+            "Hello packet interval";
+          leaf hello-interval-value {
+            type int32 {
+              range "1 .. 8192";
+            }
+          }
+        }
+        container dead-interval {
+          description
+            "Dead router detection time";
+          leaf dead-interval-value {
+            type uint16 {
+              range "1 .. 8192";
+            }
+          }
+        }
+        container retransmit-interval {
+          description
+            "LSA retransmit interval";
+          leaf retransmit-interval-value {
+            type uint16 {
+              range "1 .. 8192";
+            }
+          }
+        }
+        container transmit-delay {
+          description
+            "LSA transmission delay";
+          leaf transmit-delay-value {
+            type uint16 {
+              range "1 .. 8192";
+            }
+          }
+        }
+        container topology {
+          description
+            "Disable virtual link on topology";
+          leaf disable {
+            description
+              "Disable virtual link";
+            type empty;
+          }
+        }
+        container ttl-security {
+          description
+            "TTL security check";
+          leaf hops {
+            description
+              "IP hops";
+            type uint8 {
+              range "1..254";
+            }
+          }
+        }
+        uses ospf-area-virtual-link-grouping;
+      }
+    }
+    container auto-cost {
+      description
+        "Calculate OSPF interface cost according to bandwidth";
+      presence "Calculate OSPF interface cost according to bandwidth";
+      leaf reference-bandwidth {
+        description
+          "Use reference bandwidth method to assign OSPF cost";
+        type uint32 {
+          range "1 .. 4294967";
+        }
+      }
+    }
+    container event-log {
+      description
+        "OSPF Event Logging";
+      presence "true";
+      leaf one-shot {
+        description
+          "Disable Logging When Log Buffer Becomes Full";
+        type empty;
+      }
+      leaf pause {
+        description
+          "Pause Event Logging";
+        type empty;
+      }
+      leaf size {
+        description
+          "Maximum Number of Events Stored in the Event Log";
+        type uint32 {
+          range "1..65534";
+        }
+      }
+    }
+    container bfd {
+      description
+        "BFD configuration commands";
+      leaf all-interfaces {
+        description
+          "Enable BFD on all interfaces";
+        type empty;
+      }
+    }
+    container interface-id {
+      description
+        "Source of the interface ID";
+      leaf snmp-if-index {
+        description
+          "SNMP MIB ifIndex";
+        type empty;
+      }
+    }
+    container log-adjacency-changes {
+      description
+        "Log changes in adjacency state";
+      presence "true";
+      leaf detail {
+        description
+          "Log all state changes";
+        type empty;
+      }
+    }
+    container max-lsa {
+      description
+        "maximum number of LSAs OSPF process will receive";
+      leaf number {
+        type uint32 {
+          range "1 .. 4294967294";
+        }
+      }
+      leaf threshold-value {
+        type uint32 {
+          range "1 .. 100";
+        }
+      }
+      leaf ignore-count {
+        description
+          "maximum number of times adjacencies can be suppressed";
+        type uint32 {
+          range "1 .. 65534";
+        }
+      }
+      leaf ignore-time {
+        description
+          "time during which all adjacencies are suppressed";
+        type uint32 {
+          range "1 .. 17895";
+        }
+      }
+      leaf reset-time {
+        description
+          "time after which ignore-count is reset to zero";
+        type uint32 {
+          range "2 .. 35791";
+        }
+      }
+      leaf warning-only {
+        description
+          "Only give warning message when limit is exceeded";
+        type empty;
+      }
+    }
+    container max-metric {
+      description
+        "Set maximum metric";
+      container router-lsa {
+        description
+          "Maximum metric in self-originated router-LSAs";
+        presence "Maximum metric in self-originated router-LSAs";
+        container external-lsa {
+          presence "Override external-lsa metric with max-metric value";
+          description
+            "Override external-lsa metric with max-metric value";
+          leaf metric {
+            type uint32 {
+              range "1 .. 16777215";
+            }
+          }
+        }
+        leaf include-stub {
+          description
+            "Set maximum metric for stub links in router-LSAs";
+          type empty;
+        }
+        container on-startup {
+          description
+            "Set maximum metric temporarily after reboot";
+          presence "Set maximum metric temporarily after reboot";
+          choice time-wait-for-bgp-choice {
+            leaf time {
+              type uint32 {
+                range "5 .. 86400";
+              }
+            }
+            leaf wait-for-bgp {
+              description
+                "Let BGP decide when to originate router-LSA with normal metric";
+              type empty;
+            }
+          }
+        }
+        container summary-lsa {
+          description
+            "Override summary-lsa metric with max-metric value";
+          presence "Override summary-lsa metric with max-metric value";
+          leaf metric {
+            type uint32 {
+              range "1 .. 16777215";
+            }
+          }
+        }
+      }
+    }
+    uses ios-ifc:passive-interface-grouping;
+    container queue-depth {
+      description
+        "OSPF Hello/Router process queue depth";
+      container hello {
+        description
+          "OSPF Hello process queue depth";
+        uses queue-depth-grouping;
+      }
+      container update {
+        description
+          "OSPF Router process queue depth";
+        uses queue-depth-grouping;
+      }
+    }
+    container timers {
+      description
+        "Adjust routing timers";
+      container lsa {
+        description
+          "OSPF LSA timers";
+        leaf arrival {
+          description
+            "OSPF LSA arrival timer";
+          type uint32 {
+            range "0 .. 600000";
+          }
+        }
+      }
+      container pacing {
+        description
+          "OSPF pacing timers";
+        leaf flood {
+          description
+            "OSPF flood pacing timer";
+          type uint32 {
+            range "5 .. 100";
+          }
+        }
+        leaf lsa-group {
+          description
+            "OSPF LSA group pacing timer";
+          type uint32 {
+            range "10 .. 1800";
+          }
+        }
+        leaf retransmission {
+          description
+            "OSPF retransmission pacing timer";
+          type uint32 {
+            range "5 .. 200";
+          }
+        }
+      }
+      container throttle {
+        description
+          "OSPF throttle timers";
+        container lsa {
+          description
+            "OSPF LSA throttle timers";
+          container all {
+            description
+              "For all type of OSPF LSAs";
+            leaf delay {
+              type uint32 {
+                range "0 .. 600000";
+              }
+            }
+            leaf min-delay {
+              type uint32 {
+                range "0 .. 600000";
+              }
+            }
+            leaf max-delay {
+              type uint32 {
+                range "0 .. 600000";
+              }
+            }
+          }
+        }
+        container spf {
+          description
+            "OSPF SPF throttle timers";
+          leaf delay {
+            type uint32 {
+              range "0 .. 600000";
+            }
+          }
+          leaf min-delay {
+            type uint32 {
+              range "0 .. 600000";
+            }
+          }
+          leaf max-delay {
+            type uint32 {
+              range "0 .. 600000";
+            }
+          }
+        }
+      }
+    }
+    leaf router-id {
+      description
+        "Override configured router identifier (peers will reset)";
+      type inet:ipv4-address;
+    }
+    leaf nsr {
+      description
+        "Enable non-stop routing";
+      type empty;
+    }
+    container traffic-share {
+      description
+        "How to compute traffic share over alternate paths";
+      leaf min {
+        description
+          "All traffic shared among min metric paths";
+        type empty;
+      }
+      leaf across-interfaces {
+        description
+          "Use different interfaces for equal-cost paths";
+        type empty;
+      }
+    }
+    container ttl-security {
+      description
+        "TTL security check";
+      leaf all-interfaces {
+        description
+          "Enable TTL Security on all interfaces";
+        type empty;
+      }
+      leaf hops {
+        description
+          "IP hops";
+        type uint8 {
+          range "1..254";
+        }
+      }
+    }
+  }
+
+  grouping distribute-list-grouping {
+    container distribute-list {
+      description
+        "Filter networks in routing updates";
+      list accesslist {
+        key "in-out";
+        leaf in-out {
+          type ios-types:access-list-in-out-type;
+        }
+      }
+      list accesslist-ifname {
+        key "in-out interface";
+        leaf in-out {
+          type ios-types:access-list-in-out-type;
+        }
+        leaf interface {
+          // Note: interface name must be type string since part of key
+          type string;
+        }
+        leaf interface-routing-id {
+          type uint8;
+        }
+        leaf isis-tag {
+          type string;
+        }
+        leaf vrf {
+          description
+            "VPN Routing/Forwarding Instance";
+          type string;
+        }
+      }
+      list accesslist-prefix-gateway {
+        key "in-out";
+        leaf in-out {
+          type ios-types:access-list-in-out-type;
+        }
+        leaf prefix-gateway {
+          mandatory true;
+          type enumeration {
+            enum "prefix";
+            enum "gateway";
+            enum "route-map";
+          }
+        }
+        leaf name {
+          mandatory true;
+          type string;
+        }
+      }
+      list accesslist-prefix-gateway-ifname {
+        key "in-out interface";
+        leaf in-out {
+          type ios-types:access-list-in-out-type;
+        }
+        leaf interface {
+          type string;
+        }
+        leaf prefix-gateway {
+          mandatory true;
+          type enumeration {
+            enum "prefix";
+            enum "gateway";
+            enum "route-map";
+          }
+        }
+        leaf name {
+          mandatory true;
+          type string;
+        }
+        leaf interface-routing-id {
+          type uint8;
+        }
+        leaf isis-tag {
+          type string;
+        }
+        leaf vrf {
+          description
+            "VPN Routing/Forwarding Instance";
+          type string;
+        }
+      }
+    }
+  }
+
+  grouping ospf-authentication-key-grouping {
+    container authentication-key {
+      description
+        "Set authentication key";
+      leaf auth-type {
+        type uint8 {
+          range "0 .. 7";
+        }
+      }
+      leaf auth-key {
+        type string;
+      }
+    }
+  }
+
+  grouping ospf-area-virtual-link-grouping {
+    uses ospf-authentication-key-grouping;
+    list message-digest-key {
+      description
+        "Set message digest key";
+      key "id";
+      leaf id {
+        type uint8 {
+          range "1 .. 255";
+        }
+      }
+      container md5 {
+        description
+          "Use MD5 algorithm";
+        leaf auth-type {
+          type uint8 {
+            range "0 .. 7";
+          }
+        }
+        leaf auth-key {
+          type string {
+            length "1 .. 16";
+          }
+        }
+      }
+    }
+  }
+
+  //ospf ast-reroute per-prefix tie-break index
+  grouping tie-break-index {
+    leaf required {
+      description
+        "Mandatory repair path attribute";
+      type empty;
+    }
+    leaf index {
+      description
+        "Tiebreak attribute priority";
+      type uint8 {
+        range "1..255";
+      }
+    }
+  }
+
+  grouping queue-depth-grouping {
+    leaf options {
+      type union {
+        type uint32 {
+          range "1 .. 2147483647";
+        }
+        type enumeration {
+          enum "unlimited";
+        }
+      }
+    }
+  }
+
+  grouping router-eigrp-redistribute-grouping {
+    container metric {
+      description
+        "Metric for redistributed routes";
+      leaf bandwith {
+        description
+          "Bandwidth metric in Kbits per second";
+        type uint32 {
+          range "1..4294967295";
+        }
+      }
+      leaf delay {
+        description
+          "EIGRP delay metric, in 10 microsecond units";
+        type uint32 {
+          range "0..4294967295";
+        }
+      }
+      leaf reliability {
+        description
+          "EIGRP reliability metric where 255 is 100% reliable";
+        type uint8 {
+          range "0..255";
+        }
+      }
+      leaf Effective {
+        description
+          "EIGRP Effective bandwidth metric (Loading) where 255 is 100% loaded";
+        type uint8 {
+          range "1..255";
+        }
+      }
+      leaf mtu {
+        description
+          "EIGRP MTU of the path";
+        type uint16 {
+          range "1..65535";
+        }
+      }
+    }
+    leaf route-map {
+      description
+        "Route map reference";
+      type string;
+    }
+  }
+
+  grouping ospf-redistribute-match-grouping {
+    leaf metric {
+      description
+        "Metric for redistributed routes";
+      type uint32;
+    }
+    leaf metric-type {
+      description
+        "OSPF/IS-IS exterior metric type for redistributed routes";
+      type enumeration {
+        enum "1" {
+        }
+        enum "2" {
+        }
+      }
+    }
+    leaf nssa-only {
+      description
+        "Limit redistributed routes to NSSA areas";
+      type empty;
+    }
+    leaf subnets {
+      description
+        "Consider subnets for redistribution into OSPF";
+      type empty;
+    }
+    leaf route-map {
+      description
+        "Route map reference";
+      type string;
+    }
+    leaf tag {
+      description
+        "Set tag for routes redistributed into OSPF";
+      type uint32 {
+        range "0 .. 4294967295";
+      }
+    }
+  }
+
+  grouping ospf-redistribute-top-match-grouping {
+    container match {
+      description
+        "Redistribution of OSPF routes";
+      container internal {
+        presence "Redistribute OSPF internal routes";
+        description
+          "Redistribute OSPF internal routes";
+        uses ospf-redistribute-match-grouping;
+      }
+      container external {
+        description
+          "Redistribute OSPF external routes";
+        presence "Redistribute OSPF external routes";
+        leaf external-routes {
+          type redist-ospf-external-type;
+        }
+        uses ospf-redistribute-match-grouping;
+      }
+      container nssa-external {
+        description
+          "Redistribute OSPF NSSA external routes";
+        presence "Redistribute OSPF NSSA external routes";
+        leaf nssa-external-routes {
+          type redist-ospf-external-type;
+        }
+        uses ospf-redistribute-match-grouping;
+      }
+    }
+  }
+
+  grouping ospf-iso-igrp-redistribute-grouping {
+    leaf metric {
+      description
+        "Metric for redistributed routes";
+      type uint32;
+    }
+    leaf metric-type {
+      description
+        "OSPF/IS-IS exterior metric type for redistributed routes";
+      type enumeration {
+        enum "1" {
+        }
+        enum "2" {
+        }
+      }
+    }
+    leaf tag {
+      description
+        "Set tag for routes redistributed into OSPF";
+      type uint32 {
+        range "0 .. 4294967295";
+      }
+    }
+    leaf subnets {
+      description
+        "Consider subnets for redistribution into OSPF";
+      type empty;
+    }
+  }
+
+  grouping ospf-redistribute-grouping {
+    container redist-options {
+      uses ospf-iso-igrp-redistribute-grouping;
+      leaf route-map {
+        description
+          "Route map reference";
+        type string;
+      }
+      leaf nssa-only {
+        description
+          "Limit redistributed routes to NSSA areas";
+        type empty;
+      }
+    }
+  }
+
+  grouping ospf-redistribute-top-grouping {
+    list application {
+      description
+        "Application";
+      key "name";
+      leaf name {
+        type string;
+      }
+      uses ospf-redistribute-grouping;
+    }
+    list bgp {
+      description
+        "Border Gateway Protocol (BGP)";
+      // must "not (/ios:native/ios:router/ios-ospf:ospf/ios-ospf:vrf) or 
+      //        compare(/ios:native/ios:vrf/ios:definition/ios:name, /ios:native/ios:router/ios-ospf:ospf/ios-ospf:vrf) = 0 and 
+      must "not (/ios:native/ios:router/ios-ospf:ospf/ios-ospf:vrf) or 
+             (/ios:native/ios:vrf/ios:definition/ios:name = /ios:native/ios:router/ios-ospf:ospf/ios-ospf:vrf) and
+	     /ios:native/ios:vrf/ios:definition/ios:rd" {
+	     error-message "To delete vrf/rd, ospf/vrf redistribute bgp needs to be deleted 1st";
+	     }
+      key "as-number";
+      uses ospf-redistribute-bgp-grouping;
+    }
+    container connected {
+      description
+        "Connected";
+      presence "Connected";
+      uses ospf-redistribute-grouping;
+    }
+    list eigrp {
+      description
+        "Enhanced Interior Gateway Routing Protocol (EIGRP)";
+      key "as-number";
+      uses ospf-redistribute-bgp-grouping;
+    }
+    container isis {
+      presence "ISO IS-IS";
+      description
+        "ISO IS-IS";
+      choice isis-level-routes-isis-area-choice {
+        leaf isis-level-routes {
+          type enumeration {
+            enum "level-1";
+            enum "level-2";
+            enum "level-1-2";
+          }
+        }
+        list isis-area {
+          key "name";
+          leaf name {
+            type string;
+          }
+          leaf isis-level-routes {
+            type enumeration {
+              enum "level-1";
+              enum "level-2";
+              enum "level-1-2";
+            }
+          }
+          uses ospf-redistribute-grouping;
+        }
+      }
+      uses ospf-redistribute-grouping;
+    }
+    container iso-igrp {
+      description
+        "IGRP for OSI networks";
+      presence "IGRP for OSI networks";
+      choice area-tag-route-map-choice {
+        container area-tag-route-map-container {
+          leaf area-tag {
+            type string;
+          }
+          leaf route-map {
+            description
+              "Route map reference";
+            type string;
+          }
+        }
+        leaf route-map {
+          description
+            "Route map reference";
+          type string;
+        }
+      }
+      container iso-igrp-container {
+        uses ospf-iso-igrp-redistribute-grouping;
+      }
+    }
+    container lisp {
+      description
+        "Locator ID Separation Protocol (LISP)";
+      uses ospf-redistribute-grouping;
+    }
+    container mobile {
+      description
+        "Mobile routes";
+      presence "Mobile routes";
+      uses ospf-redistribute-grouping;
+    }
+    container odr {
+      description
+        "On Demand stub Routes";
+      presence "On Demand stub Routes";
+      uses ospf-redistribute-grouping;
+    }
+    list ospf {
+      description
+        "Open Shortest Path First (OSPF)";
+      key "id";
+      leaf id {
+        type uint32 {
+          range "1 .. 65535";
+        }
+      }
+      uses ospf-redistribute-top-match-grouping;
+      uses ospf-redistribute-match-grouping;
+      leaf vrf {
+        description
+          "VPN Routing/Forwarding Instance";
+	must "/ios:native/ios:vrf/ios:definition[ios:name=current()] or /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
+	  error-message "VRF must be created 1st, deleted last";
+        }
+        type string;
+      }
+    }
+    list ospfv3 {
+      description
+        "OSPFv3";
+      key "id";
+      leaf id {
+        type uint32 {
+          range "1 .. 65535";
+        }
+      }
+      uses ospf-redistribute-top-match-grouping;
+      uses ospf-redistribute-match-grouping;
+    }
+    list rip {
+      description
+        "Routing Information Protocol (RIP)";
+      key "id";
+      leaf id {
+        description
+          "User selected string identifying this rip process";
+        type string;
+      }
+      uses ospf-redistribute-grouping;
+    }
+    container static {
+      description
+        "Static routes";
+      presence "Static routes";
+      uses ospf-redistribute-grouping;
+    }
+  }
+
+  grouping ospf-redistribute-bgp-grouping {
+    leaf as-number {
+      type ios-types:bgp-as-number-type;
+    }
+    uses ospf-redistribute-grouping;
+  }
+
+  grouping router-snmp-grouping {
+    container snmp {
+      description
+        "Modify snmp parameters";
+      list context {
+        description
+          "Configure a SNMP context";
+        key "name";
+        leaf name {
+          description
+            "Context Name";
+          type string;
+        }
+        container community {
+          description
+            "Configure a SNMP v2c Community string and access privs";
+          leaf community-string {
+            type string;
+          }
+          container access {
+            leaf standard-acl {
+              type uint32 {
+                range "1..99";
+              }
+            }
+            leaf expanded-acl {
+              type uint32 {
+                range "1300..1999";
+              }
+            }
+            leaf acl-name {
+              type string;
+            }
+            leaf ipv6 {
+              description
+                "Specify IPv6 Named Access-List";
+              type string;
+            }
+            leaf ro {
+              description
+                "Read-only access with this community string";
+              type empty;
+            }
+            leaf rw {
+              description
+                "Read-write access with this community string";
+              type empty;
+            }
+          }
+        }
+        container user {
+          description
+            "Configure a SNMP v3 user";
+          leaf name {
+            type string;
+          }
+          container permisssion {
+            container access {
+              description
+                "specify an access-list associated with this group";
+              leaf standard-acl {
+                type uint32;
+              }
+              leaf acl-name {
+                type string;
+              }
+              leaf ipv6 {
+                type string;
+              }
+            }
+            container auth {
+              description
+                "authentication parameters for the user";
+              leaf md5 {
+                description
+                  "Use HMAC MD5 algorithm for authentication";
+                type string;
+              }
+              leaf sha {
+                description
+                  "Use HMAC SHA algorithm for authentication";
+                type string;
+              }
+            }
+            leaf credential {
+              description
+                "If the user password is already configured and saved";
+              type empty;
+            }
+            leaf encrypted {
+              description
+                "specifying passwords as MD5 or SHA digests";
+              type empty;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping ospf-address-family-grouping {
+    uses router-snmp-grouping;
+    container topology {
+      description
+        "Associate the routing protocol to a topology instance";
+      leaf name {
+        type string;
+      }
+      leaf tid {
+        description
+          "Configuring the routing protocol topology tid";
+        type uint32 {
+          range "32..127";
+        }
+      }
+    }
+  }
+
+  grouping config-router-ospf-grouping {
+    list ospf { //69000
+      description
+        "Open Shortest Path First (OSPF)";
+      key "id";
+      leaf id {
+        type uint16 {
+          range "1..65535";
+        }
+      }
+
+      // router ospf * / vrf *
+      leaf vrf {
+        description
+          "VPN Routing/Forwarding Instance";
+	must "/ios:native/ios:vrf/ios:definition[ios:name=current()] or /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
+	  error-message "VRF must be created 1st, deleted last";
+        }
+        type string;
+      }
+
+      // router ospf * / address-family
+      container address-family {
+        description
+          "Enter Address Family command mode";
+        container ipv4_1 {
+          container ipv4 {
+            description
+              "Address family";
+            uses ospf-address-family-grouping;
+          }
+        }
+
+        container ipv4 {
+          description
+            "Address family";
+          container unicast {
+            description
+              "Address Family Modifier";
+            uses ospf-address-family-grouping;
+          }
+          container multicast {
+            description
+              "Address Family Modifier";
+            uses ospf-address-family-grouping;
+          }
+        }
+      }
+
+      uses ospf-ospfv3-common-grouping;
+      uses ospf-ospfv3-common-address-family-grouping;
+      uses distribute-list-grouping;
+      container domain-id {
+        description
+          "OSPF domain-id";
+        choice domain-id-choice {
+          leaf ip-format {
+            type inet:ipv4-address;
+          }
+          container ip-format-secondary {
+            leaf ip {
+              type inet:ipv4-address;
+            }
+            leaf secondary {
+              description
+                "Secondary Domain-ID";
+              type empty;
+            }
+          }
+          leaf Null {
+            description
+              "Null Domain-ID";
+            type empty;
+          }
+          container type {
+            description
+              "OSPF domain ID type in Hex format";
+            leaf type-leaf {
+              type enumeration {
+                enum "0005";
+                enum "0105";
+                enum "0205";
+                enum "8005";
+              }
+            }
+            leaf value {
+              description
+                "OSPF domain ID value in Hex format";
+              type string {
+                pattern "[0-9a-fA-F]{12}";
+              }
+            }
+          }
+        }
+      }
+      leaf domain-tag {
+        description
+          "OSPF domain-tag";
+        type uint32 {
+          range "1 .. 4294967295";
+        }
+      }
+      container fast-reroute {
+        description
+          "LFA FastReroute parameters";
+        leaf keep-all-paths {
+          description
+            "Keep LFA FRR audit trail";
+          type empty;
+        }
+        container per-prefix {
+          description
+            "Per-prefix LFA FRR parameters";
+          container enable {
+            description
+              "Enable LFA Fast Reroute";
+            leaf area {
+              description
+                "Area to enable LFA FRR in";
+              type ios-types:ospf-area-type;
+            }
+            leaf prefix-priority {
+              description
+                "Priority of prefixes to be protected";
+              type enumeration {
+                enum "high";
+                enum "low";
+              }
+            }
+          }
+          container remote-lfa {
+            description
+              "Remote LFA FastReroute parameters";
+            container area-cost {
+              leaf area {
+                description
+                  "Area for remote LFA command";
+                type ios-types:ospf-area-type;
+              }
+              leaf maximum-cost {
+                description
+                  "Maximum distance to tunnel endpoint";
+                type uint32 {
+                  range "1..16777214";
+                }
+              }  
+            }
+            container area-tunnel {
+              leaf area {
+                description
+                  "Area for remote LFA command";
+                type ios-types:ospf-area-type;
+              }
+              leaf tunnel {
+                description
+                  "Remote LFA tunnel type";
+                type enumeration {
+                  enum "mpls-ldp";
+                }
+              }
+            }
+            leaf maximum-cost {
+              description
+                "Maximum distance to tunnel endpoint";
+              type uint32 {
+                range "1..16777214";
+              }
+            }
+            leaf tunnel {
+              description
+                "Remote LFA tunnel type";
+              type enumeration {
+                enum "mpls-ldp";
+              }
+            }
+          }
+          container tie-break {
+            description
+              "LFA FRR repair path selection policy tiebreaks";
+            container broadcast-interface-disjoint {
+              description
+                "Interface protection attribute";
+              uses tie-break-index;
+            }
+            container downstream {
+              description
+                "Downstream repair path attribute";
+              uses tie-break-index;
+            }
+            container linecard-disjoint {
+              description
+                "Line card protection attribute";
+              uses tie-break-index;
+            }
+            container lowest-metric {
+              description
+                "Lowest metric repair path attribute";
+              uses tie-break-index;
+            }
+            container node-protecting {
+              description
+                "Node protecting repair path attribute";
+              uses tie-break-index;
+            }
+            container primary-path {
+              description
+                "Equal cost multipath attribute";
+              uses tie-break-index;
+            }
+            container secondary-path {
+              description
+                "Not-equal cost multipath attribute";
+              uses tie-break-index;
+            }
+            container srlg {
+              description
+                "Shared risk link group attribute";
+              uses tie-break-index;
+            }
+          }
+        }
+      }
+      container graceful-restart {
+        presence "true";
+        description
+          "Graceful-restart options";
+        leaf disable {
+          description
+            "Graceful restart disable";
+          type empty;
+        }
+        container helper {
+          description
+            "helper support";
+          presence "true";
+          leaf disable {
+            description
+              "disable helper support";
+            type empty;
+          }
+          leaf strict-lsa-checking {
+            description
+              "enable helper strict LSA checking";
+            type empty;
+          }
+        }
+        leaf restart-interval {
+          description
+            "Graceful restart interval";
+          type uint16;
+        }
+      }
+      container ignore {
+        description
+          "Do not complain about specific event";
+        container lsa {
+          description
+            "Do not complain upon receiving LSA of the specified type";
+          leaf mospf {
+            description
+              "MOSPF Type 6 LSA";
+            type empty;
+          }
+        }
+      }
+      leaf ispf {
+        description
+          "Enable incremental SPF computation";
+        type empty;
+      }
+      container limit {
+        description
+          "Limit a specific OSPF feature";
+        container retransmissions {
+          description
+            "LS update, DBD, and LS request retransmissions";
+          leaf non-dc {
+            description
+              "Non-demand-circuit retransmissions";
+            type ios-types:limit-dc-non-dc-type;
+          }
+          leaf dc {
+            description
+              "Demand circuit retransmissions";
+            type ios-types:limit-dc-non-dc-type;
+          }
+        }
+      }
+      container local-rib-criteria {
+        description
+          "Enable or disable usage of local RIB as route criteria";
+        leaf forwarding-address {
+          description
+            "Local RIB used to validate external/NSSA forwarding addresses";
+          type empty;
+        }
+        leaf inter-area-summary {
+          description
+            "Local RIB used as criteria for inter-area summaries";
+          type empty;
+        }
+        leaf nssa-translation {
+          description
+            "Local RIB used as criteria for NSSA translation";
+          type empty;
+        }
+      }
+      container microloop {
+        description
+          "Traffic microloop control parameters";
+        container avoidance {
+          description
+            "Traffic microloop avoidance parameters";
+          presence "true";
+          leaf disable {
+            description
+              "Microloop avoidance auto-enable prohibited";
+            type empty;
+          }
+          leaf protected {
+            description
+              "Microloop avoidance for protected prefixes only";
+            type empty;
+          }
+          leaf rib-update-delay {
+            description
+              "Delay before updating the RIB";
+            type uint32 {
+              range "1..600000";
+            }
+          }
+        }
+      }
+
+      container mpls {
+        description
+          "Configure MPLS routing protocol parameters";
+        container ldp {
+          description
+            "routing protocol commands for MPLS LDP";
+          container autoconfig {
+            description
+              "Configure LDP automatic configuration";
+            presence "Configure LDP automatic configuration";
+            leaf area {
+              description
+                "Configure an OSPF area to run MPLS LDP";
+              type ios-types:ospf-area-type;
+            }
+          }
+          container sync {
+            description
+              "Configure LDP-IGP Synchronization";
+            presence "Configure LDP-IGP Synchronization";
+          }
+        }
+        container traffic-eng {
+          description
+            "routing protocol commands for MPLS Traffic Engineering";
+          leaf multicast-intact {
+            description
+              "MPLS TE and PIM interaction";
+            type empty;
+          }
+          list area {
+            description
+              "configure an ospf area to run MPLS Traffic Engineering";
+            key "id";
+            leaf id {
+              description
+                "OSPF area ID";
+              type ios-types:ospf-area-type;
+            }
+          }
+          container autoroute-exclude {
+            description
+              "MPLS TE autoroute exclude";
+            leaf prefix-list {
+              description
+                "Filter prefixes";
+              type string;
+            }
+          }
+          list interface {
+            description
+              "MPLS TE interface configuration for this OSPF process";
+            key "name-id";
+            leaf name-id {
+              description
+                "Interface name and ID";
+              type string;
+            }
+            leaf area {
+              description
+                "Advertise MPLS TE information for this interface into area";
+              type uint32;
+            }
+          }
+          list mesh-group {
+            description
+              "Traffic Engineering Mesh-Group advertisement";
+            key "id area";
+            leaf id {
+              description
+                "Mesh Group ID: <0..4294967295>";
+              type uint32;
+            }
+            leaf area {
+              description
+                "configure flooding scope as area";
+              type ios-types:ospf-area-type;
+            }
+            leaf interface {
+              description
+                "Interface name and ID";
+              type string;
+            }
+          }
+          container router-id {
+            description
+              "Traffic Engineering stable IP address for system";
+            uses ios-ifc:interface-grouping;
+          }
+        }
+      }
+
+      list neighbor {
+        description
+          "Specify a neighbor router";
+        key "ip";
+        leaf ip {
+          type inet:ipv4-address;
+        }
+        leaf cost {
+          description
+            "OSPF cost for point-to-multipoint neighbor";
+          type uint32 {
+            range "1 .. 65535";
+          }
+        }
+        container database-filter {
+          description
+            "Filter OSPF LSA during synchronization and flooding for point-to-multipoint neighbor";
+          container all {
+            description
+              "Filter all LSA";
+            leaf out {
+              description
+                "Outgoing LSA";
+              type empty;
+            }
+          }
+        }
+        leaf poll-interval {
+          description
+            "OSPF dead-router polling interval";
+          type uint32 {
+            range "0 .. 65535";
+          }
+        }
+        leaf priority {
+          description
+            "OSPF priority of non-broadcast neighbor";
+          type uint32 {
+            range "0 .. 255";
+          }
+        }
+      }
+      list network {
+        description
+          "Enable routing on an IP network";
+        key "ip mask";
+        leaf ip {
+          type inet:ipv4-address;
+        }
+        leaf mask {
+          type inet:ipv4-address;
+        }
+        leaf area {
+          description
+            "Set the OSPF area ID";
+          type ios-types:ospf-area-type;
+        }
+      }
+      container nsf {
+        description
+          "Non-stop forwarding";
+        presence "true";
+        container cisco {
+          description
+            "Cisco Non-stop forwarding";
+          presence "true";
+          container enforce {
+            description
+              "Cancel NSF restart when non-NSF-aware neighbors detected";
+            leaf global {
+              description
+                "For the whole OSPF process";
+              type empty;
+            }
+          }
+          container helper {
+            description
+              "helper support";
+            presence "helper support";
+            leaf disable {
+              description
+                "disable helper support";
+              type empty;
+            }
+          }
+        }
+        container ietf {
+          description
+            "IETF graceful restart";
+          presence "true";
+          container helper {
+            description
+              "helper support";
+            presence "helper support";
+            leaf disable {
+              description
+                "disable helper support";
+              type empty;
+            }
+            leaf strict-lsa-checking {
+              description
+                "enable helper strict LSA checking";
+              type empty;
+            }
+          }
+          leaf restart-interval {
+            description
+              "Graceful restart interval";
+            type uint16 {
+              range "1..1800";
+            }
+          }
+        }
+      }
+      container prefix-priority {
+        description
+          "OSPF prefix priority";
+        leaf high {
+          description
+            "High prefix priority";
+          type empty;
+        }
+        leaf route-map {
+          description
+            "Prefix priority selection by route-map";
+          type string;
+        }
+      }
+      leaf prefix-suppression {
+        description
+          "OSPF prefix suppression";
+        type empty;
+      }
+      leaf priority {
+        description
+          "OSPF topology priority";
+        type uint8 {
+          range "0..127";
+        }
+      }
+      container process-min-time {
+        description
+          "Percentage of quantum to be used before releasing CPU";
+        leaf percent {
+          description
+            "percent";
+          type uint32 {
+            range "1 .. 100";
+          }
+        }
+      }
+      leaf shutdown {
+        description
+          "Shutdown the OSPF protocol under the current instance";
+        type boolean;
+      }
+      uses router-snmp-grouping;
+      list summary-address {
+        description
+          "Configure IP address summaries";
+        key "ip wildcard";
+        leaf ip {
+          type inet:ipv4-address;
+        }
+        leaf wildcard {
+          type inet:ipv4-address;
+        }
+        choice tag-no-advertise-choice {
+          leaf nssa-only {
+            description
+              "Limit summary to NSSA areas";
+            type empty;
+          }
+          leaf tag {
+            description
+              "Set tag";
+            type uint32 {
+              range "0 .. 4294967295";
+            }
+          }
+          leaf not-advertise {
+            description
+              "Do not advertise when translating OSPF type-7 LSA";
+            type empty;
+          }
+        }
+      }
+    }
+  }
+
+  /////////////////////////////////////////////////////////
+  // native / router / ospf
+  /////////////////////////////////////////////////////////
+  augment "/ios:native/ios:router" {
+    uses config-router-ospf-grouping;
+  }
+
+  /////////////////////////////////////////////////////////
+  // native / interface * / ip
+  /////////////////////////////////////////////////////////
+  augment "/ios:native/ios:interface/ios:FastEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:GigabitEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TenGigabitEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:FiveGigabitEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TwentyFiveGigE/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TwoGigabitEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:FortyGigabitEthernet/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:HundredGigE/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Port-channel/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Loopback/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Tunnel/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:BDI/ios:ip" {
+    uses config-interface-ip-ospf-grouping;
+  }
+
+  /////////////////////////////////////////////////////////
+  // native / interface * / ipv6
+  /////////////////////////////////////////////////////////
+  augment "/ios:native/ios:interface/ios:FastEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:GigabitEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TenGigabitEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:FiveGigabitEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TwentyFiveGigE/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:TwoGigabitEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:FortyGigabitEthernet/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:HundredGigE/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Port-channel/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Loopback/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+
+  augment "/ios:native/ios:interface/ios:Tunnel/ios:ipv6" {
+    uses config-interface-ipv6-ospf-grouping;
+  }
+}
diff --git a/profiles/bundles/yang/cisco-ios-xe/16.9.1/tailf-cli-extensions.yang b/profiles/bundles/yang/cisco-ios-xe/16.9.1/tailf-cli-extensions.yang
new file mode 100644
index 000000000..e25c2bceb
--- /dev/null
+++ b/profiles/bundles/yang/cisco-ios-xe/16.9.1/tailf-cli-extensions.yang
@@ -0,0 +1,3433 @@
+submodule tailf-cli-extensions {
+
+  belongs-to tailf-common {
+    prefix tailf;
+  }
+
+  include tailf-meta-extensions {
+    revision-date 2017-03-08;
+  }
+
+  organization "Tail-f Systems";
+
+  description
+    "This module defines all Tail-f YANG extensions statements
+     related to CLI customization.
+
+     See also the 'display-' statements and the 'alt-name' statement
+     in tailf-common.yang.";
+
+  revision 2017-08-23 {
+    description
+      "Released as part of Confd-6.4.3 / NCS-4.4.3.
+
+       Added tailf:cli-only-in-autowizard for leafs with sensitive data.";
+  }
+
+  revision 2017-03-08 {
+    description
+      "Released as part of Confd-6.4 / NCS-4.4.
+
+       Included latest revision of the tailf-meta-extensions submodule.";
+  }
+
+  revision 2017-01-26 {
+    description
+      "Released as part of Confd-6.3.1 / NCS-4.3.1.
+
+       Added tailf:cli-reset-full for user ordered lists.";
+  }
+
+  revision 2016-11-24 {
+    description
+      "Released as part of Confd-6.3 / NCS-4.3.
+
+       Added cli-diff-before.
+       Added cli-diff-set-before.
+       Added cli-diff-create-before.
+       Added cli-diff-modify-before.
+       Added cli-diff-delete-before.
+       Added cli-diff-after.
+       Added cli-diff-set-after.
+       Added cli-diff-create-after.
+       Added cli-diff-modify-after.
+       Added cli-diff-delete-after.";
+  }
+
+  revision 2016-05-04 {
+    description
+      "Released as part of Confd-6.2 / NCS-4.2.
+       Added cli-suppress-warning.";
+  }
+
+  revision 2016-04-08 {
+    description
+      "Released as part of ConfD-5.4 / NCS-3.4.
+
+       Added cli-suppress-quotes.";
+  }
+
+  revision 2015-03-19 {
+    description
+      "Released as part of ConfD-5.4 / NCS-3.4.
+
+       Added cli-show-obu-comments.
+       Added cli-batch-confirm-default.";
+  }
+
+  revision 2014-11-13 {
+    description
+      "Released as part of ConfD-5.3 / NCS-3.3.
+
+       Added cli-strict-leafref.
+       Added cli-trigger-on-*.
+       Allow cli-boolean-no in typedef.";
+  }
+
+  revision 2013-11-07 {
+    description
+      "Released as part of ConfD-5.0.
+
+       Added cli-disabled-info.
+       Added cli-suppress-shortenabled.
+       Added cli-no-keyword.
+       Added cli-case-sensitive and cli-case-insensitive.";
+  }
+
+  revision 2012-11-08 {
+    description
+      "Released as part of ConfD-4.1.
+
+       Added cli-delete-when-empty.
+       Added cli-diff-dependency.
+       Added cli-ignore-modified.";
+  }
+
+  revision 2012-08-23 {
+    description
+      "Released as part of ConfD-4.0.1.
+
+       Allow tailf:cli-operational-mode and tailf:cli-configure-mode in
+         rpc.";
+  }
+
+  revision 2012-06-14 {
+    description
+      "Released as part of ConfD-4.0.
+
+       Do not allow tailf:cli-drop-node-name and tailf:cli-sequence-commands
+         inside tailf:action.
+       Added tailf:cli-configure-mode.
+       Added tailf:cli-operational-mode.";
+  }
+
+  revision 2012-05-24 {
+    description
+      "Released as part of ConfD-3.9.2.
+
+       Added tailf:cli-no-value-on-delete.
+       Added tailf:cli-no-name-on-delete.
+       Added tailf:cli-replace-all.
+       Allow tailf:cli-remove-before-change in leaf.";
+  }
+
+  revision 2012-03-08 {
+    description
+      "Released as part of ConfD-3.9.
+
+       Allow tailf:cli-range-list-syntax in lists with one integer based
+         key.";
+  }
+
+  revision 2011-12-08 {
+    description
+      "Released as part of ConfD-3.8.
+
+       Added tailf:cli-min-column-with.";
+  }
+
+  revision 2011-09-22 {
+    description
+      "Released as part of ConfD-3.7.
+
+       Added tailf:cli-disallow-value.
+       Added tailf:cli-multi-word.
+       Added tailf:cli-before-key.
+       Allow tailf:cli-flatten-container in list.";
+  }
+
+  revision 2011-08-25 {
+    description
+      "Released as part of ConfD-3.6.2.
+
+       Added cli-suppress-silent-no.
+       Added cli-range-delimiters.
+       Removed duplicate tailf:use-in statement from cli-show-config.";
+  }
+
+  revision 2011-06-30 {
+    description
+      "Released as part of ConfD-3.6.1.
+
+       Added cli-reversed.
+       Added cli-range-list-syntax.";
+  }
+
+  revision 2011-05-26 {
+    description
+      "Released as part of ConfD-3.6.
+
+      Added cli-allow-join-with-key.
+      Added cli-display-joined.";
+  }
+  revision 2011-02-24 {
+    description
+      "Released as part of ConfD-3.5.
+
+      Added cli-boolean-no.
+      Added cli-exit-command.
+      Added cli-custom-range-enumerator.
+      Added cli-reset-siblings.
+      Added cli-reset-all-siblings.
+      Added cli-reset-container.
+      Added cli-hide-in-submode.
+      Added cli-prefix-key.
+      Added cli-show-with-default.
+
+      Added 'commasep' and 'show:<dictionary>' filter in
+      cli-template-string.
+
+      Removed deprecated tailf:cli-default-order.";
+  }
+
+  revision 2010-12-02 {
+    description
+      "Released as part of ConfD-3.4.1.
+
+      Added cli-flatten-container.";
+  }
+
+  revision 2010-11-04 {
+    description
+      "Released as part of ConfD-3.4.
+
+      Added cli-key-format.
+      Added cli-list-syntax.
+      Added cli-flat-list-syntax.
+
+      The following statements were added in ConfD-3.3.3:
+
+      Added cli-suppress-list-no.
+      Added cli-suppress-no.
+      Added cli-full-no.
+      Added cli-incomplete-no.";
+  }
+
+  revision 2010-09-16 {
+    description
+      "Released as part of ConfD-3.3.2.
+
+      Added cli-autowizard.
+      Added cli-multi-word-key.
+      Added cli-no-match-completion.";
+  }
+
+  revision 2010-08-19 {
+    description
+      "Released as part of ConfD-3.3.1.
+
+      Added cli-show-template-footer.
+      Added cli-run-template-footer.
+      Added cli-table-footer.
+      Changed cli-table-legend to be a template.";
+  }
+
+  revision 2010-06-17 {
+    description
+      "Released as part of ConfD-3.3.
+
+      Added cli-display-empty-config.
+
+      Added cli-expose-key-name.
+
+      Added cli-value-display-template.
+
+      Added cli-run-template.
+      Added cli-run-template-legend.
+      Added cli-run-template-enter.
+
+      Added cli-suppress-key-sort.
+
+      Added cli-suppress-validation-warning-prompt.
+
+      Added 'hex' and 'hexlist' as display parameters in the
+      type cli-template-string.
+
+      Deprecated tailf:cli-default-order.";
+  }
+
+  revision 2010-03-18 {
+    description
+      "Released as part of ConfD-3.2.";
+  }
+
+  extension cli-suppress-quotes {
+    tailf:use-in "leaf";
+    description
+      "Specifies that configuration data for a leaf should never be wrapped
+      with quotes. All internal data will be escaped to make sure it
+      can be presented correctly.
+
+      Can't be used for keys.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-show-no {
+    tailf:use-in "leaf";
+    tailf:use-in "list";
+    tailf:use-in "leaf-list";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that an optional leaf node or presence container
+      should be displayed as 'no <name>' when it does not exist.
+      For example, if a leaf 'shutdown' has this property and
+      does not exist, 'no shutdown' is displayed.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-disallow-value {
+    argument value {
+      tailf:arg-type {
+         type string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    description
+      "Specifies that a pattern for invalid values.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-boolean-no {
+    tailf:use-in "typedef";
+    tailf:use-in "leaf";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    tailf:substatement "tailf:cli-reversed";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that a leaf of type boolean should be displayed as
+       '<leafname>' if set to true, and 'no <leafname>' if set to
+       false.
+
+       Cannot be used in conjunction with tailf:cli-hide-in-submode
+       or tailf:cli-compact-syntax.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-reversed {
+    tailf:use-in "tailf:cli-boolean-no";
+    description
+      "Specified that true should be displayed as 'no <name>' and
+       false as 'name'.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-autowizard {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the autowizard should include this leaf even
+       if the leaf is optional.
+
+       One use case is when implementing pre-configuration of devices.
+       A config false node can be defined for showing if the
+       configuration is active or not (preconfigured).
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-show-config {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    description
+      "Specifies that the node will be included when doing a 'show
+      running-configuration', even if it is a non-config node.
+
+      Used in I- and C-style CLIs.";
+  }
+
+
+  extension cli-display-empty-config {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the node will be included when doing a 'show
+      stats', even if it is a non-config node, provided
+      that the list contains at least one non-config node.
+
+      Used in J-style CLI.";
+  }
+
+  extension cli-mode-name {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies a custom mode name, instead of the default which is the
+      name of the list or container node.
+
+      Can be used in config nodes only.  If used in a container, the
+      container must also have a tailf:cli-add-mode statement, and if
+      used in a list, the list must not also have a
+      tailf:cli-suppress-mode statement.
+
+      Variables for the list keys in the current mode are available.
+      For examples, 'config-foo-xx$(name)' (privided the key leaf
+      is called 'name').
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-show-order-taglist {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a custom display order for nodes with the
+       tailf:cli-show-order-tag attribute. Nodes will be displayed
+       in the order indicated in the list. Nodes without a tag will
+       be displayed after all nodes with a tag have been displayed.
+
+       The scope of a taglist is until a new taglist is encountered.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-show-order-tag {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies a custom display order for nodes with the
+       tailf:cli-show-order-tag attribute. Nodes will be displayed
+       in the order indicated by a cli-show-order-taglist attribute in
+       a parent node.
+
+       The scope of a tag reaches until a new taglist is encountered.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-mode-name-actionpoint {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that a custom function will be invoked to find out the mode
+      name, instead of using the default with is the name of the list
+      or container node.
+
+      The argument is the name of an actionpoint, which must be
+      implemented by custom code.  In the actionpoint, the command()
+      callback function will be invoked, and it must return a string
+      with the mode name.  See confd_lib_dp(3) for details.
+
+      Can be used in config nodes only.  If used in a container, the
+      container must also have a tailf:cli-add-mode statement, and if
+      used in a list, the list must not also have a
+      tailf:cli-suppress-mode statement.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-add-mode {
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Creates a mode of the container.
+
+      Can be used in config nodes only.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-flatten-container {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Allows the CLI to exit the container and continue to input
+       from the parent container when all leaves in the current
+       container has been set.
+
+      Can be used in config nodes only.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-mode {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Instructs the CLI engine to not make a mode of the list node.
+
+      Can be used in config nodes only.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-delete-when-empty {
+    tailf:use-in "list";
+    tailf:use-in "container";
+    description
+      "Instructs the CLI engine to delete the list when the last list
+       instance is deleted'. Requires that cli-suppress-mode is set.
+
+       The behavior is recursive. If all optional leafs in a list
+       instance are deleted the list instance itself is deleted. If
+       that list instance happens to be the last list instance in a
+       list it is also deleted. And so on. Used in I- and C-style
+       CLIs.";
+  }
+
+  extension cli-remove-before-change {
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Instructs the CLI engine to generate a no-commnd before
+       modifying an existing instance. It only applies when
+       generating diffs, eg 'show configuration' in C-style.";
+  }
+
+  extension cli-no-value-on-delete {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "When displaying the deleted version of this leaf do not
+       include the old value.
+
+       Applies to C-style";
+  }
+
+  extension cli-no-name-on-delete {
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "When displaying the deleted version of this element do not
+       include the name.
+
+       Applies to C-style";
+  }
+
+  extension cli-embed-no-on-delete {
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Embed no in front of the element name insead of at the
+       beginning of the line.
+
+       Applies to C-style";
+  }
+
+  extension cli-recursive-delete {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "When generating configuration diffs delete all contents
+       of a container or list before deleting the node.
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-before {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any changes made to this node
+       before any changes made to the target node(s).
+
+       Thus, the dependency will trigger when any changes
+       (created, modified or deleted) has been made to this node
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-delete-before {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any delete operations made on this node
+       before any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been deleted
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-set-before {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any set operations (created or modified) made on this node
+       before any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been set
+       (created or modified) while any changes (created, modified or deleted)
+       has been made to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-create-before {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any create operations made on this node
+       before any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been created
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-modify-before {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any modify operations made on this node
+       before any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been modified
+       (not created or deleted) while any changes (created, modified or deleted)
+       has been made to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-after {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any changes made to this node
+       after any changes made to the target node(s).
+
+       Thus, the dependency will trigger when any changes
+       (created, modified or deleted) has been made to this node
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-delete-after {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any delete operations made on this node
+       after any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been deleted
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-set-after {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any set operations (created or modified) made on this node
+       after any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been set
+       (created or modified) while any changes (created, modified or deleted)
+       has been made to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-create-after {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any create operations made on this node
+       after any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been created
+       while any changes (created, modified or deleted) has been made
+       to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-diff-modify-after {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-when-target-set";
+    tailf:substatement "tailf:cli-when-target-create";
+    tailf:substatement "tailf:cli-when-target-modify";
+    tailf:substatement "tailf:cli-when-target-delete";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "When displaying C-style configuration diffs,
+       display any modify operations made on this node
+       after any changes made to the target node(s).
+
+       Thus, the dependency will trigger when this node has been modified
+       (not created or deleted) while any changes (created, modified or deleted)
+       has been made to the target node(s).
+
+       Applies to C-style";
+  }
+
+  extension cli-when-target-set {
+    tailf:use-in "tailf:cli-diff-before";
+    tailf:use-in "tailf:cli-diff-delete-before";
+    tailf:use-in "tailf:cli-diff-set-before";
+    tailf:use-in "tailf:cli-diff-create-before";
+    tailf:use-in "tailf:cli-diff-modify-before";
+    tailf:use-in "tailf:cli-diff-after";
+    tailf:use-in "tailf:cli-diff-delete-after";
+    tailf:use-in "tailf:cli-diff-set-after";
+    tailf:use-in "tailf:cli-diff-create-after";
+    tailf:use-in "tailf:cli-diff-modify-after";
+    description
+      "Specify that the dependency should trigger when the target node(s)
+       has been set (created or modified).
+       Note; using this sub-statement is equivalent with using
+       both tailf:cli-when-target-create and tailf:cli-when-target-modify";
+  }
+
+  extension cli-when-target-create {
+    tailf:use-in "tailf:cli-diff-before";
+    tailf:use-in "tailf:cli-diff-delete-before";
+    tailf:use-in "tailf:cli-diff-set-before";
+    tailf:use-in "tailf:cli-diff-create-before";
+    tailf:use-in "tailf:cli-diff-modify-before";
+    tailf:use-in "tailf:cli-diff-after";
+    tailf:use-in "tailf:cli-diff-delete-after";
+    tailf:use-in "tailf:cli-diff-set-after";
+    tailf:use-in "tailf:cli-diff-create-after";
+    tailf:use-in "tailf:cli-diff-modify-after";
+    description
+      "Specify that the dependency should trigger when the target node(s)
+       has been created";
+  }
+
+  extension cli-when-target-modify {
+    tailf:use-in "tailf:cli-diff-before";
+    tailf:use-in "tailf:cli-diff-delete-before";
+    tailf:use-in "tailf:cli-diff-set-before";
+    tailf:use-in "tailf:cli-diff-create-before";
+    tailf:use-in "tailf:cli-diff-modify-before";
+    tailf:use-in "tailf:cli-diff-after";
+    tailf:use-in "tailf:cli-diff-delete-after";
+    tailf:use-in "tailf:cli-diff-set-after";
+    tailf:use-in "tailf:cli-diff-create-after";
+    tailf:use-in "tailf:cli-diff-modify-after";
+    description
+      "Specify that the dependency should trigger when the target node(s)
+       has been modified (not created or deleted)";
+  }
+
+  extension cli-when-target-delete {
+    tailf:use-in "tailf:cli-diff-before";
+    tailf:use-in "tailf:cli-diff-delete-before";
+    tailf:use-in "tailf:cli-diff-set-before";
+    tailf:use-in "tailf:cli-diff-create-before";
+    tailf:use-in "tailf:cli-diff-modify-before";
+    tailf:use-in "tailf:cli-diff-after";
+    tailf:use-in "tailf:cli-diff-delete-after";
+    tailf:use-in "tailf:cli-diff-set-after";
+    tailf:use-in "tailf:cli-diff-create-after";
+    tailf:use-in "tailf:cli-diff-modify-after";
+    description
+      "Specify that the dependency should trigger when the target node(s)
+       has been deleted";
+  }
+
+  extension cli-diff-dependency {
+    argument path {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:xpath-root";
+    tailf:substatement "tailf:cli-trigger-on-set";
+    tailf:substatement "tailf:cli-trigger-on-delete";
+    tailf:substatement "tailf:cli-trigger-on-all";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:occurence "*";
+    description
+      "Tells the 'show configuration' command, and the diff generator
+       that this node depends on another node. When removing the node
+       with this declaration, it should be removed before the node
+       it depends on is removed, ie the declaration controlls the ordering
+       of the commands in the 'show configuration' output.
+
+       Applies to C-style";
+  }
+
+  extension cli-trigger-on-set {
+    tailf:use-in "tailf:cli-diff-dependency";
+    description
+      'Specify that the dependency should trigger on set/modify of
+       the target path, but deletion of the target will trigger the
+       current node to be placed in front of the target.
+
+       The annotation can be used to get the diff behavior where
+       one leaf is first deleted before the other leaf is set.
+       For example, having the data model below:
+
+        container X {
+          leaf A {
+            tailf:cli-diff-dependency "../B" {
+              tailf:cli-trigger-on-set;
+            }
+            type empty;
+          }
+          leaf B {
+            tailf:cli-diff-dependency "../A"  {
+              tailf:cli-trigger-on-set;
+            }
+            type empty;
+          }
+        }
+
+       produces the following diffs when setting one leaf
+       and deleting the other
+
+         no X A
+         X B
+
+       and
+
+         no X B
+         X A
+
+       this can also be done with list instances, for example
+
+         list a {
+           key id;
+
+           leaf id {
+             tailf:cli-diff-dependency "/c[id=current()/../id]" {
+               tailf:cli-trigger-on-set;
+             }
+             type string;
+           }
+         }
+
+         list c {
+           key id;
+           leaf id {
+             tailf:cli-diff-dependency "/a[id=current()/../id]" {
+               tailf:cli-trigger-on-set;
+             }
+             type string;
+           }
+         }
+
+       we get
+
+         no a foo
+         c foo
+         !
+
+       and
+
+         no c foo
+         a foo
+         !
+
+       In the above case if we have the same id in list "a" and "c"
+       and we delete the instance in one list, and add it in the other,
+       then the deletion will always preceed the create.
+      ';
+  }
+
+  extension cli-trigger-on-delete {
+    tailf:use-in "tailf:cli-diff-dependency";
+    description
+      "This annotation can be used togeter with tailf:cli-trigger-on-set
+       to also get the behavior that when deleting the target display
+       changes to this node first. For exmaple:
+
+        container settings {
+          tailf:cli-add-mode;
+
+          leaf opmode {
+            tailf:cli-no-value-on-delete;
+
+            type enumeration {
+              enum nat;
+              enum transparent;
+            }
+          }
+
+          leaf manageip {
+            when \"../opmode = 'transparent'\";
+            mandatory true;
+            tailf:cli-no-value-on-delete;
+            tailf:cli-diff-dependency '../opmode' {
+              tailf:cli-trigger-on-set;
+              tailf:cli-trigger-on-delete;
+            }
+
+            type string;
+          }
+        }
+
+      What we are trying to achieve here is that if manageip is
+      deleted, it should be displayed before opmode, but if we
+      configure both opmode and manageip, we should display opmode
+      first, ie get the diffs:
+
+       settings
+        opmode   transparent
+        manageip 1.1.1.1
+       !
+
+      and
+
+       settings
+        no manageip
+        opmode nat
+       !
+
+      and
+
+       settings
+        no manageip
+        no opmode
+       !
+
+      The cli-trigger-on-set annotation will cause the 'no manageip'
+      command to be displayed before setting opmode. The
+      tailf:cli-trigger-on-delete will cause 'no manageip' to be
+      placed before 'no opmode' when both are deleted.
+
+      In the first diff where both are created, opmode will come first
+      due to the diff-dependency setting, regardless of the
+      cli-trigger-on-delete and cli-trigger-on-set.
+      ";
+
+  }
+
+
+  extension cli-trigger-on-all {
+    tailf:use-in "tailf:cli-diff-dependency";
+    description
+      "Specify that the dependency should always trigger. It is the
+       same as placing one element before another in the data model.
+       For example, given the data model:
+
+       container X {
+         leaf A {
+           tailf:cli-diff-dependency '../B' {
+             tailf:cli-trigger-on-all;
+           }
+           type empty;
+         }
+         leaf B {
+           type empty;
+         }
+       }
+
+       We get the diffs
+
+         X B
+         X A
+
+       and
+
+         no X B
+         no X A
+      ";
+  }
+
+
+  extension cli-ignore-modified {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Tells the cdb_cli_diff_iterate system call to not generate
+       a CLI string when this container is modified. The string will
+       instead be generated for the modified sub-element.
+
+       Applies to C-style and I-style";
+  }
+
+  extension cli-show-long-obu-diffs {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    tailf:substatement "tailf:cli-reset-full" {
+      tailf:occurence "?";
+    }
+    description
+      "Instructs the CLI engine to not generate 'insert' comments
+       when displaying configuration changes of ordered-by user
+       lists, but instead explicitly remove old instances with 'no'
+       and then add the instances following a newly inserted instance.
+       Should not be used together with tailf:cli-show-obu-comments";
+  }
+
+  extension cli-reset-full {
+    tailf:use-in "tailf:cli-show-long-obu-diffs";
+    description
+      "Indicates that the list should be fully printed out on change.";
+  }
+
+  extension cli-show-obu-comments {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Enforces the CLI engine to generate 'insert' comments
+       when displaying configuration changes of ordered-by user
+       lists. Should not be used together with tailf:cli-show-long-obu-diffs";
+  }
+
+  extension cli-allow-join-with-key {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-display-joined";
+    description
+      "Indicates that the list name may be written together
+      with the first key, without requiring a whitespace
+      in between, ie allowing both
+            interface ethernet1/1
+      and
+            interface ethernet 1/1
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-allow-join-with-value {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-display-joined";
+    description
+      "Indicates that the leaf name may be written together
+      with the value, without requiring a whitespace
+      in between, ie allowing both
+            interface ethernet1/1
+      and
+            interface ethernet 1/1
+
+      Used in I- and C-style CLIs.";
+  }
+
+
+  extension cli-display-joined {
+    tailf:use-in "tailf:cli-allow-join-with-key";
+    tailf:use-in "tailf:cli-allow-join-with-value";
+    description
+      "Specifies that the joined version should be used when displaying
+       the configuration in C- and I- mode.";
+  }
+
+  extension cli-exit-command {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    tailf:substatement "tailf:info";
+    description
+      "Tells the CLI to add an explicit exit-from-submode command.
+       The tailf:info substatement can be used for adding a custom
+       info text for the command.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-explicit-exit {
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    description
+      "Tells the CLI to add an explicit exit command when displaying
+       the configuration. It will not be added if cli-exit-command
+       is defined as well. The annotation is inherited by all
+       sub-modes.
+
+      Used in I- and C-style CLIs.";
+  }
+
+
+  extension cli-key-format {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "The format string is used when parsing a key value and when
+      generating a key value for an existing configuration. The key
+      items are numbered from 1-N and the format string should
+      indicate how they are related by using $(X) (where X is the
+      key number). For example:
+
+      tailf:cli-key-format '$(1)-$(2)' means that the first key
+      item is concatenated with the second key item by a '-'.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-key-sort {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Instructs the CLI engine to not sort the keys in alphabetical order
+      when presenting them to the user during TAB completion.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-table {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Instructs the CLI engine to not print the list as a table in
+      the 'show' command.
+
+      Can be used in non-config nodes only.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-validation-warning-prompt {
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Instructs the CLI engine to not prompt the user whether to proceed
+      or not if a warning is generated for this node.
+
+      Used in I- and C-style CLIs.";
+  }
+
+
+  extension cli-suppress-key-abbreviation {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Key values cannot be abbreviated.  The user must always give
+      complete values for keys.
+
+      In the J-style CLI this is relevant when using the commands
+      'delete' and 'edit'.
+
+      In the I- and C-style CLIs this is relevant when using the
+      commands 'no', 'show configuration' and for commands to enter
+      submodes.
+
+      See also /confdConfig/cli/allowAbbrevKeys in confd.conf(5).";
+  }
+
+  extension cli-allow-key-abbreviation {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Key values can be abbreviated.
+
+      In the J-style CLI this is relevant when using the commands
+      'delete' and 'edit'.
+
+      In the I- and C-style CLIs this is relevant when using the
+      commands 'no', 'show configuration' and for commands to enter
+      submodes.
+
+      See also /confdConfig/cli/allowAbbrevKeys in confd.conf(5).";
+  }
+
+  extension cli-table-legend {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a template string to be printed before all list entries are
+      printed.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-table-footer {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a template string to be printed after all list entries are
+      printed.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-completion-actionpoint {
+    argument value {
+      tailf:arg-type {
+        type tailf:identifier;
+      }
+    }
+    tailf:use-in "leaf-list";
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-completion-id";
+    description
+      "Specifies that completion for the leaf values is done through a
+      callback function.
+
+      The argument is the name of an actionpoint, which must be
+      implemented by custom code.  In the actionpoint, the completion()
+      callback function will be invoked.  See confd_lib_dp(3) for details.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-completion-id {
+    argument value {
+      tailf:arg-type {
+        type tailf:identifier;
+      }
+    }
+    tailf:use-in "tailf:cli-completion-actionpoint";
+    tailf:use-in "tailf:cli-custom-range-actionpoint";
+    description
+      "Specifies a string which is passed to the callback when invoked.
+      This makes it possible to use the same callback at several
+      locations and still keep track of which point it is invoked
+      from.";
+  }
+
+  extension cli-allow-caching {
+    tailf:use-in "tailf:cli-custom-range-actionpoint";
+    tailf:use-in "tailf:cli-custom-range-enumerator";
+    description
+      "Allow caching of the evaluation results between different parent paths.";
+  }
+
+  extension cli-multi-line-prompt {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Tells the CLI to automatically enter multi-line mode when prompting
+       the user for a value to this leaf.
+
+       Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-multi-word-key {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-max-words";
+    description
+      "Specifies that the key should allow multiple tokens for the
+       value. Proper type restrictions needs to be used to limit
+       the range of the leaf value.
+
+      Can be used in key leafs only.
+
+      Note: This extension isn't applicable in actions
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-max-words {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "tailf:cli-multi-word-key";
+    tailf:use-in "tailf:cli-multi-word";
+    tailf:use-in "tailf:cli-multi-value";
+    description
+      "Specifies the maximum number of allowed words for the key or value.";
+  }
+
+  extension cli-allow-range {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Means that the non-integer key should allow range expressions.
+
+      Can be used in key leafs only.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-range-delimiters {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Allows for custom delimiters to be defined for range expressions.
+      By default only / is considered a delimiter, ie when processing
+      a key like 1/2/3 then each of 1, 2 and 3 will be matched separately
+      agains range expressions, ie given the expression 1-3/5-6/7,8
+      1 will be matched with 1-3, 2 with 5-6, and 3 with 7,8. If, for
+      example, the delimiters value is set to '/.' then both '/' and
+      '.' will be considered delimiters and an key such as 1/2/3.4 will
+      consist of the enteties 1,2,3,4, all matched separately.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+
+  extension cli-suppress-range {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Means that the integer key should not allow range expressions.
+
+      Can be used in key leafs only.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-custom-range {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-range-type" {
+      tailf:occurence "1";
+    }
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that the key should support ranges.  A type matching the
+      range expression must be supplied.
+
+      Can be used in key leafs only.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-custom-range-actionpoint {
+    argument value {
+      tailf:arg-type {
+        type tailf:identifier;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-completion-id";
+    tailf:substatement "tailf:cli-allow-caching";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that the list supports range expressions and that a custom
+      function will be invoked to determine if an instance belong in
+      the range or not. At least one key element needs a
+      cli-custom-range statement.
+
+      The argument is the name of an actionpoint, which must be
+      implemented by custom code.  In the actionpoint, the
+      completion() callback function will be invoked.  See
+      confd_lib_dp(3) for details.
+
+      When a range expression value which matches the type is given in
+      the CLI, the CLI engine will invoke the callback with each
+      existing list entry instance.  If the callback returns CONFD_OK,
+      it matches the range expression, and if it returns CONFD_ERR, it
+      doesn't match.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-custom-range-enumerator {
+    argument value {
+      tailf:arg-type {
+        type tailf:identifier;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-completion-id";
+    tailf:substatement "tailf:cli-allow-caching";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies a callback to invoke to get an array of
+      instances matching a regular expression. This is used
+      when instances should be allowed to be created using
+      a range expression in set.
+
+      The callback is not used for delete or show operations.
+
+      The callback is allowed to return a superset of all matching
+      instances since the instances will be filtered using the
+      range expression afterwards.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-range-type {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "tailf:cli-custom-range";
+    description
+      "This statement contains the name of a derived type, possibly
+      with a prefix.  If no prefix is given, the type must be defined in
+      the local module.  For example:
+
+        cli-range-type p:my-range-type;
+
+      All range expressions must match this type, and a valid key
+      value must not match this type.";
+  }
+
+  extension cli-allow-wildcard {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Means that the list allows wildcard expressions in the 'show' pattern.
+
+      See also /confdConfig/cli/allowWildcard in confd.conf(5).
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-wildcard {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Means that the list does not allow wildcard expressions in the 'show'
+      pattern.
+
+      See also /confdConfig/cli/allowWildcard in confd.conf(5).
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-warning {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "tailf:cli-run-template-enter";
+    tailf:use-in "tailf:cli-sequence-commands";
+    tailf:use-in "tailf:cli-hide-in-submode";
+    tailf:use-in "tailf:cli-boolean-no";
+    tailf:use-in "tailf:cli-compact-syntax";
+    tailf:use-in "tailf:cli-break-sequence-commands";
+    tailf:use-in "tailf:cli-show-long-obu-diffs";
+    tailf:use-in "tailf:cli-show-obu-comments";
+    tailf:use-in "tailf:cli-suppress-range";
+    tailf:use-in "tailf:cli-suppress-mode";
+    tailf:use-in "tailf:cli-custom-range";
+    tailf:use-in "tailf:cli-custom-range-actionpoint";
+    tailf:use-in "tailf:cli-custom-range-enumerator";
+    tailf:use-in "tailf:cli-drop-node-name";
+    tailf:use-in "tailf:cli-add-mode";
+    tailf:use-in "tailf:cli-mode-name";
+    tailf:use-in "tailf:cli-incomplete-command";
+    tailf:use-in "tailf:cli-full-command";
+    tailf:use-in "tailf:cli-mode-name-actionpoint";
+    tailf:use-in "tailf:cli-optional-in-sequence";
+    tailf:use-in "tailf:cli-prefix-key";
+    tailf:use-in "tailf:cli-show-no";
+    tailf:use-in "tailf:cli-show-order-tag";
+    tailf:use-in "tailf:cli-diff-dependency";
+    tailf:use-in "container";
+    description
+      "Avoid involving specific CLI-extension related YANG statements in
+       warnings related to certain yanger error codes. For a list of
+       yanger error codes do 'yanger -e'.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-configure-mode {
+    tailf:use-in "tailf:action";
+    tailf:use-in "rpc";
+    description
+      "An action or rpc with this attribute will be available in
+       configure mode, but not in operational mode.
+
+       The default is that the action or rpc is available in both
+       configure and operational mode.
+
+       Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-operational-mode {
+    tailf:use-in "tailf:action";
+    tailf:use-in "rpc";
+    description
+      "An action or rpc with this attribute will be available in
+       operational mode, but not in configure mode.
+
+       The default is that the action or rpc is available in both
+       configure and operational mode.
+
+       Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-mount-point {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "tailf:action";
+    tailf:use-in "rpc";
+    description
+      "By default actions are mounted under the 'request'
+       command in the J-style CLI and at the top-level in
+       the I- and C-style CLIs. This annotation allowes
+       the action to be mounted under other top level commands";
+  }
+
+  extension cli-batch-confirm-default {
+    argument name {
+      tailf:arg-type {
+        type boolean;
+      }
+    }
+    tailf:use-in "tailf:confirm-text";
+    description
+      "Specifies if the default is to proceed or abort the action during batch
+      processing in the CLI (e.g. non-interactive mode) when a confirm-text is
+      set. If this value is not specified, the default value may instead be
+      provdied by tailf:confirm-default or by the ConfD global default if
+      specified in a clispec(5).";
+  }
+
+  extension cli-delayed-auto-commit {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Enables transactions while in a specific submode (or submode of that
+      mode).  The modifications performed in that mode will not take effect
+      until the user exits that submode.
+
+      Can be used in config nodes only.  If used in a container, the
+      container must also have a tailf:cli-add-mode statement, and if
+      used in a list, the list must not also have a
+      tailf:cli-suppress-mode statement.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-preformatted {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Suppresses quoting of non-config elements when displaying them.
+      Newlines will be preserved in strings etc.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-disabled-info {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies an info string that will be used as a descriptive text for the
+      value 'disable' (false) of boolean-typed leafs when the confd.conf(5)
+      setting /confdConfig/cli/useShortEnabled is set to 'true'.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-shortenabled {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Suppresses the confd.conf(5) setting /confdConfig/cli/useShortEnabled.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-trim-default {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    status deprecated;
+    description
+      "Do not display value if it is same as default.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-expose-key-name {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Force the user to enter the name of the key and display the
+      key name when displaying the running-configuration.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+
+  extension cli-enforce-table {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Forces the generation of a table for a list element node regardless of
+      whether the table will be too wide or not.  This applies to the
+      tables generated by the auto-rendred show commands for non-config data.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-drop-node-name {
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that the name of a node is not present in the CLI.
+
+      If tailf:cli-drop-node-name is given on a child to a list node,
+      we recommend that you also use tailf:cli-suppress-mode on that
+      list node, otherwise the CLI will be very confusing.
+
+      For example, consider this data model, from the tailf-aaa module:
+
+      list alias {
+        key name;
+        leaf name {
+          type string;
+        }
+        leaf expansion {
+          type string;
+          mandatory true;
+          tailf:cli-drop-node-name;
+        }
+      }
+
+      If you type 'alias foo' in the CLI, you would end up in the
+      'alias' submode.  But since the expansion is dropped, you would
+      end up specifying the expansion value without typing any command.
+
+      If, on the other hand, the 'alias' list had a
+      tailf:cli-suppress-mode statement, you would set an expansion
+      'bar' by typing 'alias foo bar'.
+
+      tailf:cli-drop-node-name cannot be used inside tailf:action.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-no-keyword {
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the name of a node is not present in the CLI.
+
+
+       Note that is must be used with some care, just
+       like tailf:cli-drop-node-name. The resulting data model must still
+       be possible to parse deterministically.
+       For example, consider the data model
+
+       container interfaces {
+          list traffic {
+              tailf:cli-no-keyword;
+              key id;
+              leaf id { type string; }
+              leaf mtu { type uint16; }
+          }
+          list management {
+              tailf:cli-no-keyword;
+              key id;
+              leaf id { type string; }
+              leaf mtu { type uint16; }
+          }
+       }
+
+       In this case it is impossible to determine if the config
+
+       interfaces {
+          eth0 {
+             mtu 1400;
+           }
+       }
+
+       Means that there should be an traffic interface instance named
+       'eth0' or a management interface instance maned 'eth0'. If, on
+       the other hand, a restriction on the type was used, for example
+
+       container interfaces {
+          list traffic {
+              tailf:cli-no-keyword;
+              key id;
+              leaf id { type string; pattern 'eth.*'; }
+              leaf mtu { type uint16; }
+          }
+          list management {
+              tailf:cli-no-keyword;
+              key id;
+              leaf id { type string; pattern 'lo.*';}
+              leaf mtu { type uint16; }
+          }
+       }
+
+       then the problem would disappear.
+
+      Used in the J-style CLIs.";
+  }
+
+  extension cli-compact-syntax {
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Instructs the CLI engine to use the compact representation for this
+      node in the 'show running-configuration' command.  The compact
+      representation means that all leaf elements are shown on a
+      single line.
+
+      Cannot be used in conjunction with tailf:cli-boolean-no.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-compact-stats {
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-wrap";
+    tailf:substatement "tailf:cli-width";
+    tailf:substatement "tailf:cli-delimiter";
+    tailf:substatement "tailf:cli-prettify";
+    tailf:substatement "tailf:cli-spacer";
+    description
+      "Instructs the CLI engine to use the compact representation for this
+      node.  The compact representation means that all leaf elements
+      are shown on a single line.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-wrap {
+    tailf:use-in "tailf:cli-compact-stats";
+    description
+      "If present, the line will be wrapped at screen width.";
+  }
+
+  extension cli-width {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "tailf:cli-compact-stats";
+    description
+      "Specifies a fixed terminal width to use before wrapping line. It is
+      only used when tailf:cli-wrap is present.  If a width is not
+      specified the line is wrapped when the terminal width is
+      reached.";
+  }
+
+  extension cli-delimiter {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "tailf:cli-compact-stats";
+    description
+      "Specifies a string to print between the leaf name and its value
+      when displaying leaf values.";
+  }
+
+  extension cli-prettify {
+    tailf:use-in "tailf:cli-compact-stats";
+    description
+      "If present, dashes (-) and underscores (_) in leaf names are replaced
+      with spaces.";
+  }
+
+  extension cli-spacer {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "tailf:cli-compact-stats";
+    description
+      "Specifies a string to print between the nodes.";
+  }
+
+
+  extension cli-column-stats {
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    description
+      "Display leafs in the container as columns, i.e., do not repeat
+      the name of the container on each line, but instead indent each
+      leaf under the container.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-column-width {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Set a fixed width for the column in the auto-rendered tables.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-min-column-width {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Set a minimum width for the column in the auto-rendered tables.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-column-align {
+    argument value {
+      tailf:arg-type {
+        type enumeration {
+          enum left;
+          enum center;
+          enum right;
+        }
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies the alignment of the data in the column in the
+      auto-rendered tables.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-list-syntax {
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-multi-word";
+    description
+      "Specifies that each entry in a leaf-list should be displayed as
+       a separate element.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-multi-word {
+    tailf:use-in "tailf:cli-list-syntax";
+    tailf:substatement "tailf:cli-max-words";
+    description
+      "Specifies that a multi-word value may be entered without quotes.";
+  }
+
+  extension cli-flat-list-syntax {
+    tailf:use-in "leaf-list";
+    tailf:substatement "tailf:cli-replace-all";
+    tailf:use-in "refine";
+    description
+      "Specifies that elements in a leaf-list should be entered without
+      surrounding brackets. Also, multiple elements can be added to a list
+      or deleted from a list.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-only-in-autowizard {
+    tailf:use-in "leaf";
+    description
+      "Force leaf values to be entered in the autowizard. This
+      is intended to prevent users from entering passwords and
+      other sensitive information in plain text.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-replace-all {
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:cli-flat-list-syntax";
+    tailf:use-in "refine";
+    description
+      "Specifies that the new leaf-list value(s) should replace the old,
+      as opposed to be added to the old leaf-list.";
+  }
+
+  extension cli-range-list-syntax {
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "refine";
+    description
+      "Specifies that elements in a leaf-list or a list should be entered
+      without surrounding brackets and presented as ranges.  The
+      element in the list should be separated by a comma.  For
+      example:
+
+        vlan 1,3,10-20,30,32,300-310
+
+      When this statement is used for lists, the list must have a
+      single key.  The elements are be presented as ranges as above.
+
+      The type of the list key, or the leaf-list, must be integer based.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-incomplete-command {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that an auto-rendered command should be considered
+      incomplete.  Can be used to prevent <cr> from appearing in
+      the completion list for optional internal nodes, for example, or
+      to ensure that the user enters all leaf values in a container
+      (if used in combination with cli-sequence-commands).
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-full-command {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that an auto-rendered command should be considered complete,
+      ie, no additional leaves or containers can be entered on the same
+      command line.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-sequence-commands {
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-reset-siblings";
+    tailf:substatement "tailf:cli-reset-all-siblings";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that an auto-rendered command should only accept arguments
+      in the same order as they are specified in the YANG model.
+      This, in combination with tailf:cli-drop-node-name, can be used
+      to create CLI commands for setting multiple leafs in a container
+      without having to specify the leaf names.
+
+      In almost all cases this annotation should be accompanied by the
+      tailf:cli-compact-syntax annotation. Otherwise the output from
+      'show running-config' will not be correct, and the sequence
+      'save xx' 'load override xx' will not work.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-reset-siblings {
+    tailf:use-in "tailf:cli-sequence-commands";
+    description
+      "Specifies that all sibling leaves in the sequence should be reset
+       whenever the first leaf in the sequence is set.";
+  }
+
+  extension cli-reset-all-siblings {
+    tailf:use-in "tailf:cli-sequence-commands";
+    description
+      "Specifies that all sibling leaves in the container should be reset
+       whenever the first leaf in the sequence is set.";
+  }
+
+  extension cli-reset-container {
+    tailf:use-in "leaf";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that all sibling leaves in the container should be
+       reset when this element is set.
+
+       When used on a container its content is cleared when set.";
+  }
+
+  extension cli-display-separated {
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Tells CLI engine to display this container as a separate
+       line item even when it has children. Only applies to
+       presence containers.
+
+       Applicable for optional containers in the C- and I- style CLIs.";
+  }
+
+  extension cli-delete-container-on-delete {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the parent container should be deleted when
+.      this leaf is deleted.";
+  }
+
+  extension cli-break-sequence-commands {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that previous cli-sequence-command declaration should
+      stop at this point. Only applicable when a cli-sequence-command
+      declaration has been used in the parent container.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-strict-leafref {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the leaf should only be allowed to be assigned
+       references to existing instances when the command is executed.
+       Without this annotation the requirement is that the instance
+       exists on commit time.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-optional-in-sequence {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies that this element is optional in the sequence. If it
+       is set it must be set in the right sequence but may be skipped.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-incomplete-show-path {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-min-keys";
+    description
+      "Specifies that a path to the show command is considered incomplete,
+      i.e., it needs more elements added to the path.  It can also be used
+      to specify a minimum number of keys to be given for lists.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-min-keys {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "tailf:cli-incomplete-show-path";
+    description
+      "Specifies the minimum number of required keys for the show command.";
+  }
+
+  extension cli-hide-in-submode {
+    tailf:use-in "leaf";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Hide leaf when submode has been entered. Mostly useful when
+       leaf has to be entered in order to enter a submode. Also works
+       for flattened containers.
+
+       Cannot be used in conjunction with tailf:cli-boolean-no.
+
+       Used in I- and C-style CLIs.";
+  }
+
+  extension cli-expose-ns-prefix {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "When used force the CLI to display namespace prefix of all children.";
+  }
+
+  extension cli-prefix-key {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:use-in "leaf-list";
+    tailf:substatement "tailf:cli-before-key";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "This leaf has to be given as a prefix before entering the actual
+      list keys. Very backwards but a construct that exists in some
+      Cisco CLIs.
+
+      The construct can be used also for leaf-lists but only when
+      then tailf:cli-range-list-syntax is also used.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-before-key {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "tailf:cli-prefix-key";
+    description
+      "Specifies before which key the prefix element should be inserted.
+       The first key has number 1.";
+  }
+
+  extension cli-show-with-default {
+    tailf:use-in "leaf";
+    tailf:use-in "refine";
+    tailf:use-in "tailf:symlink";
+    description
+      "This leaf will be displayed even when it has its default value.
+      Note that this will somewhat result in a slightly different behaviour
+      when you save a config and then load it again. With this setting
+      in place a leaf that has not been configured will be configured
+      after the load.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-oper-info {
+    argument text {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "rpc";
+    tailf:use-in "identity";
+    tailf:use-in "tailf:action";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "This statement works exactly as tailf:info, with the exception
+      that it is used when displaying the element info in the context
+      of stats.
+
+      Both tailf:info and tailf:cli-oper-info can be present at the same
+      time.";
+  }
+
+  extension cli-case-sensitive {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    description
+      "Specifies that this node is case-sensitive.
+      If applied to a container or a list, any nodes below will
+      also be case-sensitive.
+
+      This negates the cli-case-insensitive extension (see below).
+
+      Note that this will override any case-sensitivity settings
+      configured in confd.conf";
+  }
+
+  extension cli-case-insensitive {
+    tailf:use-in "container";
+    tailf:use-in "list";
+    tailf:use-in "leaf";
+    description
+      "Specifies that node is case-insensitive.  If applied to a container or
+      a list, any nodes below will also be case-insensitive.
+
+      Node names are discovered without care of the case. Also affect
+      matching of key values in lists. However it doesn't affect the
+      storing of a leaf value. E.g. a modification of a leaf value from
+      upper case to lower case is still considered a modification of
+      data.
+
+      Note that this will override any case-insensitivity settings
+      configured in confd.conf";
+  }
+
+  extension cli-custom-error {
+    argument text {
+      yin-element true;
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "This statement specifies a custom error message to be displayed
+      when the user enters an invalid value.";
+  }
+
+  extension cli-full-show-path {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-max-keys";
+    description
+      "Specifies that a path to the show command is considered complete, i.e.,
+      no more elements can be added to the path.  It can also be used to
+      specify a maximum number of keys to be given for lists.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-max-keys {
+    argument value {
+      tailf:arg-type {
+        type uint32;
+      }
+    }
+    tailf:use-in "tailf:cli-full-show-path";
+    description
+      "Specifies the maximum number of allowed keys for the show command.";
+  }
+
+  extension cli-suppress-show-path {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    description
+      "Specifies that the show command cannot be invoked with the path,
+       ie the path is suppressed when auto-rendering show commands for
+       config='false' data.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+
+  extension cli-suppress-show-match {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    description
+      "Specifies that a specific completion match (i.e., a filter match that
+      appear at list nodes as an alternative to specifying a single
+      instance) to the show command should not be available.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-list-no {
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the CLI should not accept deletion of the entire list
+      or leaf-list. Only specific instances should be deletable not the
+      entire list in one command. ie, 'no foo <instance>' should be allowed
+      but not 'no foo'.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-no {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    description
+      "Specifies that the CLI should not auto-render 'no' commands for
+      this element. An element with this annotation will not appear in the
+      completion list to the 'no' command.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-silent-no {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    description
+      "Specifies that the confd.cnof directive cSilentNo should be
+      suppressed for a leaf and that a custom error message should
+      be displayed when the user attempts to delete a non-existing
+      element.
+
+      Used in I- and C-style CLIs.";
+  }
+
+
+  extension cli-full-no {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    description
+      "Specifies that an auto-rendered 'no'-command should be considered complete,
+      ie, no additional leaves or containers can be entered on the same
+      command line.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-incomplete-no {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that an auto-rendered 'no'-command should not be considered
+      complete, ie, additional leaves or containers must be entered on the same
+      command line.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-no-match-completion {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the CLI engine should not provide match completion
+      for the key leafs in the list.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-suppress-show-conf-path {
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the show running-config command cannot be invoked with
+       the path, ie the path is suppressed when auto-rendering show running-
+       config commands for config='true' data.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+
+  extension cli-no-key-completion {
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies that the CLI engine should not perform completion for key
+      leafs in the list. This is to avoid querying the data provider
+      for all existing keys.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-instance-info-leafs {
+    argument value {
+      tailf:arg-type {
+        type string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "This statement is used to specifiy how list entries are displayed
+      when doing completion in the CLI.  By default, a list entry is
+      displayed by listing its key values, and the value of a leaf
+      called 'description', if such a leaf exists in the list entry.
+
+      The 'cli-instance-info-leafs' statement takes as its argument a
+      space separated string of leaf names.  When a list entry is
+      displayed, the values of these leafs are concatenated with a
+      space character as separator and shown to the user.
+
+      For example, when asked to specify an interface the CLI will
+      display a list of possible interface instances, say 1 2 3 4.  If
+      the cli-instance-info-leafs property is set to 'description' then
+      the CLI might show:
+
+        Possible completions:
+          1 - internet
+          2 - lab
+          3 - dmz
+          4 - wlan
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-multi-value {
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-max-words";
+    description
+      "Specifies that all remaining tokens on the command line
+      should be considered a value for this leaf. This prevents
+      the need for quoting values containing spaces, but also
+      prevents multiple leaves from being set on the same command
+      line once a multi-value leaf has been given on a line.
+
+      If the tailf:cli-max-words substatements is used then
+      additional leaves may be entered.
+
+      Note: This extension isn't applicable in actions
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-value-display-template {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a template string to be used when formating the
+      value of a leaf for display. Note that other leaves cannot
+      be referenced from a display template of one leaf. The only
+      value accessible is the leaf's own value, accessed through
+      $(.).
+
+      See the defintion of cli-template-string for more info.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+
+  extension cli-show-template {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "container";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-auto-legend";
+    description
+      "Specifies a template string to be used by the 'show' command in
+      operational mode.  It is primarily intended for displaying
+      non-config data but config data may be included in the template
+      as well.
+
+      See the defintion of cli-template-string for more info.
+
+      Some restrictions includes not applying templates on a leaf that
+      is the key in a list. It is recommended to use the template
+      directly on the list to format the whole list instead.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-auto-legend {
+    tailf:use-in "tailf:cli-show-template";
+    description
+      "Specifies that the legend should be automatically rendered if not "
+        +"already displayed. Useful when using templates for rendering "
+        +"tables.";
+  }
+
+  extension cli-show-template-legend {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "refine";
+    description
+
+      "Specifies a template string to be printed before all list entries are
+      printed.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-show-template-enter {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a template string to be printed before each list entry is
+      printed.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-show-template-footer {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+
+      "Specifies a template string to be printed after all list entries are
+      printed.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in J-, I- and C-style CLIs.";
+  }
+
+  extension cli-run-template {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "leaf";
+    tailf:use-in "leaf-list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+      "Specifies a template string to be used by the 'show running-config'
+      command in operational mode.  It is primarily intended for displaying
+      config data but non-config data may be included in the template
+      as well.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-run-template-legend {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+
+      "Specifies a template string to be printed before all list entries are
+      printed.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-run-template-enter {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "container";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    tailf:substatement "tailf:cli-suppress-warning" {
+      tailf:occurence "*";
+    }
+    description
+      "Specifies a template string to be printed before each list entry is
+      printed.
+
+      When used on a container it only has effect when the container
+      also has a tailf:cli-add-mode, and when tailf:cli-show-no isn't
+      used on the container.
+
+      See the defintion of cli-template-string for more info.
+
+      The variable .reenter is set to 'true' when the 'show configuration'
+      command is executed and the list or container isn't created. This
+      allow, for example, to display
+
+          create foo
+
+      when an instance is created
+
+          edit foo
+
+      when something inside the instance is modified.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  extension cli-run-template-footer {
+    argument value {
+      yin-element true;
+      tailf:arg-type {
+        type tailf:cli-template-string;
+      }
+    }
+    tailf:use-in "list";
+    tailf:use-in "tailf:symlink";
+    tailf:use-in "refine";
+    description
+
+      "Specifies a template string to be printed after all list entries are
+      printed.
+
+      See the defintion of cli-template-string for more info.
+
+      Used in I- and C-style CLIs.";
+  }
+
+  typedef cli-template-string {
+    type string;
+    description
+      "A template is a text string which is expanded by the CLI engine,
+      and then displayed to the user.
+
+      The template may contain a mix of text and expandable entries.
+      Expandable entries all start with $( and end with a matching ).
+      Parentheses and dollar signs need to be quoted in plain text.
+
+      (Disclaimer: tailf:cli-template-string will not respect
+       all CLI YANG extensions existing from expandable entries.
+       For instance, tailf:cli-no-name-on-delete will have no
+       effect when the value of a node with this extension is
+       fetched as a result of expanding CLI templates.)
+
+      The template is expanded as follows:
+
+      A parameter is either a relative or absolute path to a leaf
+      element (eg /foo/bar, foo/bar), or one of the builtin variables:
+      .selected, .entered, .legend_shown, .user, .groups, .ip,
+      .display_groups, .path, .ipath or .licounter. In addition the
+      variables .spath and  .ispath are available when a command
+      is executed from a show path.
+
+       .selected
+
+           The .selected variable contains the list of selected paths
+           to be shown. The show template can inspect this element to
+           determine if a given element should be displayed or
+           not. For example:
+
+               $(.selected~=hwaddr?HW Address)
+
+       .entered
+
+           The .entered variable is true if the \"entered\" text has
+           been displayed (either the auto generated text or a
+           showTemplateEnter). This is useful when having a non-table
+           template where each instance should have a text.
+
+               $(.entered?:host $(name))
+
+       .legend_shown
+
+           The .legend_shown variable is true if the \"legend\" text has
+           been displayed (either the auto generated table header or
+           a showTemplateLegend). This is useful to inspect when
+           displaying a table row. If the user enteres the path to a
+           specific instance the builtin table header will not be
+           displayed and the showTemplateLegend will not be invoked
+           and it may be useful to render the legend specifically
+           for this instance.
+
+               $(.legend_shown!=true?Address         Interface)
+
+       .user
+
+           The .user variable contains the name of the current
+           user. This can be used for differentiating the content
+           displayed for a specific user, or in paths. For exapmle:
+
+               $(user{$(.user)}/settings)
+
+       .groups
+
+           The .groups variable contains the a list of groups that the
+           user belongs to.
+
+       .display_groups
+
+           The .display_groups variable contains a list of selected
+           display groups. This can be used to display different
+           content depending on the selected display group. For
+           example:
+
+               $(.display_groups~=details?details...)
+
+       .ip
+
+           The .ip variable contains the ip address that the user
+           connected from.
+
+       .path
+
+           The .path variable contains the path to the entry,
+           formated in CLI style.
+
+       .ipath
+
+           The .ipath variable contains the path to the entry,
+           formated in template style.
+
+       .spath
+
+           The .spath variable contains the show path,
+           formated in CLI style.
+
+       .ispath
+
+           The .ispath variable contains the show path,
+           formated in template style.
+
+       .licounter
+
+           The .licounter variable contains a counter that is
+           incremented for each instance in a list. This means that
+           it will be 0 in the legend, contain the total number of
+           list instances in the footer and something in between in
+           the basic show template.
+
+      $(parameter)
+
+        The value of 'parameter' is substituted.
+
+      $(cond?word1:word2)
+
+        The expansion of 'word1' is substituted if 'cond'
+        evaluates to true, otherwise the expansion of 'word2' is
+        substituted.
+
+        'cond' may be one of
+
+          parameter
+
+            Evaluates to true if the node exists.
+
+          parameter == <value>
+
+            Evaluates to true if the value of the parameter equals
+            <value>.
+
+          parameter != <value>
+
+            Evalutes to true if the value of the parameter does not
+            equal <value>
+
+          parameter ~= <value>
+
+            Provided that the value of the parameter is a list
+            (i.e., the node that the parameter refers to is a
+            leaf-list), this expression evaluates to true if <value>
+            is a member of the list.
+
+        Note that it is also possible to omit ':word2' in
+        order to print the entire statement, or nothing.
+        As an example $(conf?word1) will print 'word1' if conf
+        exists, otherwise it will print nothing.
+
+      $(cond??word1)
+
+        Double question marks can be used to achieve the same effect
+        as above, but with the distinction that the 'cond' variable
+        needs to be explicitly configured, in order to be evaluated
+        as existing. This is needed in the case of evaluating leafs
+        with default values, where the single question mark operator
+        would evaluate to existing even if not explicitly configured.
+
+      $(parameter|filter)
+
+        The value of 'parameter' processed by 'filter' is
+        substituted. Filters may be either one of the
+        built-ins or a customized filter defined in a
+        callback. See /confdConfig/cli/templateFilter.
+
+        A built-in 'filter' may be one of:
+
+          capfirst
+
+            Capitalizes the first character of the value.
+
+          lower
+
+            Converts the value into lowercase.
+
+          upper
+
+            Converts the value into uppercase.
+
+          filesizeformat
+
+            Formats the value in a human-readable format (e.g.,
+            '13 KB', '4.10 MB',  '102 bytes' etc), where  K
+             means 1024, M means 1024*1024 etc.
+
+            When used without argument the default number of
+            decimals displayed is 2. When used with a numeric
+            integer argument, filesizeformat will display the
+            given number of decimal places.
+
+          humanreadable
+
+            Similar to filesizeformat except no bytes suffix
+            is added  (e.g., '13.00 k', '4.10 M' '102' etc),
+            where k means 1000, M means 1000*1000 etc.
+
+            When used without argument the default number of
+            decimals displayed is 2. When used with a numeric
+            integer argument, humanreadable will display the
+            given number of decimal places.
+
+          commasep
+
+            Separate the numerical values into groups of three
+            digits using a comma (e.g., 1234567 -> 1,234,567)
+
+          hex
+
+            Display integer as hex number. An argument can be
+            used to indicate how many digits should be used in
+            the output. If the hex number is too long it will
+            be truncated at the front, if it is too short it will
+            be padded with zeros at the front. If the width is
+            a negative number then at most that number of digits
+            will be used, but short numbers will not be padded
+            with zeroes. Another argument can be given to indicate
+            if the hex numbers should be written with lower
+            or upper case.
+
+            For example:
+
+              value            Template                       Output
+              12345           {{ value|hex }}                 3039
+              12345           {{ value|hex:2 }}               39
+              12345           {{ value|hex:8 }}               00003039
+              12345           {{ value|hex:-8 }}              3039
+              14911           {{ value|hex:-8:upper }}        3A3F
+              14911           {{ value|hex:-8:lower }}        3a3f
+
+          hexlist
+
+            Display integer as hex number with : between pairs. An
+            argument can be used to indicate how many digits should
+            be used in the output. If the hex number is too long it
+            will be truncated at the front, if it is too short it will
+            be padded with zeros at the front. If the width is
+            a negative number then at most that number of digits
+            will be used, but short numbers will not be padded
+            with zeroes. Another argument can be given to indicate
+            if the hex numbers should be written with lower
+            or upper case.
+
+            For example:
+
+              value            Template                       Output
+              12345           {{ value|hexlist }}             30:39
+              12345           {{ value|hexlist:2 }}           39
+              12345           {{ value|hexlist:8 }}           00:00:30:39
+              12345           {{ value|hexlist:-8 }}          30:39
+              14911           {{ value|hexlist:-8:upper }}    3A:3F
+              14911           {{ value|hexlist:-8:lower }}    3a:3f
+
+          floatformat
+
+            Used for type 'float' in tailf-xsd-types. We recommend
+            that the YANG built-in type 'decimal64' is used instead of
+            'float'.
+
+            When used without an argument, rounds a floating-point
+            number to one decimal place -- but only if there is a
+            decimal part to be displayed.
+
+            For example:
+
+              value           Template                        Output
+              34.23234        {{ value|floatformat }}         34.2
+              34.00000        {{ value|floatformat }}         34
+              34.26000        {{ value|floatformat }}         34.3
+
+            If used with a numeric integer argument, floatformat
+            rounds a number to that many decimal places. For example:
+
+              value           Template                        Output
+              34.23234        {{ value|floatformat:3 }}       34.232
+              34.00000        {{ value|floatformat:3 }}       34.000
+              34.26000        {{ value|floatformat:3 }}       34.260
+
+            If the argument passed to floatformat is negative, it will
+            round a number to that many decimal places -- but only if
+            there's a decimal part to be displayed. For example:
+
+              value           Template                        Output
+              34.23234        {{ value|floatformat:-3 }}      34.232
+              34.00000        {{ value|floatformat:-3 }}      34
+              34.26000        {{ value|floatformat:-3 }}      34.260
+
+            Using floatformat with no argument is equivalent to using
+            floatformat with an argument of -1.
+
+          ljust:width
+
+            Left-align the value given a width.
+
+          rjust:width
+
+            Right-align the value given a width.
+
+          trunc:width
+
+            Truncate value to a given width.
+
+          lower
+
+            Convert the value into lowercase.
+
+          upper
+
+            Convert the value into uppercase.
+
+          show:<dictionary>
+
+            Substitutes the result of invoking the default display
+            function for the parameter. The dictionary can be used
+            for introducing own variables that can be accessed in
+            the same manner as builtin variables. The user defined
+            variables overrides builtin variables. The dictionary
+            is specified as a string on the following form:
+
+              (key=value)(:key=value)*
+
+            For example, with the following expression:
+
+              $(foo|show:myvar1=true:myvar2=Interface)
+
+            the user defined variables can be accessed like this:
+
+              $(.myvar1!=true?Address) $(.myvar2)
+
+            A special case is the dict variable 'indent'. It
+            controls the indentation level of the displayed path.
+            The current indent level can be incremented and
+            decremented using =+ and =-.
+
+            For example:
+
+              $(foobar|show:indent=+2)
+              $(foobar|show:indent=-1)
+              $(foobar|show:indent=10)
+
+            Another special case is he dict variable 'noalign'.
+            It  may be used to suppress the default aligning that
+            may occur when displaying an element.
+
+            For example:
+
+              $(foobar|show:noalign)
+
+          dict:<dictionary>
+
+            Translates the value using the dictionary. Can for
+            example be used for displaying on/off instead of
+            true/false. The dictionary is specified as a string on
+            the following form:
+
+              (key=value)(:key=value)*
+
+            For example, with the following expression:
+
+              $(foo|dict:true=on:false=off)
+
+            if the leaf 'foo' has value 'true', it is displayed as 'on', and
+            if its value is 'false' it is displayed as 'off'.
+
+        Nested invocations are allowed, ie it is possible to have expressions
+        like $((state|dict:yes=Yes:no=No)|rjust:14), or $(/foo{$(../bar)})
+
+
+      For example:
+
+        list interface {
+          key name;
+          leaf name { ... }
+          leaf status { ... }
+          container line {
+            leaf status { ... }
+          }
+          leaf mtu { ... }
+          leaf bw { ... }
+          leaf encapsulation { ... }
+          leaf loopback { ... }
+          tailf:cli-show-template
+            '$(name) is administratively $(status),'
+          + ' line protocol is $(line/status)\\n'
+          + 'MTU $(mtu) bytes, BW $(bw|humanreadable)bit, \\n'
+          + 'Encap $(encapsulation|upper), $(loopback?:loopback not set)\\n';
+        }";
+  }
+}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp-oper.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp-oper.yang
deleted file mode 100644
index bff990573..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp-oper.yang
+++ /dev/null
@@ -1,402 +0,0 @@
-module Cisco-IOS-XE-dhcp-oper {
-  yang-version 1;
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-dhcp-oper";
-  prefix dhcp-ios-xe-oper;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for DHCP Server and Client operational data.
-     Copyright (c) 2017-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2018-02-13 {
-    description
-      "dns name changes.";
-    reference "2.0.0";
-  }
-  revision 2017-11-01 {
-    description
-      "Initial revision";
-    reference "1.0.0";
-  }
-
-  typedef dhcp-server-binding-state {
-    type enumeration {
-      enum "dhcp-server-binding-state-selecting" {
-        value 0;
-        description
-          "Server state is in Selecting mode";
-      }
-      enum "dhcp-server-binding-state-active" {
-        value 1;
-        description
-          "Server state Active new address provided";
-      }
-      enum "dhcp-server-binding-state-terminated" {
-        value 2;
-        description
-          "Server terminated the connection with a client";
-      }
-      enum "dhcp-server-binding-state-unknown" {
-        value 3;
-        description
-          "Server state unknown";
-      }
-    }
-    description
-      "DHCP server binding states ";
-  }
-
-  typedef dhcp-server-binding-type {
-    type enumeration {
-      enum "dhcp-server-binding-type-manual" {
-        value 0;
-        description
-          "Server binding Type Manual";
-      }
-      enum "dhcp-server-binding-type-static" {
-        value 1;
-        description
-          "Sever binding type Static";
-      }
-      enum "dhcp-server-binding-type-relay" {
-        value 2;
-        description
-          "Server binding type relay";
-      }
-      enum "dhcp-server-binding-type-automatic" {
-        value 3;
-        description
-          "Server binding type automatic";
-      }
-      enum "dhcp-server-binding-type-odap" {
-        value 4;
-        description
-          "Server binding Type ODAP";
-      }
-      enum "dhcp-server-binding-type-from-aaa" {
-        value 5;
-        description
-          "Sever binding type from AAA";
-      }
-      enum "dhcp-server-binding-type-remembered" {
-        value 6;
-        description
-          "Server binding type remembered";
-      }
-    }
-    description
-      "DHCP server binding type";
-  }
-
-  typedef dhcp-client-state {
-    type enumeration {
-      enum "dhcp-client-state-temp-from-client" {
-        value 0;
-        description
-          "Client state address/sync from other client";
-      }
-      enum "dhcp-client-state-temp-from-sync" {
-        value 1;
-        description
-          "Client state Sync";
-      }
-      enum "dhcp-client-state-initial" {
-        value 2;
-        description
-          "Client state Initialing";
-      }
-      enum "dhcp-client-state-selecting" {
-        value 3;
-        description
-          "Client state Selecting";
-      }
-      enum "dhcp-client-state-requesting" {
-        value 4;
-        description
-          "Client state Requesting";
-      }
-      enum "dhcp-client-state-bound" {
-        value 5;
-        description
-          "Client state bound";
-      }
-      enum "dhcp-client-state-rebinding" {
-        value 6;
-        description
-          "Client state rebinding";
-      }
-      enum "dhcp-client-state-renewing" {
-        value 7;
-        description
-          "Client state renewing";
-      }
-      enum "dhcp-client-state-holdtime" {
-        value 8;
-        description
-          "Client state holdtime";
-      }
-      enum "dhcp-client-state-ddns-wait" {
-        value 9;
-        description
-          "Client state DDNS wait";
-      }
-      enum "dhcp-client-state-releasing" {
-        value 10;
-        description
-          "Client state releasing";
-      }
-      enum "dhcp-client-state-purging" {
-        value 11;
-        description
-          "Client state purging";
-      }
-      enum "dhcp-client-state-leasequery" {
-        value 12;
-        description
-          "Client state leasequery";
-      }
-      enum "dhcp-client-state-unknown" {
-        value 13;
-        description
-          "Client state unknown";
-      }
-    }
-    description
-      "DHCP Client state";
-  }
-
-  typedef dhcp-expiry-option {
-    type enumeration {
-      enum "dhcp-expiration-time" {
-        value 0;
-        description
-          "Expiration option time";
-      }
-      enum "dhcp-expiration-infinite" {
-        value 1;
-        description
-          "Expiration option infinite";
-      }
-    }
-    description
-      "DHCP expiration option ";
-  }
-
-  typedef dhcp-client-id-type {
-    type enumeration {
-      enum "dhcp-htype-ethernet" {
-        value 0;
-        description
-          "DHCP Client hardware type Ethernet";
-      }
-      enum "dhcp-htype-ieee802" {
-        value 1;
-        description
-          "DHCP Client hardware type 802";
-      }
-      enum "dhcp-htype-rfclimit" {
-        value 2;
-        description
-          "DHCP Client hardware type RFCLIMIT";
-      }
-      enum "dhcp-htype-clientid" {
-        value 3;
-        description
-          "DHCP Client hardware type CLIENTID";
-      }
-    }
-    description
-      "DHCP Client id hardware types ";
-  }
-
-  grouping dhcp-expiry {
-    description
-      "Type describes whether it is time or never";
-    choice expiration-time-choice {
-      description
-        "Choice of the expiration time";
-      case dhcp-expiration-time {
-        leaf time {
-          type yang:date-and-time;
-          description
-            "Date and time of expiry ";
-        }
-      }
-      case dhcp-expiration-infinite {
-        leaf infinite {
-          type empty;
-          description
-            "Expiry time infinite";
-        }
-      }
-    }
-  }
-
-  grouping dhcpv4-server-key {
-    description
-      "Key for DHCP Server infomation table";
-    leaf pool-name {
-      type string;
-      description
-        "Server Pool name from where the Client 
-         ip is provided";
-    }
-    leaf client-ip {
-      type inet:ip-address;
-      description
-        "ipaddress released for a speicfic Client 
-         from Server";
-    }
-    leaf vrf-name {
-      type string;
-      description
-        "Query based on the vrfname speicfic to that
-         pool and Client ip address as key";
-    }
-  }
-
-  grouping dhcpv4-server-oper {
-    description
-      "DHCP Server data for binding";
-    leaf client-id-type {
-      type dhcp-ios-xe-oper:dhcp-client-id-type;
-      description
-        "Client identification Hardware types";
-    }
-    leaf client-id {
-      type string;
-      description
-        "Client identification can be based on Hardware types/Mac";
-    }
-    container expiration {
-      description
-        "Expiration time infomation";
-      uses dhcp-ios-xe-oper:dhcp-expiry;
-    }
-    leaf type {
-      type dhcp-ios-xe-oper:dhcp-server-binding-type;
-      description
-        "Server binding type.";
-    }
-    leaf state {
-      type dhcp-ios-xe-oper:dhcp-server-binding-state;
-      description
-        "Server binding states";
-    }
-    leaf interface {
-      type string;
-      description
-        "interface name of the pool";
-    }
-  }
-
-  grouping dhcpv4-client-key {
-    description
-      "Key for DHCP Server infomation table";
-    leaf if-name {
-      type string;
-      description
-        "Interface infomation where dhcp Client is configured";
-    }
-    leaf client-addr {
-      type inet:ip-address;
-      description
-        "Client_addr address Allocated from Server";
-    }
-    leaf vrf-name {
-      type string;
-      description
-        "Vrfname infomation related to Client";
-    }
-  }
-
-  grouping dhcpv4-client-oper {
-    description
-      "DHCP Client data for binding";
-    leaf state {
-      type dhcp-ios-xe-oper:dhcp-client-state;
-      description
-        "DHCP Client States ";
-    }
-    leaf lease-server-addr {
-      type inet:ip-address;
-      description
-        "IP address of Server from where we got IP";
-    }
-    leaf gateway-addr {
-      type inet:ip-address;
-      description
-        "Gateway Address we got from Server";
-    }
-    leaf lease-time {
-      type uint32;
-      description
-        "Total Lease Time in Seconds";
-    }
-    container lease-expiry {
-      description
-        "Lease Expiry time for the IP address we got";
-      uses dhcp-ios-xe-oper:dhcp-expiry;
-    }
-    leaf lease-remaining {
-      type uint32;
-      description
-        "Lease remaining time for the IP address";
-    }
-    leaf dns-address {
-      type inet:ip-address;
-      description
-        "First DNS address";
-    }
-    leaf dns-address-secondary {
-      type inet:ip-address;
-      description
-        "Secondary DNS address";
-    }
-    leaf subnet-mask {
-      type inet:ip-address;
-      description
-        "Subnet mask address";
-    }
-  }
-
-  container dhcp-oper-data {
-    config false;
-    description
-      "Operational state of DHCP";
-    list dhcpv4-server-oper {
-      key "pool-name client-ip vrf-name";
-      description
-        "List of DHCP server bidning";
-      uses dhcp-ios-xe-oper:dhcpv4-server-key;
-      uses dhcp-ios-xe-oper:dhcpv4-server-oper;
-    }
-    list dhcpv4-client-oper {
-      key "if-name client-addr vrf-name";
-      description
-        "List of DHCP clients";
-      uses dhcp-ios-xe-oper:dhcpv4-client-key;
-      uses dhcp-ios-xe-oper:dhcpv4-client-oper;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp.yang
deleted file mode 100644
index af4f71016..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-dhcp.yang
+++ /dev/null
@@ -1,1353 +0,0 @@
-module Cisco-IOS-XE-dhcp {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-dhcp";
-  prefix ios-dhcp;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-
-  import Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  import Cisco-IOS-XE-interface-common {
-    prefix ios-ifc;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Dynamic Host Configuration Protocol (DHCP) Yang model.
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2019-01-04 {
-    description
-        "dhcp pool utilization mark command model creation";
-  }
-  revision 2018-11-29 {
-    description
-        "make dhcp snooping changes updated in the netconf datastore";
-  }
-  revision 2018-07-25 {
-    description
-        "Add ip dhcp route";
-  } 
-  revision 2018-07-24 {
-    description
-        "Fix ip dhcp secondary address and inline lease";
-  } 
-  revision 2018-06-16 {
-    description
-        "Fix ip dhcp database";
-  } 
-  revision 2018-06-13 {
-    description
-        "Add more ip dhcp support";
-  }
-  revision 2018-03-22 {
-    description
-       "Fix ip dhcp use vrf connected default behavior";
-  }
-  revision 2018-03-12 {
-    description
-      "Add vrf and high-address to the key for ip dhcp excluded-address";
-  }
-  revision 2018-02-26 {
-    description
-       "add ip dhcp use support";
-  }
-  revision 2018-01-16 {
-    description
-       "Make it take multiple vlans: ip dhcp snooping vlan <num>";
-  }
-  revision 2018-01-10 {
-     description
-       "Changed ip dhcp pool / dns-server to cli-flat-list-syntax";
-  }
-
-  revision 2017-11-27 {
-     description
-       "Added Change 25GE name";
-  }
-
-  revision 2017-11-14 {
-    description
-      "Add 100GE interface";
-  }
-
-  revision 2017-11-06 {
-    description
-      "Remove choice for ip dhcp pool / client-identifier and hardware-address";
-  }
-
-  revision 2017-11-01 {
-    description
-      "Add ip dhcp pool / host, client-name, client-identifier, hardware-address";
-  }
-
-  revision 2017-10-18 {
-    description
-      "Add modeling to interface mode: ip dhcp client route distance/track";
-  }
-
-  revision 2017-09-14 {
-    description 
-      "This revison has changes for new 2gig interface addition";
-  }
-  revision 2017-08-16 {
-    description
-      "This revision has changes for new 5gig and 25gig interfaces addition";
-  }
-
-  revision 2017-04-28 {
-    description
-      "inet:ipv6-prefix changed to ios-types:ipv6-prefix";
-  }
-  revision 2017-03-02 {
-    description
-      "Re-arrange the order of vrf in ipv6 dhcp pool";
-  }
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  // interface * / ip dhcp
-  grouping config-interface-ip-dhcp-grouping {
-    container client {
-      description
-        "DHCP client configuration";
-      leaf hostname {
-        description
-          "Specify hostname to use";
-        type string;
-      }
-      container option {
-        description "DHCP Client options";
-        list option-range {
-          key "option-range";
-          leaf option-range {
-            description "DHCP option code (1-254)";
-            type uint8 {
-              range "1..254";
-            }
-          }
-          leaf ascii {
-            description "Input ascii string";
-            type string;
-          }
-          leaf hex {
-            description "Input hex string";
-            type string;
-          }
-          leaf-list ip {
-            description "Input IP Address";
-            type inet:host;
-          }
-        }
-      }
-      container request {
-        description
-          "Specify options (not) to request";
-        leaf option {
-          description
-            "DHCP options";
-          type uint8 {
-              range "1..254";
-          }
-        }
-      }
-      container route {
-        description
-          "Options for routes installed by dhcp";
-        leaf distance {
-          description
-            "set distance for dhcp static routes";
-          type uint8 {
-            range "1..254";
-          }
-        }
-        leaf track {
-          description
-            "Track dhcp routes";
-          type uint16 {
-            range "1..1000";
-          }
-        }
-      }
-    }
-    container relay {
-      description
-        "DHCP relay configuration parameters";
-      container information {
-        description
-          "DHCP relay information option";
-        container check-reply {
-          description
-            "Validate relay information in BOOTREPLY";
-          presence "true";
-          leaf none {
-            description
-              "Set to none";
-            type empty;
-          }
-        }
-        container option {
-          description
-            "DHCP relay information option";
-          leaf subscriber-id {
-            description
-              "Subscriber identifier sub option";
-            type string;
-          }
-        }
-        container option-insert {
-          description
-            "Insert relay information in BOOTREQUEST";
-          presence "true";
-          leaf none {
-            description
-              "Set to none";
-            type empty;
-          }
-        }
-        leaf policy-action {
-          description
-            "Define reforwarding policy";
-          type enumeration {
-            enum "drop";
-            enum "encapsulate";
-            enum "keep";
-            enum "replace";
-          }
-        }
-        leaf trusted {
-          description
-            "Received DHCP packet may contain relay info option with zero giaddr";
-          type empty;
-        }
-      }
-      leaf source-interface {
-        description
-          "Set source interface for relayed messages";
-        type string;
-      }
-    }
-    container snooping {
-      description
-        "DHCP Snooping";
-      container limit {
-        description
-          "DHCP Snooping limit";
-        leaf rate {
-          description
-            "DHCP Snooping limit";
-          type uint16 {
-            range "1..2048";
-          }
-        }
-      }
-      leaf trust {
-        description
-          "DHCP Snooping trust config";
-        type empty;
-      }
-      list vlan {
-        description
-          "DHCP Snooping vlan";
-        key "id";
-        leaf id {
-          type uint16 {
-            range "1..4094";
-          }
-        }
-        container information {
-          description
-            "DHCP Snooping information";
-          container option {
-            description
-              "DHCP Snooping information option";
-            container format-type {
-              description
-                "Option 82 information format";
-              container circuit-id {
-                description
-                  "Circuit id option 82 format";
-                leaf string {
-                  description
-                    "User defined string for circuit id";
-                  type string {
-                    length "3..63";
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // interface * / ipv6 dhcp
-  grouping config-interface-ipv6-dhcp-grouping {
-    choice client-server-choice {
-      container client {
-        description "Act as an IPv6 DHCP client";
-        container request {
-          description "Request";
-          leaf vendor {
-            description "Request Vendor specific options";
-            type empty;
-          }
-        }
-      }
-      list server {
-        description
-          "Act as an IPv6 DHCP server";
-        key "word";
-        leaf word {
-          type string;
-        }
-        leaf preference {
-          description
-            "Preference";
-          type uint8 {
-            range "0..255";
-          }
-        }  
-      }
-    }
-    container guard {
-      description "Configure IPv6 DHCP guard on the interface";
-      presence true;
-      leaf attach-policy {
-        description "Apply a policy for feature DHCP Guard";
-        type string;
-      }
-    }
-  }
-
-  grouping ip-dhcp-grouping {
-    // ip dhcp aaa
-    container aaa {
-      description
-        "Configure aaa attributes";
-      container default {
-        description
-          "Specify default values for aaa attributes";
-        leaf username {
-          description
-            "Default username for non-VRF pool subnet request or release";
-          type string;
-        }
-      }
-    }
-    // ip dhcp bootp
-    container bootp {
-      description "BOOTP specific configuration";
-      leaf ignore {
-        description "Configure this DHCP server to ignore to BOOTP requests.";
-        type empty;
-      }
-    }
-    list class {
-      description
-        "Configure DHCP classes";
-      key "id";
-      leaf id {
-        type string;
-      }
-      container option {
-        description
-          "Raw DHCP options";
-        list option-list {
-          key "option-range";
-          leaf option-range {
-            description "DHCP option code (1-254)";
-            type uint8 {
-              range "1..254";
-            }
-          }
-          leaf LINE {
-            description
-              "Specify a regular expression string";
-             type string;
-          }
-          list hex-list {
-            key "hex-string";
-            leaf hex-string {
-              type string;
-            }
-            leaf mask {
-              description
-                "Specify a bit mask for the pattern";
-              type inet:ipv4-address;
-            }
-          }
-        }
-      }
-      // ip dhcp class * / relay
-      container relay {
-        description
-          "Enter relay agent information option configuration submode";
-        container agent {
-          description
-            "Enter relay agent information option configuration submode";
-          leaf information {
-            description
-              "Enter relay agent information option configuration submode";
-            type empty;
-          }
-        }
-      }
-      // ip dhcp class * / remark
-      leaf remark {
-        description
-          "Specify a remark for this class";
-        type string {
-          length "1..240";
-        }
-      }
-    }
-    //  compatibility              Compatibility configuration
-    //  excluded-address        Prevent DHCP from assigning certain addresses
-    //  limited-broadcast-address  Use all 1's broadcast address
-
-    // ip dhcp ping
-    container ping {
-      description
-        "Specify ping parameters used by DHCP";
-      container packets {
-        description
-          "Specify number of ping packets";
-        presence "true";
-        leaf number-packets {
-          description
-            "Number of ping packets (0 disables ping)";
-          type uint8 {
-            range "0..10";
-          }
-          default 2;
-        }
-      }
-      leaf timeout {
-        description
-          "Specify ping timeout";
-        type uint16 {
-          range "100..10000";
-        }
-      } 
-    }
-    //ip dhcp conflict *
-    container conflict {
-      description
-        "DHCP address conflict parameters";
-      leaf logging {
-        description
-          "Record address conflicts in a log file";
-        type boolean;
-        default true;
-      }
-      container resolution {
-        description
-          "DHCP address conflict resolution";
-        presence "true";
-        leaf interval {
-          description
-            "Time in Minutes";
-          type uint32 {
-            range "5..1440";
-          }
-        }
-      }
-    }
-    //ip dhcp excluded-address
-    container excluded-address {
-      description
-        "Prevent DHCP from assigning certain addresses";
-      list low-address-list {
-        key "low-address";
-        leaf low-address {
-          type inet:ipv4-address;
-        }
-      }
-      list low-high-address-list {
-        key "low-address high-address";
-        leaf low-address {
-          type inet:ipv4-address;
-        }
-        leaf high-address {
-          type inet:ipv4-address;
-        }
-      }
-      list vrf-low-address-list {
-        key "vrf low-address";
-        leaf vrf {
-          description "VRF name for excluded address range";
-          type string;
-        }
-        leaf low-address {
-          type inet:ipv4-address;
-        }
-      }
-      list vrf-low-high-address-list {
-        key "vrf low-address high-address";
-        leaf vrf {
-          description "VRF name for excluded address range";
-          type string;
-        }
-        leaf low-address {
-          type inet:ipv4-address;
-        }
-        leaf high-address {
-          type inet:ipv4-address;
-        }
-      }
-    }
-    //ip dhcp binding
-    container binding {
-      description
-        "DHCP address bindings";
-      container cleanup {
-        description
-          "Remove expired bindings";     
-        leaf interval {
-          description
-            "Time in seconds";
-          type uint16 {
-            range "10..600";
-          }
-        }
-      }
-    }
-    //ip dhcp database
-    container database {
-      description
-        "Configure DHCP database agents";
-      list resource {
-        description
-          "Uniform Resource Locator (URL)";
-        key "resource-locator";
-        leaf  resource-locator {
-          description
-            "Uniform Resource Locator (URL)";
-          type string;
-        }
-        leaf write-delay {
-          description
-            "Set the database write delay";
-          type uint32 {
-            range "60..4294967295";
-          }
-        }
-        leaf timeout {
-          description
-            "Set the database transfer timeout";
-          type uint16 {
-            range "0..3600";
-          }
-        }
-      }
-    }
-    //ip dhcp limit
-    container limit {
-      description
-        "Limit DHCP Lease";
-      container lease {
-        description
-          "DHCP lease";
-        leaf log {
-          description
-            "Limit DHCP Lease";
-          type empty;
-        }
-        container per {
-          description
-            "per";
-          leaf interface {
-            description
-              "interface";
-            type uint16 {
-              range "1..65535";
-            } 
-          }
-        }
-      }
-    }
-    // ip dhcp subscriber-id interface-name
-    container subscriber-id {
-      description
-        "Global subscriber-id configuration";
-      leaf interface-name {
-        description
-          "Use interface short-name";
-        type empty;
-      }
-    }
-    // ip dhcp route
-    container route {
-      description
-        "Specify the type of routes for clients on unnumbered interfaces";
-      leaf route {
-        type enumeration {
-          enum "connected";
-          enum "static";
-        }
-        default "static";
-      }
-    }
-
-    // ip dhcp relay
-    container relay {
-      description
-        "DHCP relay agent parameters";
-      container information {
-        description
-          "Relay agent information option";
-        leaf trust-all {
-          description
-            "Received DHCP packets may contain relay info option with zero giaddr";
-          type empty;
-        }
-        container option {
-          description
-            "Insert relay information in BOOTREQUEST";
-          leaf option-default {
-            description "Default option, no vpn";
-            type empty;
-          }
-          leaf vpn {
-            description
-              "Insert VPN sub-options and change the giaddr to the outgoing interface";
-            type empty;
-          }
-        }
-      }
-    }
-    // ip dhcp pool *
-    list pool {
-      description
-        "Configure DHCP address pools";
-      key "id";
-      leaf id {
-        type string;
-      }
-      //  accounting           Send Accounting Start/Stop messages
-      //  bootfile             Boot file name
-      //  netbios-name-server  NetBIOS (WINS) name servers
-      //  netbios-node-type    NetBIOS node type
-      //  next-server          Next server in boot process
-      container option {                                      
-        description "Raw DHCP options";                     
-        list option-range {                                 
-          key "option-range";                             
-          leaf option-range {                             
-            description "DHCP option code";             
-            type uint8 {                                
-              range "0..254";                         
-            }                                           
-          }                                               
-          leaf ascii {                                    
-            description "Data is an NVT ASCII string";  
-            type string;                                
-          }                                               
-          container hex {                                 
-            description "Data is a hexadecimal string"; 
-            leaf hex-line {                             
-              description 
-                "Hexadecimal string, truncated to 180 hex characters entered";
-              type string;                            
-            }                                           
-            leaf none {                                 
-              description "No data";                  
-              type empty;                             
-            }
-          }                                               
-          leaf-list ip {                                  
-            description "Data is one or more IP addresses";                                                                             
-            type inet:host;                     
-          }
-        }
-      }
-
-      //  origin               Configure the origin of the pool
-      //  relay                Function as a DHCP relay
-      //  renew                Configure renewal policy
-      //  server               Configure the server ID option value
-      //  subnet               Subnet allocation commands
-      //  update               Dynamic updates
-      //  utilization          Configure various utilization parameters
-      list class {
-        description "Specify a DHCP class";
-        key "name";
-        leaf name {
-          description "DHCP class name";
-          type string;
-        }
-        container address {
-          description "Specify an address range for this class";
-          container range {
-            leaf ipv4-start {
-              description "Start IP address";
-              type inet:ipv4-address;
-            }
-
-            leaf ipv4-end {
-              description "End IP address";
-              type inet:ipv4-address;
-            }
-          }
-        }
-      }
-      leaf vrf {
-        description "Associate this pool with a VRF";
-              type string;
-      }
-      container lease {
-        description
-          "Address lease time";
-        choice lease {
-          container lease-value {
-            description "lease in numbers";
-            leaf days {
-              description "Days";
-              type uint16 {
-                range "0..365";
-              }
-            }
-            leaf hours {
-              description "Hours";
-              type uint8 {
-                range "0..23";
-              }
-            }
-            leaf minutes {
-               description "Minutes";
-               type uint8 {
-                 range "0..59";
-               }
-            }
-          }
-          leaf infinite {
-            description
-              "Infinite lease";
-            type empty;
-          }
-        }
-      }
-
-      container default-router {
-        leaf-list default-router-list {
-          description
-            "Default routers";
-      type union {
-        type inet:ipv4-address;
-        type string;
-      }
-        }
-      }
-
-      container utilization {
-        description "Configure various utilization commands";
-
-        container mark {
-          description "Configure thresholds for subnet release or request";
-
-          container high {
-            description "Specify high utilization mark of the pool";
-
-            leaf high-value {
-              description "Specify high utilization mark of the pool";
-
-              type uint8 {
-                range "1..100";
-              }
-              must "(not (../../low/low-value)) or "+
-                    "(current() > ../../low/low-value)" {
-                error-message "High utilization must be greater than "+
-                              "low utilization percentage.";
-              }
-            }
-            leaf log {
-              description "Log a system message when high/low state is detected";
-              type empty;
-            }
-
-          }
-          container low {
-            description "Specify low utilization mark of the pool";
-
-            leaf low-value {
-              description "Specify low utilization mark of the pool";
-
-              type uint8 {
-                range "1..100";
-              }
-
-              must "(not (../../high/high-value)) or"+
-                   "(current() < ../../high/high-value)" {
-                error-message "Low utilization must be less than "+
-                              "high utilization percentage.";
-              }
-            }
-            leaf log {
-              description "Log a system message when high/low state is detected";
-
-              type empty;
-            }
-          }
-        }
-      }
-      container dns-server {
-        leaf-list dns-server-list {
-          description
-            "DNS servers";
-          type union {
-            type inet:ipv4-address;
-            type string;
-          }
-        }
-      }
-      leaf domain-name {
-        description
-          "Domain name";
-        type string;
-      }
-      container network {
-        description
-          "Network number and mask";
-        container primary-network {
-          description
-            "Network number and mask";
-          leaf number {
-            description
-              "Network number";
-            type inet:ipv4-address;
-          }
-          leaf mask {
-            description
-              "Network mask";
-            type union {
-              type string;
-              type inet:ipv4-address;
-            }
-          }
-        }
-        list secondary-network {
-          description
-            "Secondary number and mask";
-          key "number";
-          leaf number {
-            description "Network number";
-            type inet:ipv4-address;
-          }
-          leaf mask {
-            description "Secondary mask";
-            type union {
-              type string;
-              type inet:ipv4-address;
-            }
-          }
-          leaf secondary {
-            description "Configure as secondary subnet";
-            type empty;
-          }
-        }
-      }
-      container host {
-        description
-          "Client IP address and mask";
-        leaf number {
-          type inet:ipv4-address;
-        }
-        leaf mask {
-          type inet:ipv4-address;
-        }
-      }
-      choice hardware-addr-cient-id-choice {
-        container hardware-address {
-          description
-            "Client hardware address";
-          leaf hardware-address-val {
-            description
-              "Dotted-hexadecimal string (aabb.ccdd.eeff ...)";
-            type ios-types:cisco-mac-address-type;
-          }
-        }
-        leaf client-identifier {
-          description
-            "Client identifier, Dotted-hexadecimal string (aabb.ccdd.eeff ...)";
-          type string;
-        }
-      }
-      leaf client-name {
-        description
-          "Client name, Client name (domain should not be included)";
-        type string;
-      }
-    }
-    //  relay                      DHCP relay agent parameters
-    //  route  Specify the type of routes for clients on unnumbered interfaces
-
-    // ip dhcp smart-relay
-    leaf smart-relay {
-      description
-        "Enable Smart Relay feature";
-      type empty;
-    }
-    // ip dhcp snooping
-    leaf snooping {
-      description
-        "DHCP Snooping";
-      type empty;
-    }
-    container snooping-conf {
-      container snooping {
-        description
-          "DHCP Snooping";
-        //  database     DHCP snooping database agent
-        container database {
-          description
-            "DHCP snooping database agent";
-          leaf url {
-            type string;
-          }
-          leaf timeout {
-            description
-              "Configure abort timeout interval";
-            type uint32 {
-              range "0..86400";
-            }
-          }
-          leaf write-delay {
-            description
-              "Configure delay timer for writes to URL";
-            type uint32 {
-              range "15..86400";
-            }
-          }
-        }
-        leaf glean {
-          description
-            "DHCP read only snooping";
-          type empty;
-        }
-        container information {
-          description
-            "DHCP Snooping information";
-          leaf option {
-            type boolean; 
-            default "true";
-          }
-          container options {
-            container option {
-              description
-                "DHCP Snooping information option";
-              leaf allow-untrusted {
-                description
-                  "DHCP Snooping information option allow-untrusted";
-                type empty;
-              }
-              container format {
-                description
-                  "Option 82 information format";
-                container remote-id {
-                  description
-                    "Remote id option 82 format";
-                  choice remote-id-choice {
-                    leaf hostname {
-                      description
-                        "Use configured hostname for remote id";
-                      type empty;
-                    }
-                    leaf string {
-                      description
-                        "User defined string for remote id";
-                      type string;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-        container track {
-          description
-            "DHCP snooping track";
-          leaf host {
-            description
-              "DHCP snooping track host";
-            type empty;
-          }
-        }
-        container verify {
-          description
-            "DHCP snooping verify";
-          leaf mac-address {
-            description
-              "DHCP snooping verify mac-address";
-            type empty;
-          }
-          leaf no-relay-agent-address {
-            description
-              "DHCP snooping verify giaddr";
-            type empty;
-          }
-        }
-        list vlan {
-          description
-            "DHCP Snooping vlan";
-          key "id";
-          leaf id {
-            type uint16 {
-              range "1..4094";
-            }
-          }
-        }
-        container wireless {
-          description
-            "DHCP snooping wireless";
-          container bootp-broadcast {
-            description
-              "DHCP snooping wireless bootp-broadcast";
-            leaf enable {
-              description
-                "DHCP snooping wireless bootp-broadcast enable";
-              type empty;
-            }
-          }
-        }
-      }
-    }
-    //  use  Configure use of certain parameters during allocation
-    container use {
-      description
-        "Configure use of certain parameters during allocation";
-      container class-name {
-				description
-					"Configure use of DHCP classes";
-				leaf class {
-					type boolean;
-					default true;
-				}
-        leaf aaa {
-          description
-            "Configure use of aaa to get class";
-          type empty;
-        }
-      }
-      container subscriber-id {
-        description
-          "Configure use of subscriber-id suboption";
-        leaf client-id {
-          description
-            "Use subscriber-id suboption as client-id";
-          type empty;
-        }
-      }
-      container vrf {
-        description
-          "Ignore or use receiving interface VRF";
-        leaf connected {
-          description
-            "Use input interface VRF when servicing connected clients";
-          type boolean;
-          default true;
-        } 
-        leaf remote {
-          description
-            "Use input interface VRF when servicing remote clients";
-          type empty;
-        } 
-      }
-    }
-  }
-  grouping ipv6-dhcp-grouping {
-    container server {
-      description "Configure IPv6 DHCP server";
-      container vrf {
-        description "Enable VRF Awareness on server";
-        leaf enable {
-          description "Enable Address/PD allocation based on VRF";
-          type empty;
-        }
-      }
-    }
-    container guard {
-      description "Configure IPv6 DHCP guard";
-      list policy {
-        description "Configure a policy for feature dhcp guard";
-        key "dhcp-guard-policy-name" ;
-        leaf dhcp-guard-policy-name{
-          type string;
-        }
-        container device-role {
-          description "Sets the role of the device attached to the port";
-          leaf server {
-            description "Attached device is a dhcp server";
-            type empty;
-          }
-          leaf client {
-            description "Attached device is a client (default)";
-            type empty;
-          }
-        }
-        container match {
-          description "dhcp filtering";
-          container server {
-            description "permitted server source addresses";
-            leaf access-list {
-              description "specify access-list for match";
-              type string;
-            }
-          }
-        }		  
-      }
-    }
-    list pool {
-      description
-        "Configure IPv6 DHCP pool";
-      key "name";
-      leaf name {
-        description 
-          "DHCP pool name";
-        type string;
-      }
-      leaf vrf {
-        description
-          "VRF name";
-        type string;
-      }
-      container address {
-        description
-          "IPv6 address allocation";
-        list prefix {
-          description
-            "IPv6 address allocation prefix";
-          key ipv6-address;
-          leaf ipv6-address {
-            type ios-types:ipv6-prefix;
-          }
-          container lifetime {
-            description
-              "Configure prefix lifetimes";
-            leaf valid-lifetime {
-              type union {
-                type uint32 {
-                  range "0 .. 4294967295";
-                }
-                type enumeration {
-                  enum "infinite";
-                }
-              }
-            }
-            leaf preferred-lifetime {
-              type union {
-                type uint32 {
-                  range "0 .. 4294967295";
-                }
-                type enumeration {
-                  enum "infinite";
-                }
-              }
-            }
-          }
-        }
-      }
-      leaf-list dns-server {
-        description 
-          "Server's name or IPv6 addres";
-        type union {
-          type inet:ipv6-address;
-          type string;
-        }
-      }
-      leaf domain-name {
-        description 
-          "Domain name to complete unqualified host names";
-        type string;
-      }
-      container import {
-        description
-          "Programatically importing DHCP option parameters";
-        leaf all {
-          description
-            "all DHCP options";
-          type empty;
-        }
-        container interface {
-          description
-            "Specify interface to import options from";
-          uses ios-ifc:interface-grouping;
-        }
-      }
-     
-      list link-address {
-        description "Link-address to match";
-        key "address";
-        leaf address {
-          type ios-types:ipv6-prefix;
-        }
-      }
-
-      leaf bootfile-url {
-        description
-        "Boot file url";
-        type string;
-      }
-    }
-  }
-
-  /////////////////////////////////////////////////////////
-  // native / ip / dhcp
-  /////////////////////////////////////////////////////////
-  augment "/ios:native/ios:ip/ios:dhcp" {
-    uses ip-dhcp-grouping;
-  }
-
-  /////////////////////////////////////////////////////////
-  // native / ipv6 / dhcp
-  /////////////////////////////////////////////////////////
-  augment "/ios:native/ios:ipv6/ios:dhcp" {
-    uses ipv6-dhcp-grouping;
-  }
-
-  /////////////////////////////////////////////////////////
-  // native / interface * / ip dhcp
-  /////////////////////////////////////////////////////////
-  augment "/ios:native/ios:interface/ios:FastEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:GigabitEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:TenGigabitEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:FiveGigabitEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:TwentyFiveGigE/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:TwoGigabitEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:FortyGigabitEthernet/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:HundredGigE/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Port-channel/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Loopback/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Tunnel/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Vlan/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:vasileft/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:vasiright/ios:ip/ios:dhcp" {
-    uses config-interface-ip-dhcp-grouping;
-  }
-
-  /////////////////////////////////////////////////////////
-  // native / interface * / ipv6 / dhcp
-  /////////////////////////////////////////////////////////
-  augment "/ios:native/ios:interface/ios:FastEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:GigabitEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:TenGigabitEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:FiveGigabitEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:TwentyFiveGigE/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-  
-  augment "/ios:native/ios:interface/ios:TwoGigabitEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:FortyGigabitEthernet/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:HundredGigE/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Port-channel/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Loopback/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Tunnel/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:Vlan/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:vasileft/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-
-  augment "/ios:native/ios:interface/ios:vasiright/ios:ipv6/ios:dhcp" {
-    uses config-interface-ipv6-dhcp-grouping;
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-features.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-features.yang
deleted file mode 100644
index afb7a5a76..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-features.yang
+++ /dev/null
@@ -1,190 +0,0 @@
-module Cisco-IOS-XE-features {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-features";
-  prefix ios-features;
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE feature Definitions
-     Copyright (c) 2016-2017 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  // =========================================================================
-  // FEATURES
-  // =========================================================================
-  feature switching-platform { 
-    description
-      "switching platform specific features";
-  }
-
-  feature crypto { 
-    description
-      "crypto feature";
-    //Cisco-IOS-XE-crypto (interface *)
-  }
-
-  feature device-tracking {
-    description
-      "device-tracking feature";
-    //Cisco-IOS-XE-device-tracking 
-  }
-
-  feature dot1x {
-    description
-      "dot1x feature";
-    //Cisco-IOS-XE-dot1x (interface *)
-  }
-
-  feature efp {
-    description
-      "Ethernet Flow Point (efp) feature";
-    //Cisco-IOS-XE-l2vpn (interface *)
-  }
-
-  feature esmc {
-    description
-      "Ethernet Synchronization Messaging Channel (esmc) feature";
-    //Cisco-IOS-XE-ethernet
-  }
-
-  feature eth-evc {
-    description
-      "Ethernet Virtual Circuit (EVC) feature";
-    //Cisco-IOS-XE-ethernet
-  }
-
-  feature ezpm {
-    description
-      "Easy Performance Monitor feature";
-    //Cisco-IOS-XE-ezpm (interface *)
-  }
-
-  feature l2 {
-    description
-      "Layer2 VPN feature";
-    //Cisco-IOS-XE-l2vpn
-  }
-
-  feature l2vpn {
-    description
-      "Layer2 VPN feature";
-    //Cisco-IOS-XE-l2vpn 
-    //Cisco-IOS-XE-bgp 
-  }
-
-  feature macsec {
-    description
-      "macsec";
-    //Cisco-IOS-XE-ethernet
-  }
-
-  feature mem-size {
-    description
-      "Memory size commands";
-    //Cisco-IOS-XE-native
-  }
-
-  feature module {
-    description
-      "Device module feature";
-    //Cisco-IOS-XE-switch 
-  }
-
-  feature multilink {
-    description
-      "PPP multilink global configuration";
-    //Cisco-IOS-XE-ppp - multilink 
-  }
-
-  feature mls {
-    description
-      "Multilayer Switching feature";
-    //Cisco-IOS-XE-mls 
-  }
-
-  feature parameter-map {
-    description
-      "Parameter Map feature";
-    //Cisco-IOS-XE-policy
-  }
-
-  feature private-vlan {
-    description
-      "Private-vlan feature";
-    //Cisco-IOS-XE-vlan 
-  }
-
-  feature punt-num {
-    description
-      "Police punt feature";
-    //Cisco-IOS-XE-platform 
-  }
-
-  feature qos-qsm {
-    description
-      "QoS queue softmax multiplier";
-    //Cisco-IOS-XE-qos  
-  }
-
-  feature setup {
-    description
-      "Express setup feature";
-    //Cisco-IOS-XE-switch 
-  }
-
-  feature switch-virtual {
-    description
-      "Switch-virtual feature";
-    //Cisco-IOS-XE-switch
-  }
-
-  feature table-map {
-    description
-      "table-map feature";
-    //Cisco-IOS-XE-qos
-  }
-
-  feature tod-clock {
-    description
-      "Time of Day clock feature";
-    //Cisco-IOS-XE-native
-  }
-
-  feature transceiver {
-    description
-      "Transceiver commands";
-    //Cisco-IOS-XE-native
-  }
-
-  feature virtual-template {
-    description
-      "Virtual-template commands";
-    //Cisco-IOS-XE-tunnel
-  }
-
-  feature vlan {
-    description
-      "Vlan feature";
-    //Cisco-IOS-XE-native-vlan
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interface-common.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interface-common.yang
deleted file mode 100644
index 5d4cf21ea..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interface-common.yang
+++ /dev/null
@@ -1,327 +0,0 @@
-module Cisco-IOS-XE-interface-common {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-interface-common";
-  prefix ios-ifc;
-
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Interfaces Common Yang model.
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-02-08 {
-     description
-       "Add a type of Interface: Ethernet";
-  }
-  revision 2017-11-27 {
-     description
-       "Added Change 25GE name";
-  }
-
-  revision 2017-11-13 {
-    description
-      "Added leafs for FortyGigabitEthernet and HundredGigE interfaces";
-  }
-  revision 2017-09-15 {
-    description
-      "This revison has changes for the new 2gig interface addition";
-  }
-  revision 2017-08-16 {
-    description
-      "This revision has changes for new 5gig and 25gig interfaces addition";
-  }
-
-  revision 2017-03-04 {
-    description
-      "Changed LISP key type to string to support OC mapping";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  grouping interface-grouping {
-    choice interface-choice {
-      leaf AppNav-Compress {
-        description
-          "Service-Context Virtual Interface Compress";
-        type uint16;
-      }
-
-      leaf AppNav-UnCompress {
-        description
-          "Service-Context Virtual Interface UnCompress";
-        type uint16;
-      }
-
-      leaf ATM {
-        description
-          "ATM interface";
-        type string; 
-      }
-
-      container ATM-subinterface {
-        leaf ATM {
-          type string; 
-        }
-      }
-
-      leaf ATM-ACR {
-        description
-          "ATM-ACR interface";
-        type string {
-          pattern "[0-9]";
-        }
-      }
-
-      container ATM-ACRsubinterface {
-        leaf ATM-ACR {
-          type string {
-            pattern "[0-9]\\.([0-9]/){3}[0-9]";
-          }
-        }
-      }
-
-      leaf BDI {
-        description
-          "Bridge-Domain interface";
-        type string;
-      }
-
-      leaf CEM {
-        description
-          "CEM interface";
-        type string {
-          pattern "([0-9]/){2}[0-9]";
-        }
-      }
-
-      leaf CEM-ACR {
-        description
-          "CEM-ACR interface";
-        type uint8 {
-          range "0..255";
-        }
-      }
-
-      leaf Embedded-Service-Engine {
-        description
-          "cisco embedded service engine module";
-        type string;
-      }
-
-      leaf Ethernet {
-        description
-          "IEEE 802.3";
-        type string;
-      }
-
-      leaf FastEthernet {
-        description
-          "FastEthernet IEEE 802.3";
-        type string;
-      }
-
-      leaf GigabitEthernet {
-        description
-          "GigabitEthernet IEEE 802.3z";
-        type string;
-      }
-
-      leaf FiveGigabitEthernet {
-        description
-          "Five GigabitEthernet ";
-        type string;
-      }
-
-      leaf TwentyFiveGigE {
-        description
-          "Twenty Five GigabitEthernet ";
-        type string;
-      }
-
-      leaf TwoGigabitEthernet {
-        description
-          "Two GigabitEthernet ";
-        type string;
-      }
-
-      leaf FortyGigabitEthernet {
-        description
-          "Forty GigabitEthernet ";
-        type string;
-      }
-
-      leaf HundredGigE {
-        description
-          "Hundred GigabitEthernet";
-        type string;
-      }
-
-      leaf LISP {
-        description
-          "Locator/ID Separation Protocol Virtual Interface";
-          type string;
-//CHANGE        type uint16 {
-//          range "0..65520";
-//        }
-      }
-
-      // Lspsubvif   LSP virtual Sub-Interface
-      container LISP-subinterface {
-        description
-          "Locator/ID Separation Protocol Virtual Interface";
-        leaf LISP {
-          type string {
-              pattern "[0-9]*(. ?[1-9][0-9]*)*";
-          }
-        }
-      }
-
-      leaf Loopback {
-        description
-          "Loopback interface";
-        type uint32;
-      }
-
-      leaf Multilink {
-        description
-          "Multilink-group interface";
-        type uint16;
-      }
-
-      leaf nve {
-        description
-          "Network virtualization endpoint interface";
-        type uint16;
-      }
-
-      leaf overlay {
-        description
-          "Overlay interface";
-        type uint16;
-      }
-
-      leaf Port-channel {
-        description
-          "Ethernet Channel of interfaces";
-        type uint32;
-      }
-
-      container Port-channel-subinterface {
-        leaf Port-channel {
-          type string;
-        }
-      }
-
-      leaf pseudowire {
-        description
-          "Pseudowire Interface";
-        type uint32;
-      }
-
-      leaf SM {
-        description
-          "SM Interface";
-        type string;
-      }
-
-      leaf Cellular {
-        description
-          "Cellular Interface";
-        type string;
-      }
-
-      leaf Serial {
-        description
-          "Serial interface";
-        type string;
-      }
-
-      leaf TenGigabitEthernet {
-        description
-          "Ten Gigabit Ethernet";
-        type string;
-      }
-
-      leaf Tunnel {
-        description
-          "Tunnel interface";
-        type uint32;
-      }
-
-      leaf Virtual-Template {
-        description
-          "Virtual Template interface";
-        type uint16;
-      }
-
-      leaf Vlan {
-        description
-          "Iosxr Vlans";
-        type uint16;
-      }
-
-      leaf VirtualPortGroup {
-        description
-          "Virtual Port Group";
-        type uint16;
-      }
-
-      leaf vasileft {
-        description
-          "vasileft";
-        type uint16;
-      }
-
-      leaf vasiright {
-        description
-          "vasiright";
-        type uint16;
-      }
-    }
-  }// interface-grouping - all interface lists collected
-
-  grouping passive-interface-grouping {
-    container passive-interface {
-      description
-        "Suppress routing updates on an interface";
-      choice passive-interface-choice {
-        leaf default {
-          description
-            "Suppress routing updates on all interfaces";
-          type empty;
-        }
-        leaf interface {
-          type string;
-        }
-      }
-    }
-    container disable {
-      when "../passive-interface/default";
-      list passive-interface {
-        key "interface";
-        leaf interface {
-          type string;
-        }
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces-oper.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces-oper.yang
deleted file mode 100644
index 2fc258246..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-interfaces-oper.yang
+++ /dev/null
@@ -1,2925 +0,0 @@
-module Cisco-IOS-XE-interfaces-oper {
-  yang-version 1;
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-interfaces-oper";
-  prefix interfaces-ios-xe-oper;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions for
-     monitoring the interfaces in a Network Element.
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2018-02-01 {
-    description
-      "IPv6 addresses";
-    reference "2.0.0";
-  }
-  revision 2017-10-10 {
-    description
-      "Initial revision";
-    reference "1.0.0";
-  }
-
-  typedef qos-match-type {
-    type enumeration {
-      enum "qos-match-dscp" {
-        value 0;
-      }
-      enum "qos-match-src-ip" {
-        value 1;
-      }
-      enum "qos-match-dst-ip" {
-        value 2;
-      }
-      enum "qos-match-src-port" {
-        value 3;
-      }
-      enum "qos-match-dst-port" {
-        value 4;
-      }
-      enum "qos-match-proto" {
-        value 5;
-      }
-    }
-    description
-      "QOS match type";
-  }
-
-  typedef thresh-unit {
-    type enumeration {
-      enum "thresh-units-default" {
-        value 0;
-      }
-      enum "thresh-units-bytes" {
-        value 1;
-      }
-      enum "thresh-units-sec" {
-        value 2;
-      }
-      enum "thresh-units-packets" {
-        value 3;
-      }
-      enum "thresh-units-cells" {
-        value 4;
-      }
-      enum "thresh-units-percent" {
-        value 5;
-      }
-    }
-    description
-      "Units of threshold";
-  }
-
-  typedef qos-direction {
-    type enumeration {
-      enum "qos-inbound" {
-        value 0;
-        description
-          "Direction of traffic coming into the network entry";
-      }
-      enum "qos-outbound" {
-        value 1;
-        description
-          "Direction of traffic going out of the network entry";
-      }
-    }
-    description
-      "QoS direction indication";
-  }
-
-  typedef aggregation-type {
-    type enumeration {
-      enum "lag-off" {
-        value 0;
-        description
-          "LAG mode is off";
-      }
-      enum "lag-auto" {
-        value 1;
-        description
-          "LAG mode is auto";
-      }
-      enum "lag-active" {
-        value 2;
-        description
-          "LAG mode is active";
-      }
-      enum "lag-passive" {
-        value 3;
-        description
-          "LAG mode is passive";
-      }
-    }
-    description
-      "Type to define the lag-type, i.e., how the LAG is
-       defined and managed";
-  }
-
-  typedef intf-state {
-    type enumeration {
-      enum "if-state-unknown" {
-        value 0;
-      }
-      enum "if-state-up" {
-        value 1;
-      }
-      enum "if-state-down" {
-        value 2;
-      }
-      enum "if-state-test" {
-        value 3;
-      }
-    }
-    description
-      "The desired state of the interface.
-       This leaf has the same read semantics as ifAdminStatus.
-       Reference:
-       RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-  }
-
-  typedef ether-duplex {
-    type enumeration {
-      enum "full-duplex" {
-        value 0;
-      }
-      enum "half-duplex" {
-        value 1;
-      }
-      enum "auto-duplex" {
-        value 2;
-      }
-      enum "unknown-duplex" {
-        value 3;
-      }
-    }
-    description
-      "The duplex setting of the interface";
-  }
-
-  typedef ether-speed {
-    type enumeration {
-      enum "speed-10mb" {
-        value 0;
-      }
-      enum "speed-100mb" {
-        value 1;
-      }
-      enum "speed-1gb" {
-        value 2;
-      }
-      enum "speed-10gb" {
-        value 3;
-      }
-      enum "speed-25gb" {
-        value 4;
-      }
-      enum "speed-40gb" {
-        value 5;
-      }
-      enum "speed-50gb" {
-        value 6;
-      }
-      enum "speed-100gb" {
-        value 7;
-      }
-      enum "speed-unknown" {
-        value 8;
-      }
-      enum "speed-auto" {
-        value 9;
-      }
-    }
-    description
-      "The speed setting of the interface";
-  }
-
-  typedef oper-state {
-    type enumeration {
-      enum "if-oper-state-invalid" {
-        value 0;
-      }
-      enum "if-oper-state-ready" {
-        value 1;
-      }
-      enum "if-oper-state-no-pass" {
-        value 2;
-      }
-      enum "if-oper-state-test" {
-        value 3;
-      }
-      enum "if-oper-state-unknown" {
-        value 4;
-      }
-      enum "if-oper-state-dormant" {
-        value 5;
-      }
-      enum "if-oper-state-not-present" {
-        value 6;
-      }
-      enum "if-oper-state-lower-layer-down" {
-        value 7;
-      }
-    }
-    description
-      "The current operational state of the interface.
-       This leaf has the same semantics as ifOperStatus.
-       Reference:
-       RFC 2863: The Interfaces Group MIB - ifOperStatus";
-  }
-
-  typedef ietf-intf-type {
-    type enumeration {
-      enum "iana-iftype-other" {
-        value 1;
-      }
-      enum "iana-iftype-regular1822" {
-        value 2;
-      }
-      enum "iana-iftype-hdh1822" {
-        value 3;
-      }
-      enum "iana-iftype-ddnx25" {
-        value 4;
-      }
-      enum "iana-iftype-rfc877x25" {
-        value 5;
-      }
-      enum "iana-iftype-ethernet-csmacd" {
-        value 6;
-      }
-      enum "iana-iftype-iso88023-csmacd" {
-        value 7;
-      }
-      enum "iana-iftype-iso88024-tokenbus" {
-        value 8;
-      }
-      enum "iana-iftype-iso88025-tokenring" {
-        value 9;
-      }
-      enum "iana-iftype-iso88026-man" {
-        value 10;
-      }
-      enum "iana-iftype-starlan" {
-        value 11;
-      }
-      enum "iana-iftype-proteon10mbit" {
-        value 12;
-      }
-      enum "iana-iftype-proteon80mbit" {
-        value 13;
-      }
-      enum "iana-iftype-hyperchannel" {
-        value 14;
-      }
-      enum "iana-iftype-fddi" {
-        value 15;
-      }
-      enum "iana-iftype-lapb" {
-        value 16;
-      }
-      enum "iana-iftype-sdlc" {
-        value 17;
-      }
-      enum "iana-iftype-ds1" {
-        value 18;
-      }
-      enum "iana-iftype-e1" {
-        value 19;
-      }
-      enum "iana-iftype-basicisdn" {
-        value 20;
-      }
-      enum "iana-iftype-primaryisdn" {
-        value 21;
-      }
-      enum "iana-iftype-prop-p2p-serial" {
-        value 22;
-      }
-      enum "iana-iftype-ppp" {
-        value 23;
-      }
-      enum "iana-iftype-sw-loopback" {
-        value 24;
-      }
-      enum "iana-iftype-eon" {
-        value 25;
-      }
-      enum "iana-iftype-ethernet3mbit" {
-        value 26;
-      }
-      enum "iana-iftype-nsip" {
-        value 27;
-      }
-      enum "iana-iftype-slip" {
-        value 28;
-      }
-      enum "iana-iftype-ultra" {
-        value 29;
-      }
-      enum "iana-iftype-ds3" {
-        value 30;
-      }
-      enum "iana-iftype-sip" {
-        value 31;
-      }
-      enum "iana-iftype-framerelay" {
-        value 32;
-      }
-      enum "iana-iftype-rs232" {
-        value 33;
-      }
-      enum "iana-iftype-para" {
-        value 34;
-      }
-      enum "iana-iftype-arcnet" {
-        value 35;
-      }
-      enum "iana-iftype-arcnetplus" {
-        value 36;
-      }
-      enum "iana-iftype-atm" {
-        value 37;
-      }
-      enum "iana-iftype-miox25" {
-        value 38;
-      }
-      enum "iana-iftype-sonet" {
-        value 39;
-      }
-      enum "iana-iftype-x25ple" {
-        value 40;
-      }
-      enum "iana-iftype-iso88022-llc" {
-        value 41;
-      }
-      enum "iana-iftype-localtalk" {
-        value 42;
-      }
-      enum "iana-iftype-smdsdxi" {
-        value 43;
-      }
-      enum "iana-iftype-framerelay-service" {
-        value 44;
-      }
-      enum "iana-iftype-v35" {
-        value 45;
-      }
-      enum "iana-iftype-hssi" {
-        value 46;
-      }
-      enum "iana-iftype-hippi" {
-        value 47;
-      }
-      enum "iana-iftype-modem" {
-        value 48;
-      }
-      enum "iana-iftype-aal5" {
-        value 49;
-      }
-      enum "iana-iftype-sonetpath" {
-        value 50;
-      }
-      enum "iana-iftype-sonetvt" {
-        value 51;
-      }
-      enum "iana-iftype-smdsicip" {
-        value 52;
-      }
-      enum "iana-iftype-propvirtual" {
-        value 53;
-      }
-      enum "iana-iftype-propmultiplexor" {
-        value 54;
-      }
-      enum "iana-iftype-ieee80212" {
-        value 55;
-      }
-      enum "iana-iftype-fiberchannel" {
-        value 56;
-      }
-      enum "iana-iftype-hippi-interface" {
-        value 57;
-      }
-      enum "iana-iftype-framerelay-interconnect" {
-        value 58;
-      }
-      enum "iana-iftype-aflane8023" {
-        value 59;
-      }
-      enum "iana-iftype-aflane8025" {
-        value 60;
-      }
-      enum "iana-iftype-cctemul" {
-        value 61;
-      }
-      enum "iana-iftype-fastether" {
-        value 62;
-      }
-      enum "iana-iftype-isdn" {
-        value 63;
-      }
-      enum "iana-iftype-v11" {
-        value 64;
-      }
-      enum "iana-iftype-v36" {
-        value 65;
-      }
-      enum "iana-iftype-g703at64k" {
-        value 66;
-      }
-      enum "iana-iftype-g703at2mb" {
-        value 67;
-      }
-      enum "iana-iftype-qllc" {
-        value 68;
-      }
-      enum "iana-iftype-fastetherfx" {
-        value 69;
-      }
-      enum "iana-iftype-channel" {
-        value 70;
-      }
-      enum "iana-iftype-ieee80211" {
-        value 71;
-      }
-      enum "iana-iftype-ibm370parchan" {
-        value 72;
-      }
-      enum "iana-iftype-escon" {
-        value 73;
-      }
-      enum "iana-iftype-dlsw" {
-        value 74;
-      }
-      enum "iana-iftype-isdns" {
-        value 75;
-      }
-      enum "iana-iftype-isdnu" {
-        value 76;
-      }
-      enum "iana-iftype-lapd" {
-        value 77;
-      }
-      enum "iana-iftype-ipswitch" {
-        value 78;
-      }
-      enum "iana-iftype-rsrb" {
-        value 79;
-      }
-      enum "iana-iftype-atmlogical" {
-        value 80;
-      }
-      enum "iana-iftype-ds0" {
-        value 81;
-      }
-      enum "iana-iftype-ds0bundle" {
-        value 82;
-      }
-      enum "iana-iftype-bsc" {
-        value 83;
-      }
-      enum "iana-iftype-async" {
-        value 84;
-      }
-      enum "iana-iftype-cnr" {
-        value 85;
-      }
-      enum "iana-iftype-iso88025-dtr" {
-        value 86;
-      }
-      enum "iana-iftype-eplrs" {
-        value 87;
-      }
-      enum "iana-iftype-arap" {
-        value 88;
-      }
-      enum "iana-iftype-propcnls" {
-        value 89;
-      }
-      enum "iana-iftype-hostpad" {
-        value 90;
-      }
-      enum "iana-iftype-termpad" {
-        value 91;
-      }
-      enum "iana-iftype-framerelay-mpi" {
-        value 92;
-      }
-      enum "iana-iftype-x213" {
-        value 93;
-      }
-      enum "iana-iftype-adsl" {
-        value 94;
-      }
-      enum "iana-iftype-radsl" {
-        value 95;
-      }
-      enum "iana-iftype-sdsl" {
-        value 96;
-      }
-      enum "iana-iftype-vdsl" {
-        value 97;
-      }
-      enum "iana-iftype-iso88025-crfpint" {
-        value 98;
-      }
-      enum "iana-iftype-myrinet" {
-        value 99;
-      }
-      enum "iana-iftype-voiceem" {
-        value 100;
-      }
-      enum "iana-iftype-voicefxo" {
-        value 101;
-      }
-      enum "iana-iftype-voicefxs" {
-        value 102;
-      }
-      enum "iana-iftype-voiceencap" {
-        value 103;
-      }
-      enum "iana-iftype-voip" {
-        value 104;
-      }
-      enum "iana-iftype-atmdxi" {
-        value 105;
-      }
-      enum "iana-iftype-atmfuni" {
-        value 106;
-      }
-      enum "iana-iftype-atmima" {
-        value 107;
-      }
-      enum "iana-iftype-ppp-multilinkbundle" {
-        value 108;
-      }
-      enum "iana-iftype-ipovercdlc" {
-        value 109;
-      }
-      enum "iana-iftype-ipoverclaw" {
-        value 110;
-      }
-      enum "iana-iftype-stack2stack" {
-        value 111;
-      }
-      enum "iana-iftype-virtualipaddress" {
-        value 112;
-      }
-      enum "iana-iftype-mpc" {
-        value 113;
-      }
-      enum "iana-iftype-ipoveratm" {
-        value 114;
-      }
-      enum "iana-iftype-iso88025-fiber" {
-        value 115;
-      }
-      enum "iana-iftype-tdlc" {
-        value 116;
-      }
-      enum "iana-iftype-gige" {
-        value 117;
-      }
-      enum "iana-iftype-hdlc" {
-        value 118;
-      }
-      enum "iana-iftype-lapf" {
-        value 119;
-      }
-      enum "iana-iftype-v37" {
-        value 120;
-      }
-      enum "iana-iftype-x25mlp" {
-        value 121;
-      }
-      enum "iana-iftype-x25huntgroup" {
-        value 122;
-      }
-      enum "iana-iftype-transphdlc" {
-        value 123;
-      }
-      enum "iana-iftype-interleave" {
-        value 124;
-      }
-      enum "iana-iftype-fast" {
-        value 125;
-      }
-      enum "iana-iftype-ip" {
-        value 126;
-      }
-      enum "iana-iftype-docs-cable-maclayer" {
-        value 127;
-      }
-      enum "iana-iftype-docs-cable-downstream" {
-        value 128;
-      }
-      enum "iana-iftype-docs-cable-upstream" {
-        value 129;
-      }
-      enum "iana-iftype-a12mppswitch" {
-        value 130;
-      }
-      enum "iana-iftype-tunnel" {
-        value 131;
-      }
-      enum "iana-iftype-coffee" {
-        value 132;
-      }
-      enum "iana-iftype-ces" {
-        value 133;
-      }
-      enum "iana-iftype-atmsubinterface" {
-        value 134;
-      }
-      enum "iana-iftype-l2vlan" {
-        value 135;
-      }
-      enum "iana-iftype-l3ipvlan" {
-        value 136;
-      }
-      enum "iana-iftype-l3ipxvlan" {
-        value 137;
-      }
-      enum "iana-iftype-digital-powerline" {
-        value 138;
-      }
-      enum "iana-iftype-media-mailoverip" {
-        value 139;
-      }
-      enum "iana-iftype-dtm" {
-        value 140;
-      }
-      enum "iana-iftype-dcn" {
-        value 141;
-      }
-      enum "iana-iftype-ipforward" {
-        value 142;
-      }
-      enum "iana-iftype-msdsl" {
-        value 143;
-      }
-      enum "iana-iftype-ieee1394" {
-        value 144;
-      }
-      enum "iana-iftype-gsn" {
-        value 145;
-      }
-      enum "iana-iftype-dvbrcc-maclayer" {
-        value 146;
-      }
-      enum "iana-iftype-dvbrcc-downstream" {
-        value 147;
-      }
-      enum "iana-iftype-dvbrcc-upstream" {
-        value 148;
-      }
-      enum "iana-iftype-atmvirtual" {
-        value 149;
-      }
-      enum "iana-iftype-mplstunnel" {
-        value 150;
-      }
-      enum "iana-iftype-srp" {
-        value 151;
-      }
-      enum "iana-iftype-voiceoveratm" {
-        value 152;
-      }
-      enum "iana-iftype-voiceoverframerelay" {
-        value 153;
-      }
-      enum "iana-iftype-idsl" {
-        value 154;
-      }
-      enum "iana-iftype-compositelink" {
-        value 155;
-      }
-      enum "iana-iftype-ss7siglink" {
-        value 156;
-      }
-      enum "iana-iftype-propwireless-p2p" {
-        value 157;
-      }
-      enum "iana-iftype-frforward" {
-        value 158;
-      }
-      enum "iana-iftype-rfc1483" {
-        value 159;
-      }
-      enum "iana-iftype-usb" {
-        value 160;
-      }
-      enum "iana-iftype-ieee8023-adlag" {
-        value 161;
-      }
-      enum "iana-iftype-bgppolicy-accounting" {
-        value 162;
-      }
-      enum "iana-iftype-frf16mfrbundle" {
-        value 163;
-      }
-      enum "iana-iftype-h323gatekeeper" {
-        value 164;
-      }
-      enum "iana-iftype-h323proxy" {
-        value 165;
-      }
-      enum "iana-iftype-mpls" {
-        value 166;
-      }
-      enum "iana-iftype-mfsiglink" {
-        value 167;
-      }
-      enum "iana-iftype-hdsl2" {
-        value 168;
-      }
-      enum "iana-iftype-shdsl" {
-        value 169;
-      }
-      enum "iana-iftype-ds1fdl" {
-        value 170;
-      }
-      enum "iana-iftype-pos" {
-        value 171;
-      }
-      enum "iana-iftype-dvbasiin" {
-        value 172;
-      }
-      enum "iana-iftype-dvbasiout" {
-        value 173;
-      }
-      enum "iana-iftype-plc" {
-        value 174;
-      }
-      enum "iana-iftype-nfas" {
-        value 175;
-      }
-      enum "iana-iftype-tr008" {
-        value 176;
-      }
-      enum "iana-iftype-gr303rdt" {
-        value 177;
-      }
-      enum "iana-iftype-gr303idt" {
-        value 178;
-      }
-      enum "iana-iftype-isup" {
-        value 179;
-      }
-      enum "iana-iftype-prop-docs-wireless-maclayer" {
-        value 180;
-      }
-      enum "iana-iftype-prop-docs-wireless-downstream" {
-        value 181;
-      }
-      enum "iana-iftype-prop-docs-wireless-upstream" {
-        value 182;
-      }
-      enum "iana-iftype-hiperlan2" {
-        value 183;
-      }
-      enum "iana-iftype-prop-bwap2mp" {
-        value 184;
-      }
-      enum "iana-iftype-sonetoverheadchannel" {
-        value 185;
-      }
-      enum "iana-iftype-digital-wrapperoverheadchannel" {
-        value 186;
-      }
-      enum "iana-iftype-aal2" {
-        value 187;
-      }
-      enum "iana-iftype-radiomac" {
-        value 188;
-      }
-      enum "iana-iftype-atmradio" {
-        value 189;
-      }
-      enum "iana-iftype-imt" {
-        value 190;
-      }
-      enum "iana-iftype-mvl" {
-        value 191;
-      }
-      enum "iana-iftype-reachhdsl" {
-        value 192;
-      }
-      enum "iana-iftype-frdlciendpt" {
-        value 193;
-      }
-      enum "iana-iftype-atmvciendpt" {
-        value 194;
-      }
-      enum "iana-iftype-opticalchannel" {
-        value 195;
-      }
-      enum "iana-iftype-opticaltransport" {
-        value 196;
-      }
-      enum "iana-iftype-propatm" {
-        value 197;
-      }
-      enum "iana-iftype-voiceovercable" {
-        value 198;
-      }
-      enum "iana-iftype-infiniband" {
-        value 199;
-      }
-      enum "iana-iftype-telink" {
-        value 200;
-      }
-      enum "iana-iftype-q2931" {
-        value 201;
-      }
-      enum "iana-iftype-virtualatg" {
-        value 202;
-      }
-      enum "iana-iftype-siptg" {
-        value 203;
-      }
-      enum "iana-iftype-sipsig" {
-        value 204;
-      }
-      enum "iana-iftype-docs-cable-upstreamchannel" {
-        value 205;
-      }
-      enum "iana-iftype-econet" {
-        value 206;
-      }
-      enum "iana-iftype-pon155" {
-        value 207;
-      }
-      enum "iana-iftype-pon622" {
-        value 208;
-      }
-      enum "iana-iftype-bridge-if" {
-        value 209;
-      }
-      enum "iana-iftype-linegroup" {
-        value 210;
-      }
-      enum "iana-iftype-voiceemfgd" {
-        value 211;
-      }
-      enum "iana-iftype-voiceefgdeana" {
-        value 212;
-      }
-      enum "iana-iftype-voicedid" {
-        value 213;
-      }
-      enum "iana-iftype-mpegtransport" {
-        value 214;
-      }
-      enum "iana-iftype-sixtofour" {
-        value 215;
-      }
-      enum "iana-iftype-gtp" {
-        value 216;
-      }
-      enum "iana-iftype-pdnetherloop1" {
-        value 217;
-      }
-      enum "iana-iftype-pdnetherloop2" {
-        value 218;
-      }
-      enum "iana-iftype-opticalchannel-group" {
-        value 219;
-      }
-      enum "iana-iftype-homepna" {
-        value 220;
-      }
-      enum "iana-iftype-gfp" {
-        value 221;
-      }
-      enum "iana-iftype-ciscoislvlan" {
-        value 222;
-      }
-      enum "iana-iftype-actelismetaloop" {
-        value 223;
-      }
-      enum "iana-iftype-fciplink" {
-        value 224;
-      }
-      enum "iana-iftype-rpr" {
-        value 225;
-      }
-      enum "iana-iftype-qam" {
-        value 226;
-      }
-      enum "iana-iftype-lmp" {
-        value 227;
-      }
-      enum "iana-iftype-cblvectastar" {
-        value 228;
-      }
-      enum "iana-iftype-docs-cable-mcmts-downtream" {
-        value 229;
-      }
-      enum "iana-iftype-adsl2" {
-        value 230;
-      }
-      enum "iana-iftype-macseccontrolledif" {
-        value 231;
-      }
-      enum "iana-iftype-macsecuncontrolledif" {
-        value 232;
-      }
-      enum "iana-iftype-aviciopticalether" {
-        value 233;
-      }
-      enum "iana-iftype-atmbond" {
-        value 234;
-      }
-      enum "iana-iftype-voicefgdos" {
-        value 235;
-      }
-      enum "iana-iftype-mocaversion1" {
-        value 236;
-      }
-      enum "iana-iftype-ieee80216-wman" {
-        value 237;
-      }
-      enum "iana-iftype-adsl2plus" {
-        value 238;
-      }
-      enum "iana-iftype-dvbrcsmaclayer" {
-        value 239;
-      }
-      enum "iana-iftype-dvbtdm" {
-        value 240;
-      }
-      enum "iana-iftype-dvbrcstdma" {
-        value 241;
-      }
-      enum "iana-iftype-x86laps" {
-        value 242;
-      }
-      enum "iana-iftype-wwanpp" {
-        value 243;
-      }
-      enum "iana-iftype-wwanpp2" {
-        value 244;
-      }
-      enum "iana-iftype-voiceebs" {
-        value 245;
-      }
-      enum "iana-iftype-ifpwtype" {
-        value 246;
-      }
-      enum "iana-iftype-ilan" {
-        value 247;
-      }
-      enum "iana-iftype-pip" {
-        value 248;
-      }
-      enum "iana-iftype-aluelp" {
-        value 249;
-      }
-      enum "iana-iftype-gpon" {
-        value 250;
-      }
-      enum "iana-iftype-vdsl2" {
-        value 251;
-      }
-      enum "iana-iftype-capwapdot11-profile" {
-        value 252;
-      }
-      enum "iana-iftype-capwapdot11-bss" {
-        value 253;
-      }
-      enum "iana-iftype-capwapwtp-virtualradio" {
-        value 254;
-      }
-      enum "iana-iftype-bits" {
-        value 255;
-      }
-      enum "iana-iftype-docs-cable-upstreamrfport" {
-        value 256;
-      }
-      enum "iana-iftype-cable-downstreamrfport" {
-        value 257;
-      }
-      enum "iana-iftype-vmware-virtualnic" {
-        value 258;
-      }
-      enum "iana-iftype-ieee802154" {
-        value 259;
-      }
-      enum "iana-iftype-otnodu" {
-        value 260;
-      }
-      enum "iana-iftype-otnotu" {
-        value 261;
-      }
-      enum "iana-iftype-ifvfitype" {
-        value 262;
-      }
-      enum "iana-iftype-g9981" {
-        value 263;
-      }
-      enum "iana-iftype-g9982" {
-        value 264;
-      }
-      enum "iana-iftype-g9983" {
-        value 265;
-      }
-      enum "iana-iftype-aluepon" {
-        value 266;
-      }
-      enum "iana-iftype-aluepon-onu" {
-        value 267;
-      }
-      enum "iana-iftype-aluepon-physicaluni" {
-        value 268;
-      }
-      enum "iana-iftype-aluepon-logicalink" {
-        value 269;
-      }
-      enum "iana-iftype-alugpon-onu" {
-        value 270;
-      }
-      enum "iana-iftype-alugpon-physicaluni" {
-        value 271;
-      }
-      enum "iana-iftype-vmwarenicteam" {
-        value 272;
-      }
-      enum "iana-iftype-docs-ofdm-downstream" {
-        value 277;
-      }
-      enum "iana-iftype-docs-ofdma-upstream" {
-        value 278;
-      }
-      enum "iana-iftype-gfast" {
-        value 279;
-      }
-      enum "iana-iftype-sdci" {
-        value 280;
-      }
-      enum "iana-iftype-xbox-wireless" {
-        value 281;
-      }
-      enum "iana-iftype-fastdsl" {
-        value 282;
-      }
-    }
-    description
-      "IANAifType
-       This data type is used as the syntax of the ifType
-       object in the (updated) definition of MIB-II's ifTable";
-  }
-
-  typedef serial-crc {
-    type enumeration {
-      enum "serial-crc32" {
-        value 0;
-        description
-          "32-bit Cyclic Redundancy Code";
-      }
-      enum "serial-crc16" {
-        value 1;
-        description
-          "16 bit Cyclic Redundancy Code";
-      }
-    }
-    description
-      "The Cyclic Redundancy Code type";
-  }
-
-  typedef subrate-speed {
-    type enumeration {
-      enum "dsx1-subrate-56kbps" {
-        value 0;
-        description
-          "56 kilobits per second subrate";
-      }
-      enum "dsx1-subrate-64kbps" {
-        value 1;
-        description
-          "64 kilobits per second subrate";
-      }
-    }
-    description
-      "The subrate on a serial interface";
-  }
-
-  typedef t1e1-loopback-mode {
-    type enumeration {
-      enum "t1e1-no-loopback" {
-        value 0;
-        description
-          "No loopback mode";
-      }
-      enum "t1e1-cli-local-loopback" {
-        value 1;
-        description
-          "Command line interface enforced local loopback";
-      }
-      enum "t1e1-line-cli-local-loopback" {
-        value 2;
-        description
-          "Command line interface enforced line local loopback";
-      }
-      enum "t1e1-payload-cli-local-loopback" {
-        value 3;
-        description
-          "Command line interface enforced payload local loopback";
-      }
-      enum "t1e1-local-line-loopback" {
-        value 4;
-        description
-          "Local line loopback";
-      }
-      enum "t1e1-local-payload-loopback" {
-        value 5;
-        description
-          "Local payload loopback";
-      }
-      enum "t1e1-local-ansi-fdl-remote-loopback" {
-        value 6;
-        description
-          "Line ANSI FDL remote loopback";
-      }
-      enum "t1e1-line-att-fdl-remote-loopback" {
-        value 7;
-        description
-          "Line ATT FDL remote loopback";
-      }
-      enum "t1e1-payload-ansi-fdl-remote-loopback" {
-        value 8;
-        description
-          "Payload ANSI FDL remote loopback";
-      }
-      enum "t1e1-payload-att-fdl-remote-loopback" {
-        value 9;
-        description
-          "Payload ATT FDL remote loopback";
-      }
-      enum "t1e1-line-iboc-remote-loopback" {
-        value 10;
-        description
-          "Line IBOC remote loopback";
-      }
-      enum "t1e1-line-ansi-fdl-local-loopback" {
-        value 11;
-        description
-          "Line ANSI FDL local loopback";
-      }
-      enum "t1e1-line-att-fdl-local-loopback" {
-        value 12;
-        description
-          "Line ATT FDL local loopback";
-      }
-      enum "t1e1-payload-ansi-fdl-local-loopback" {
-        value 13;
-        description
-          "Payload ANSI FDL local loopback";
-      }
-      enum "t1e1-payload-att-fdl-local-loopback" {
-        value 14;
-        description
-          "Payload ATT FDL local loopback";
-      }
-      enum "t1e1-line-iboc-local-loopback" {
-        value 15;
-        description
-          "Line IBOC local loopback";
-      }
-    }
-    description
-      "Loopback mode type";
-  }
-
-  grouping wred-class-counts {
-    description
-      "WRED class count types";
-    leaf wred-tx-pkts {
-      type uint64;
-      description
-        "Transmitted packtes";
-    }
-    leaf wred-tx-bytes {
-      type uint64;
-      description
-        "Transmitted bytes";
-    }
-    leaf wred-tail-drop-pkts {
-      type uint64;
-      description
-        "Tail drop packets";
-    }
-    leaf wred-tail-drop-bytes {
-      type uint64;
-      description
-        "Tail drop bytes";
-    }
-    leaf wred-early-drop-pkts {
-      type uint64;
-      description
-        "Early drop packets";
-    }
-    leaf wred-early-drop-bytes {
-      type uint64;
-      description
-        "Early drop bytes";
-    }
-  }
-
-  grouping marking-dscp-stats {
-    description
-      "Statistics for set dscp";
-    leaf dscp {
-      type uint32;
-      description
-        "dscp marking";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-dscp-tunnel-stats {
-    description
-      "Statistics for set dscp tunnel";
-    leaf dscp-val {
-      type uint32;
-      description
-        "dscp value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-cos-stats {
-    description
-      "Statistics for set cos";
-    leaf cos-val {
-      type uint32;
-      description
-        "cos value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-cos-inner-stats {
-    description
-      "Statistics for set cos-inner";
-    leaf cos-inner-val {
-      type uint32;
-      description
-        "cos inner value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-discard-class-stats {
-    description
-      "Statistics for set discard-class";
-    leaf disc-class-val {
-      type uint32;
-      description
-        "discard-class value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-qos-grp-stats {
-    description
-      "Statistics for set qos-group";
-    leaf qos-grp-val {
-      type uint32;
-      description
-        "qos group value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-prec-stats {
-    description
-      "Statistics for set precedence";
-    leaf prec-val {
-      type uint32;
-      description
-        "precedence value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-prec-tunnel-stats {
-    description
-      "Statistics for set precedence tunnel";
-    leaf prec-val {
-      type uint32;
-      description
-        "precedence value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-mpls-exp-imp-stats {
-    description
-      "Statistics for set mpls exp imposition";
-    leaf mpls-exp-imp-val {
-      type uint32;
-      description
-        "mpls exp value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-mpls-exp-top-stats {
-    description
-      "Statistics for set mpls exp imposition";
-    leaf mpls-exp-top-val {
-      type uint32;
-      description
-        "mpls exp value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-fr-de-stats {
-    description
-      "Statistics for set fr-de";
-    leaf fr-de {
-      type boolean;
-      description
-        "fr de set or not";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-fr-fecn-becn-stats {
-    description
-      "Statistics for set fr-fecn-becn";
-    leaf fecn-becn-val {
-      type uint32;
-      description
-        "fecn becn value. qos:percent-value-1to100";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-atm-clp-stats {
-    description
-      "Statistics for set atm-clp";
-    leaf atm-clp-val {
-      type uint8;
-      description
-        "atm clp value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-vlan-inner-stats {
-    description
-      "Statistics for set vlan-inner";
-    leaf vlan-inner-val {
-      type uint32;
-      description
-        "vlan value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-dei-stats {
-    description
-      "Statistics for set dei";
-    leaf dei-imp-value {
-      type uint32;
-      description
-        "dei value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-dei-imp-stats {
-    description
-      "Statistics for set dei-imposition";
-    leaf dei-imp-value {
-      type uint32;
-      description
-        "dei value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-srp-priority-stats {
-    description
-      "Statistics for set srp-priority";
-    leaf srp-priority-value {
-      type uint8;
-      description
-        "srp priority value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-wlan-user-priority-stats {
-    description
-      "Statistics for set wlan-user-priority";
-    leaf wlan-user-priority-value {
-      type uint8;
-      description
-        "wlan user priority value";
-    }
-    leaf marked-pkts {
-      type uint64;
-      description
-        "Number of packets been marked";
-    }
-  }
-
-  grouping marking-stats {
-    description
-      "Marking statistics";
-    container marking-dscp-stats-val {
-      description
-        "Statistics for set dscp";
-      uses interfaces-ios-xe-oper:marking-dscp-stats;
-    }
-    container marking-dscp-tunnel-stats-val {
-      description
-        "Statistics for set dscp tunnel";
-      uses interfaces-ios-xe-oper:marking-dscp-tunnel-stats;
-    }
-    container marking-cos-stats-val {
-      description
-        "Statistics for set cos";
-      uses interfaces-ios-xe-oper:marking-cos-stats;
-    }
-    container marking-cos-inner-stats-val {
-      description
-        "Statistics for set cos-inner";
-      uses interfaces-ios-xe-oper:marking-cos-inner-stats;
-    }
-    container marking-discard-class-stats-val {
-      description
-        "Statistics for set discard-class";
-      uses interfaces-ios-xe-oper:marking-discard-class-stats;
-    }
-    container marking-qos-grp-stats-val {
-      description
-        "Statistics for set qos-group";
-      uses interfaces-ios-xe-oper:marking-qos-grp-stats;
-    }
-    container marking-prec-stats-val {
-      description
-        "Statistics for set precedence";
-      uses interfaces-ios-xe-oper:marking-prec-stats;
-    }
-    container marking-prec-tunnel-stats-val {
-      description
-        "Statistics for set precedence tunnel";
-      uses interfaces-ios-xe-oper:marking-prec-tunnel-stats;
-    }
-    container marking-mpls-exp-imp-stats-val {
-      description
-        "Statistics for set mpls exp imposition";
-      uses interfaces-ios-xe-oper:marking-mpls-exp-imp-stats;
-    }
-    container marking-mpls-exp-top-stats-val {
-      description
-        "Statistics for set mpls exp topmost";
-      uses interfaces-ios-xe-oper:marking-mpls-exp-top-stats;
-    }
-    container marking-fr-de-stats-val {
-      description
-        "Statistics for set fr-de";
-      uses interfaces-ios-xe-oper:marking-fr-de-stats;
-    }
-    container marking-fr-fecn-becn-stats-val {
-      description
-        "Statistics for set fr-fecn-becn";
-      uses interfaces-ios-xe-oper:marking-fr-fecn-becn-stats;
-    }
-    container marking-atm-clp-stats-val {
-      description
-        "Statistics for set atm-clp";
-      uses interfaces-ios-xe-oper:marking-atm-clp-stats;
-    }
-    container marking-vlan-inner-stats-val {
-      description
-        "Statistics for set vlan-inner";
-      uses interfaces-ios-xe-oper:marking-vlan-inner-stats;
-    }
-    container marking-dei-stats-val {
-      description
-        "Statistics for set dei";
-      uses interfaces-ios-xe-oper:marking-dei-stats;
-    }
-    container marking-dei-imp-stats-val {
-      description
-        "Statistics for set dei-imposition";
-      uses interfaces-ios-xe-oper:marking-dei-imp-stats;
-    }
-    container marking-srp-priority-stats-val {
-      description
-        "Statistics for set srp-priority";
-      uses interfaces-ios-xe-oper:marking-srp-priority-stats;
-    }
-    container marking-wlan-user-priority-stats-val {
-      description
-        "Statistics for set wlan-user-priority";
-      uses interfaces-ios-xe-oper:marking-wlan-user-priority-stats;
-    }
-  }
-
-  grouping cos-key {
-    description
-      "COS key type";
-    leaf cos-min {
-      type uint32;
-      description
-        "Min COS value";
-    }
-    leaf cos-max {
-      type uint32;
-      description
-        "Max COS value";
-    }
-  }
-
-  grouping disc-class-key {
-    description
-      "Discard class key type";
-    leaf disc-class-min {
-      type uint32;
-      description
-        "Minimum value for discard class in the range";
-    }
-    leaf disc-class-max {
-      type uint32;
-      description
-        "Maximum value for discard class in the range";
-    }
-  }
-
-  grouping dscp-key {
-    description
-      "DSCP key type";
-    leaf dscp-min {
-      type uint32;
-      description
-        "Minimum of dscp range";
-    }
-    leaf dscp-max {
-      type uint32;
-      description
-        "Maximum of dscp range";
-    }
-  }
-
-  grouping qos-grp-key {
-    description
-      "QoS group kwy type";
-    leaf qos-group-min {
-      type uint32;
-      description
-        "Specifies the minimum value range from 0 to used to identify a QoS group value";
-    }
-    leaf qos-group-max {
-      type uint32;
-      description
-        "Specifies the maximum value range from 0 to used to identify a QoS group value";
-    }
-  }
-
-  grouping mpls-exp-key {
-    description
-      "MPLS EXP key type";
-    leaf exp-min {
-      type uint32;
-      description
-        "The minimum EXP field value to be used as match criteria. Any number from 0 to 7";
-    }
-    leaf exp-max {
-      type uint32;
-      description
-        "The maximum EXP field value to be used as match criteria. Any number from 0 to 7";
-    }
-  }
-
-  grouping prec-key {
-    description
-      "Precedence key type";
-    leaf prec-min {
-      type uint32;
-      description
-        "Precedence min";
-    }
-    leaf prec-max {
-      type uint32;
-      description
-        "Precedence max";
-    }
-  }
-
-  grouping dei-key {
-    description
-      "DEI key type";
-    leaf dei-min {
-      type uint32;
-      description
-        "Dei min";
-    }
-    leaf dei-max {
-      type uint32;
-      description
-        "Dei max";
-    }
-  }
-
-  grouping clp-key {
-    description
-      "CLP key type";
-    leaf clp-val {
-      type uint32;
-      description
-        "Composed by multiple atm clp values";
-    }
-  }
-
-  grouping subclass-list {
-    description
-      "Subclass data";
-    leaf match-type {
-      type interfaces-ios-xe-oper:qos-match-type;
-      description
-        "Subclass match type";
-    }
-    list cos-counters {
-      key "cos-min cos-max";
-      description
-        "Counters for sub-class matching a range of
-         Class-of-Service (COS) value (and, optionally, additional COS range";
-      uses interfaces-ios-xe-oper:cos-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container cos-default {
-      description
-        "statistics for cos default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list dscp-counters {
-      key "dscp-min dscp-max";
-      description
-        "List for statistics based on dscp value range";
-      uses interfaces-ios-xe-oper:dscp-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container dscp-default {
-      description
-        "Statistics for dscp default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list discard-class-counters {
-      key "disc-class-min disc-class-max";
-      description
-        "Composed multiple discard class ranges";
-      uses interfaces-ios-xe-oper:disc-class-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container disc-class-default {
-      description
-        "Statistics for discard class default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list precedence-counters {
-      key "prec-min prec-max";
-      description
-        "List for statistics based on precedence value range";
-      uses interfaces-ios-xe-oper:prec-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container prec-default {
-      description
-        "Precedence default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list mpls-exp-counters {
-      key "exp-min exp-max";
-      description
-        "List for statistics based on mpls exp value range";
-      uses interfaces-ios-xe-oper:mpls-exp-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container mpls-exp-default {
-      description
-        "Statistics for mpls-exp default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list dei-counters {
-      key "dei-min dei-max";
-      description
-        "Composed by multiple dei ranges";
-      uses interfaces-ios-xe-oper:dei-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container dei-counts-default {
-      description
-        "Statistics for dei default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    list clp-counters {
-      key "clp-val";
-      description
-        "Statistics for each value range for a specifc subclass type";
-      uses interfaces-ios-xe-oper:clp-key;
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-    container clp-default {
-      description
-        "Statistic for atm clp default";
-      uses interfaces-ios-xe-oper:wred-class-counts;
-    }
-  }
-
-  grouping classifier-entry-statistics {
-    description
-      "Classifier entry statistics";
-    leaf classified-pkts {
-      type uint64;
-      description
-        "Number of total packets which filtered to the classifier-entry";
-    }
-    leaf classified-bytes {
-      type uint64;
-      description
-        "Number of total bytes which filtered to the classifier-entry";
-    }
-    leaf classified-rate {
-      type uint64;
-      description
-        "Rate of average data flow through the classifier-entry";
-    }
-  }
-
-  grouping diffserv-target-classifier-statistics-key {
-    description
-      "Diffserv classifier statistics key";
-    leaf classifier-entry-name {
-      type string;
-      description
-        "Classifier Entry Name";
-    }
-    leaf parent-path {
-      type string;
-      description
-        "Path of the Classifier Entry in a hierarchial policy";
-    }
-  }
-
-  grouping wred-stats {
-    description
-      "WRED counters";
-    leaf early-drop-pkts {
-      type uint64;
-      description
-        "Early drop packets";
-    }
-    leaf early-drop-bytes {
-      type uint64;
-      description
-        "Early drop bytes";
-    }
-    leaf mean-queue-depth {
-      type uint16;
-      description
-        "Current mean queue depth";
-    }
-    leaf transmitted-pkts {
-      type uint64;
-      description
-        "Transmitted packtes";
-    }
-    leaf transmitted-bytes {
-      type uint64;
-      description
-        "Transmitted bytes";
-    }
-    leaf tail-drop-pkts {
-      type uint64;
-      description
-        "Total number of packets dropped";
-    }
-    leaf tail-drop-bytes {
-      type uint64;
-      description
-        "Total number of bytes dropped";
-    }
-    leaf drop-pkts-flow {
-      type uint64;
-      description
-        "Total number of packets dropped";
-    }
-    leaf drop-pkts-no-buffer {
-      type uint64;
-      description
-        "Number of packets dropped due to buffers being
-         unavailable system-wide or at the associated interface.
-         This is a sub-set of drop-pkts";
-    }
-    leaf queue-peak-size-pkts {
-      type uint64;
-      description
-        "Queue max que depth Packets";
-    }
-    leaf queue-peak-size-bytes {
-      type uint64;
-      description
-        "Queue max que depth Bytes";
-    }
-    leaf bandwidth-exceed-drops {
-      type uint64;
-      description
-        "Priority stats. Bandwidth exceed drops";
-    }
-  }
-
-  grouping cac-stats {
-    description
-      "CAC statistics";
-    leaf num-admitted-flows {
-      type uint32;
-      description
-        "Number of admitted flows";
-    }
-    leaf num-non-admitted-flows {
-      type uint32;
-      description
-        "Number of non-admitted flows";
-    }
-  }
-
-  grouping queuing-statistics {
-    description
-      "Queue related statistics";
-    leaf output-pkts {
-      type uint64;
-      description
-        "Number of packets transmitted from queue";
-    }
-    leaf output-bytes {
-      type uint64;
-      description
-        "Number of bytes transmitted from queue";
-    }
-    leaf queue-size-pkts {
-      type uint64;
-      description
-        "Number of packets currently buffered ";
-    }
-    leaf queue-size-bytes {
-      type uint64;
-      description
-        "Number of bytes currently buffered";
-    }
-    leaf drop-pkts {
-      type uint64;
-      description
-        "Total number of packets dropped";
-    }
-    leaf drop-bytes {
-      type uint64;
-      description
-        "Total number of bytes dropped";
-    }
-    container wred-stats {
-      description
-        "WRED Counters";
-      uses interfaces-ios-xe-oper:wred-stats;
-    }
-    container cac-stats {
-      description
-        "CAC statistics";
-      uses interfaces-ios-xe-oper:cac-stats;
-    }
-  }
-
-  grouping meter-statistics {
-    description
-      "Metering Counters";
-    leaf meter-id {
-      type uint16;
-      description
-        "Meter Identifier";
-    }
-    leaf meter-succeed-pkts {
-      type uint64;
-      description
-        "Number of packets which succeed the meter";
-    }
-    leaf meter-succeed-bytes {
-      type uint64;
-      description
-        "Bytes of packets which succeed the meter";
-    }
-    leaf meter-failed-pkts {
-      type uint64;
-      description
-        "Number of packets which failed the meter";
-    }
-    leaf meter-failed-bytes {
-      type uint64;
-      description
-        "Bytes of packets which failed the meter";
-    }
-  }
-
-  grouping diffserv-target-classifier-statistics {
-    description
-      "Diffserv classifier statistics";
-    container classifier-entry-stats {
-      description
-        "Classifier Counters";
-      uses interfaces-ios-xe-oper:classifier-entry-statistics;
-    }
-    list meter-stats {
-      key "meter-id";
-      description
-        "Meter statistics";
-      uses interfaces-ios-xe-oper:meter-statistics;
-    }
-    container queuing-stats {
-      description
-        "Queuing Counters";
-      uses interfaces-ios-xe-oper:queuing-statistics;
-    }
-    list subclass-list {
-      key "match-type";
-      description
-        "List of statistics for random-detect
-         based on subclass type and value pair
-         Technically these are a field in the queuing
-         statistics -> wred statisitcs, but GREEN EI
-         does not allow that nesting structure";
-      uses interfaces-ios-xe-oper:subclass-list;
-    }
-    container marking-stats {
-      description
-        "Statistics for marking actions";
-      uses interfaces-ios-xe-oper:marking-stats;
-    }
-  }
-
-  grouping diffserv-target-entry-key {
-    description
-      "Key to the diffserv";
-    leaf direction {
-      type interfaces-ios-xe-oper:qos-direction;
-      description
-        "Direction fo the traffic flow either inbound or outbound";
-    }
-    leaf policy-name {
-      type string;
-      description
-        "Policy entry name";
-    }
-  }
-
-  grouping agg-priority-stats {
-    description
-      "Type for counters in aggregate priority";
-    leaf output-pkts {
-      type uint64;
-      description
-        "Number of packets transmitted from queue";
-    }
-    leaf output-bytes {
-      type uint64;
-      description
-        "Number of bytes transmitted from queue";
-    }
-    leaf queue-size-pkts {
-      type uint64;
-      description
-        "Number of packets currently buffered";
-    }
-    leaf queue-size-bytes {
-      type uint64;
-      description
-        "Number of bytes currently buffered";
-    }
-    leaf drop-pkts {
-      type uint64;
-      description
-        "Total number of packets dropped";
-    }
-    leaf drop-bytes {
-      type uint64;
-      description
-        "Total number of bytes dropped";
-    }
-    leaf drop-pkts-flow {
-      type uint64;
-      description
-        "Number of packets that were dropped by
-         flow-based fair-queuing (fair-queue).
-         This is a sub-set of drop-pkts";
-    }
-    leaf drop-pkts-no-buffer {
-      type uint64;
-      description
-        "Number of packets dropped due to buffers being
-         unavailable system-wide or at the associated interface.
-         This is a sub-set of drop-pkts";
-    }
-  }
-
-  grouping threshold {
-    description
-      "Threshold Paramters";
-    leaf bytes {
-      type uint64;
-      description
-        "Threshold bytes";
-    }
-    leaf thresh-size-metric {
-      type uint32;
-      description
-        "Threshold size unit";
-    }
-    leaf unit-val {
-      type interfaces-ios-xe-oper:thresh-unit;
-      description
-        "Threshold size basic units";
-    }
-    leaf threshold-interval {
-      type uint64;
-      description
-        "Threshold interval";
-    }
-    leaf thresh-interval-metric {
-      type uint32;
-      description
-        "Threshold units metric";
-    }
-    leaf interval-unit-val {
-      type interfaces-ios-xe-oper:thresh-unit;
-      description
-        "Threshold intveral basic units";
-    }
-  }
-
-  grouping priority-oper-list {
-    description
-      "Priority based statistics";
-    leaf priority-level {
-      type uint16;
-      description
-        "Priority Level, 0 means no priority level set";
-    }
-    container agg-priority-stats {
-      description
-        "Counters in aggregate priority";
-      uses interfaces-ios-xe-oper:agg-priority-stats;
-    }
-    container qlimit-default-thresh {
-      description
-        "qlimit default threshold";
-      uses interfaces-ios-xe-oper:threshold;
-    }
-    list qlimit-cos-thresh-list {
-      key "cos-min cos-max";
-      description
-        "cos-based queue limit data";
-      uses interfaces-ios-xe-oper:cos-key;
-      uses interfaces-ios-xe-oper:threshold;
-    }
-    list qlimit-disc-class-thresh-list {
-      key "disc-class-min disc-class-max";
-      description
-        "discard-class-based queue limit data";
-      uses interfaces-ios-xe-oper:disc-class-key;
-      uses interfaces-ios-xe-oper:threshold;
-    }
-    list qlimit-qos-grp-thresh-list {
-      key "qos-group-min qos-group-max";
-      description
-        "qos-group-based queue limit data";
-      uses interfaces-ios-xe-oper:qos-grp-key;
-      uses interfaces-ios-xe-oper:threshold;
-    }
-    list qlimit-mpls-exp-thresh-list {
-      key "exp-min exp-max";
-      description
-        "mpls-exp-based queue limit data";
-      uses interfaces-ios-xe-oper:mpls-exp-key;
-      uses interfaces-ios-xe-oper:threshold;
-    }
-    list qlimit-dscp-thresh-list {
-      key "dscp-min dscp-max";
-      description
-        "queue limit per dscp range";
-      uses interfaces-ios-xe-oper:dscp-key;
-      uses interfaces-ios-xe-oper:threshold;
-    }
-  }
-
-  grouping diffserv-target-entry {
-    description
-      "Diffserv target data";
-    list diffserv-target-classifier-stats {
-      key "classifier-entry-name parent-path";
-      description
-        "Statistics for each Classifier Entry in a Policy";
-      uses interfaces-ios-xe-oper:diffserv-target-classifier-statistics-key;
-      uses interfaces-ios-xe-oper:diffserv-target-classifier-statistics;
-    }
-    list priority-oper-list {
-      key "priority-level";
-      description
-        "Statistics for aggregrate priority per policy instance";
-      uses interfaces-ios-xe-oper:priority-oper-list;
-    }
-  }
-
-  grouping lag-aggregate-state {
-    description
-      "Operational state variables for logical
-       aggregate / LAG interfaces";
-    leaf aggregate-id {
-      type string;
-      description
-        "Specify the logical aggregate interface to which
-         this id belongs";
-    }
-    leaf lag-type {
-      type interfaces-ios-xe-oper:aggregation-type;
-      description
-        "Type to define the lag-type, i.e., how the LAG is
-         defined and managed";
-    }
-    leaf min-links {
-      type uint16;
-      description
-        "Specifies the minimum number of member
-         interfaces that must be active for the aggregate interface
-         to be available";
-    }
-    leaf lag-speed {
-      type uint32;
-      description
-        "Reports effective speed of the aggregate interface,
-         based on speed of active member interfaces";
-    }
-    leaf-list members {
-      type string;
-      ordered-by user;
-      description
-        "List of current member interfaces for the aggregate,
-         expressed as references to existing interfaces";
-    }
-  }
-
-  grouping protocol-statistics {
-    description
-      "Protocol specific statistics";
-    leaf in-pkts {
-      type uint64;
-      description
-        "The total number of packets received for the specified
-         address family, including those received in error";
-    }
-    leaf in-octets {
-      type uint64;
-      description
-        "The total number of octets received in input packets
-         for the specified address family, including those received
-         in error.";
-    }
-    leaf in-error-pkts {
-      type uint64;
-      description
-        "Number of packets discarded due to errors for the
-         specified address family, including errors in the
-         header, no route found to the destination, invalid
-         address, unknown protocol, etc.";
-    }
-    leaf in-forwarded-pkts {
-      type uint64;
-      description
-        "The number of input packets for which the device was not
-         their final destination and for which the device
-         attempted to find a route to forward them to that final
-         destination.";
-    }
-    leaf in-forwarded-octets {
-      type uint64;
-      description
-        "The number of octets received in input packets
-         for the specified address family for which the device was
-         not their final lodestination and for which the
-         device attempted to find a route to forward them to that
-         final destination.";
-    }
-    leaf in-discarded-pkts {
-      type uint64;
-      description
-        "The number of input IP packets for the
-         specified address family, for which no problems were
-         encountered to prevent their continued processing, but
-         were discarded (e.g., for lack of buffer space).";
-    }
-    leaf out-pkts {
-      type uint64;
-      description
-        "The total number of IP packets for the
-         specified address family that the device supplied
-         to the lower layers for transmission.  This includes
-         packets generated locally and those forwarded by the
-         device.";
-    }
-    leaf out-octets {
-      type uint64;
-      description
-        "The total number of octets in IP packets for the
-         specified address family that the device
-         supplied to the lower layers for transmission.  This
-         includes packets generated locally and those forwarded by
-         the device.";
-    }
-    leaf out-error-pkts {
-      type uint64;
-      description
-        "Number of IP packets for the specified address family
-         locally generated and discarded due to errors, including
-         no route found to the IP destination.";
-    }
-    leaf out-forwarded-pkts {
-      type uint64;
-      description
-        "The number of packets for which this entity was not their
-         final IP destination and for which it was successful in
-         finding a path to their final destination.text";
-    }
-    leaf out-forwarded-octets {
-      type uint64;
-      description
-        "The number of octets in packets for which this entity was
-         not their final IP destination and for which it was
-         successful in finding a path to their final destination.";
-    }
-    leaf out-discarded-pkts {
-      type uint64;
-      description
-        "The number of output IP packets for the
-         specified address family for which no problem was
-         encountered to prevent their transmission to their
-         destination, but were discarded (e.g., for lack of
-         buffer space).";
-    }
-  }
-
-  grouping intf-statistics {
-    description
-      "Interface statistics";
-    leaf discontinuity-time {
-      type yang:date-and-time;
-      description
-        "The time on the most recent occasion at which any one or
-         more of this interface's counters suffered a
-         discontinuity.  If no such discontinuities have occurred
-         since the last re-initialization of the local management
-         subsystem, then this node contains the time the local
-         management subsystem re-initialized itself";
-    }
-    leaf in-octets {
-      type uint64;
-      description
-        "The total number of octets received on the interface,
-         including framing characters.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of discontinuity-time";
-    }
-    leaf in-unicast-pkts {
-      type uint64;
-      description
-        "The number of packets, delivered by this sub-layer to a
-         higher (sub-)layer, that were not addressed to a
-         multicast or broadcast address at this sub-layer.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'.";
-    }
-    leaf in-broadcast-pkts {
-      type uint64;
-      description
-        "The number of packets, delivered by this sub-layer to a
-         higher (sub-)layer, that were addressed to a broadcast
-         address at this sub-layer.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf in-multicast-pkts {
-      type uint64;
-      description
-        "The number of packets, delivered by this sub-layer to a
-         higher (sub-)layer, that were addressed to a multicast
-         address at this sub-layer.  For a MAC-layer protocol,
-         this includes both Group and Functional addresses.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf in-discards {
-      type uint32;
-      description
-        "The number of inbound packets that were chosen to be
-         discarded even though no errors had been detected to
-         prevent their being deliverable to a higher-layer
-         protocol.  One possible reason for discarding such a
-         packet could be to free up buffer space.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf in-errors {
-      type uint32;
-      description
-        "For packet-oriented interfaces, the number of inbound
-         packets that contained errors preventing them from being
-         deliverable to a higher-layer protocol.  For character-
-         oriented or fixed-length interfaces, the number of
-         inbound transmission units that contained errors
-         preventing them from being deliverable to a higher-layer protocol.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf in-unknown-protos {
-      type uint32;
-      description
-        "For packet-oriented interfaces, the number of packets
-         received via the interface that were discarded because
-         of an unknown or unsupported protocol.  For
-         character-oriented or fixed-length interfaces that
-         support protocol multiplexing, the number of transmission
-         units received via the interface that were discarded because
-         of an unknown or unsupported protocol.
-         For any interface that does not support protocol
-         multiplexing, this counter is not present.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of 'discontinuity-time'";
-    }
-    leaf out-octets {
-      type uint32;
-      description
-        "The total number of octets transmitted out of the
-         interface, including framing characters.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf out-unicast-pkts {
-      type uint64;
-      description
-        "The total number of packets that higher-level protocols
-         requested be transmitted, and that were not addressed
-         to a multicast or broadcast address at this sub-layer,
-         including those that were discarded or not sent.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of 'discontinuity-time'";
-    }
-    leaf out-broadcast-pkts {
-      type uint64;
-      description
-        "The total number of packets that higher-level protocols
-         requested be transmitted, and that were addressed to a
-         broadcast address at this sub-layer, including those
-         that were discarded or not sent.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf out-multicast-pkts {
-      type uint64;
-      description
-        "The total number of packets that higher-level protocols
-         requested be transmitted, and that were addressed to a
-         multicast address at this sub-layer, including those
-         that were discarded or not sent.  For a MAC-layer
-         protocol, this includes both Group and Functional addresses.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf out-discards {
-      type uint64;
-      description
-        "The number of outbound packets that were chosen to be
-         discarded even though no errors had been detected to
-         prevent their being transmitted.  One possible reason
-         for discarding such a packet could be to free up buffer space.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf out-errors {
-      type uint64;
-      description
-        "For packet-oriented interfaces, the number of outbound
-         packets that could not be transmitted because of errors.
-         For character-oriented or fixed-length interfaces, the
-         number of outbound transmission units that could not be
-         transmitted because of errors.
-         Discontinuities in the value of this counter can occur
-         at re-initialization of the management system, and at
-         other times as indicated by the value of
-         'discontinuity-time'";
-    }
-    leaf rx-pps {
-      type uint64;
-      description
-        "The receive packet per second rate on this interface";
-    }
-    leaf rx-kbps {
-      type uint64;
-      description
-        "The receive kilobits per second rate on this interface";
-    }
-    leaf tx-pps {
-      type uint64;
-      description
-        "The transmit packet per second rate on this interface";
-    }
-    leaf tx-kbps {
-      type uint64;
-      description
-        "The transmit kilobits per second rate on this interface";
-    }
-    leaf num-flaps {
-      type uint64;
-      description
-        "The number of times the interface state
-         transitioned between up and down";
-    }
-    leaf in-crc-errors {
-      type uint64;
-      description
-        "Number of receive error events due to FCS/CRC check
-         failure";
-    }
-  }
-
-  grouping ethernet-state {
-    description
-      "Ethernet State";
-    leaf negotiated-duplex-mode {
-      type interfaces-ios-xe-oper:ether-duplex;
-      description
-        "When auto-negotiate is set to TRUE, and the 
-         interface has completed auto-negotiation with the 
-         remote peer, this value shows the duplex mode that 
-         has been negotiated.";
-    }
-    leaf negotiated-port-speed {
-      type interfaces-ios-xe-oper:ether-speed;
-      description
-        "When auto-negotiate is set to TRUE, and 
-         the interface has completed auto-negotiation with 
-         the remote peer, this value shows the interface 
-         speed that has been negotiated.";
-    }
-    leaf auto-negotiate {
-      type boolean;
-      description
-        "Set to TRUE to request the interface to 
-         auto-negotiate transmission parameters with its 
-         peer interface. When set to FALSE, the transmission
-         parameters are specified manually.";
-    }
-    leaf enable-flow-control {
-      type boolean;
-      description
-        "Enable or disable flow control for this 
-         interface. Ethernet flow control is a mechanism by 
-         which a receiver may send PAUSE frames to a sender
-         to stop transmission for a specified time.
-         
-         This setting should override auto-negotiated flow 
-         control settings. If left unspecified, and 
-         auto-negotiate is TRUE, flow control mode is 
-         negotiated with the peer interface.";
-    }
-  }
-
-  grouping ethernet-statistics {
-    description
-      "Ethernet statistics";
-    leaf in-mac-control-frames {
-      type uint64;
-      description
-        "MAC layer control frames received on the interface";
-    }
-    leaf in-mac-pause-frames {
-      type uint64;
-      description
-        "MAC layer PAUSE frames received on the interface";
-    }
-    leaf in-oversize-frames {
-      type uint64;
-      description
-        "Number of oversize frames received on the interface";
-    }
-    leaf in-jabber-frames {
-      type uint64;
-      description
-        "Number of jabber frames received on the
-         interface.  Jabber frames are typically defined as oversize
-         frames which also have a bad CRC.  Implementations may use
-         slightly different definitions of what constitutes a jabber
-         frame.  Often indicative of a NIC hardware problem.";
-    }
-    leaf in-fragment-frames {
-      type uint64;
-      description
-        "Number of fragment frames received on the interface.";
-    }
-    leaf in-8021q-frames {
-      type uint64;
-      description
-        "Number of 802.1q tagged frames received on the interface";
-    }
-    leaf out-mac-control-frames {
-      type uint64;
-      description
-        "MAC layer control frames sent on the interface";
-    }
-    leaf out-mac-pause-frames {
-      type uint64;
-      description
-        "MAC layer PAUSE frames sent on the interface";
-    }
-    leaf out-8021q-frames {
-      type uint64;
-      description
-        "Number of 802.1q tagged frames sent on the interface";
-    }
-  }
-
-  grouping t1e1-serial-state {
-    description
-      "The T1/E1 serial state";
-    leaf crc-type {
-      type interfaces-ios-xe-oper:serial-crc;
-      description
-        "Cyclic Redundancy Code type configured on the interface";
-    }
-    leaf loopback {
-      type interfaces-ios-xe-oper:t1e1-loopback-mode;
-      description
-        "Loopback mode the interface is operating in";
-    }
-    leaf keeplive {
-      type uint32;
-      description
-        "Keeplive interval in seconds";
-    }
-    leaf timeslot {
-      type uint32;
-      description
-        "Time slots bitmap occupied by this serial interface";
-    }
-    leaf subrate {
-      type interfaces-ios-xe-oper:subrate-speed;
-      description
-        "Subrate operating per slot";
-    }
-  }
-
-  grouping t1e1-serial-stats {
-    description
-      "The serial specific statistics";
-    leaf in-abort-clock-error {
-      type uint32;
-      description
-        "Number of receive abort packets due to clock slides";
-    }
-  }
-
-  grouping interface-state {
-    description
-      "Interface state details";
-    leaf name {
-      type string;
-      description
-        "The name of the interface.
-         A server implementation MAY map this leaf to the ifName
-         MIB object.  Such an implementation needs to use some
-         mechanism to handle the differences in size and characters
-         allowed between this leaf and ifName.  The definition of
-         such a mechanism is outside the scope of this document";
-    }
-    leaf interface-type {
-      type interfaces-ios-xe-oper:ietf-intf-type;
-      description
-        "When an interface entry is created, a server MAY
-         initialize the type leaf with a valid value, e.g., if it
-         is possible to derive the type from the name of the interface.
-         If a client tries to set the type of an interface to a
-         value that can never be used by the system, e.g., if the
-         type is not supported or if the type does not match the
-         name of the interface, the server MUST reject the request.
-         A NETCONF server MUST reply with an rpc-error with the
-         error-tag 'invalid-value' in this case";
-    }
-    leaf admin-status {
-      type interfaces-ios-xe-oper:intf-state;
-      description
-        "The desired state of the interface.
-         This leaf has the same read semantics as ifAdminStatus";
-    }
-    leaf oper-status {
-      type interfaces-ios-xe-oper:oper-state;
-      description
-        "The current operational state of the interface.
-         This leaf has the same semantics as ifOperStatus";
-    }
-    leaf last-change {
-      type yang:date-and-time;
-      description
-        "The time the interface entered its current operational
-         state. If the current state was entered prior to the
-         last re-initialization of the local network management
-         subsystem, then this node is not present";
-    }
-    leaf if-index {
-      type int32;
-      description
-        "The ifIndex value for the ifEntry represented by this interface";
-    }
-    leaf phys-address {
-      type yang:mac-address;
-      description
-        "The interface's address at its protocol sub-layer.  For
-         example, for an 802.x interface, this object normally
-         contains a Media Access Control (MAC) address.  The
-         interface's media-specific modules must define the bit
-         and byte ordering and the format of the value of this
-         object.  For interfaces that do not have such an address
-         (e.g., a serial line), this node is not present";
-    }
-    leaf-list higher-layer-if {
-      type string;
-      ordered-by user;
-      description
-        "A list of references to interfaces layered on top of this interface";
-    }
-    leaf-list lower-layer-if {
-      type string;
-      ordered-by user;
-      description
-        "A list of references to interfaces layered underneath this interface";
-    }
-    leaf speed {
-      type uint64;
-      description
-        "An estimate of the interface's current bandwidth in bits
-         per second.  For interfaces that do not vary in
-         bandwidth or for those where no accurate estimation can
-         be made, this node should contain the nominal bandwidth.
-         For interfaces that have no concept of bandwidth, this
-         node is not present";
-    }
-    container statistics {
-      description
-        "A collection of interface-related statistics objects";
-      uses interfaces-ios-xe-oper:intf-statistics;
-    }
-    list diffserv-info {
-      key "direction policy-name";
-      description
-        "diffserv related details";
-      uses interfaces-ios-xe-oper:diffserv-target-entry-key;
-      uses interfaces-ios-xe-oper:diffserv-target-entry;
-    }
-    leaf vrf {
-      type string;
-      description
-        "VRF to which this interface belongs to. If the 
-         interface is not in a VRF then it is 'Global'";
-    }
-    leaf ipv4 {
-      type inet:ip-address;
-      description
-        "IPv4 address configured on interface";
-    }
-    leaf ipv4-subnet-mask {
-      type inet:ip-address;
-      description
-        "IPv4 Subnet Mask";
-    }
-    leaf description {
-      type string;
-      description
-        "Interface description";
-    }
-    leaf mtu {
-      type uint32;
-      description
-        "Maximum transmission unit";
-    }
-    leaf input-security-acl {
-      type string;
-      description
-        "Input Security ACL";
-    }
-    leaf output-security-acl {
-      type string;
-      description
-        "Output Security ACL";
-    }
-    container v4-protocol-stats {
-      description
-        "IPv4 traffic statistics for this interface";
-      uses interfaces-ios-xe-oper:protocol-statistics;
-    }
-    container v6-protocol-stats {
-      description
-        "IPv6 traffic statistics for this interface";
-      uses interfaces-ios-xe-oper:protocol-statistics;
-    }
-    leaf bia-address {
-      type yang:mac-address;
-      description
-        "The burnt-in mac address that was associated with this
-         interface from manufacturing. This is only relevant for
-         interfaces that have the concept of burnt in ethernet 
-         addresses, otherwise it is zero.";
-    }
-    leaf-list ipv6-addrs {
-      type inet:ip-address;
-      ordered-by user;
-      description
-        "A list of the IPv6 addresses associated with the interface.
-         This conatins all the IPv6 addresses, including the link local
-         addresses, assigned to the interface";
-    }
-    list lag-aggregate-state {
-      key "aggregate-id";
-      description
-        "Operational state variables for logical
-         aggregate / LAG interfaces";
-      uses interfaces-ios-xe-oper:lag-aggregate-state;
-    }
-    leaf ipv4-tcp-adjust-mss {
-      type uint16;
-      description
-        "When ip tcp adjust-mss is configured, this vlaue shows
-         the tcp mss, or the value is zero.";
-    }
-    leaf ipv6-tcp-adjust-mss {
-      type uint16;
-      description
-        "When ipv6 tcp adjust-mss is configured, this value shows
-         the tcp mss, or the value is zero.";
-    }
-    choice interface-class-choice {
-      description
-        "The broad class that the interface belongs";
-      case interface-class-ethernet {
-        container ether-state {
-          description
-            "The Ethernet state information";
-          uses interfaces-ios-xe-oper:ethernet-state;
-        }
-        container ether-stats {
-          description
-            "The Ethernet statistics";
-          uses interfaces-ios-xe-oper:ethernet-statistics;
-        }
-      }
-      case interface-class-t1e1serial {
-        container serial-state {
-          description
-            "The T1E1 serial state information";
-          uses interfaces-ios-xe-oper:t1e1-serial-state;
-        }
-        container serial-stats {
-          description
-            "The T1E1 statistics";
-          uses interfaces-ios-xe-oper:t1e1-serial-stats;
-        }
-      }
-      case interface-class-unspecified {
-        leaf intf-class-unspecified {
-          type boolean;
-          description
-            "No specific interface class information";
-        }
-      }
-    }
-  }
-
-  container interfaces {
-    config false;
-    description
-      "Operational state of interfaces";
-    list interface {
-      key "name";
-      description
-        "List of interfaces";
-      uses interfaces-ios-xe-oper:interface-state;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ios-common-oper.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ios-common-oper.yang
deleted file mode 100644
index ebcc1f07a..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ios-common-oper.yang
+++ /dev/null
@@ -1,1729 +0,0 @@
-module Cisco-IOS-XE-ios-common-oper {
-  yang-version 1;
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-ios-common-oper";
-  prefix ios-common-ios-xe-oper;
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for some common IOS structures
-     Copyright (c) 2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2018-01-04 {
-    description
-      "Initial revision";
-    reference "1.0.0";
-  }
-
-  typedef ios-snpa-type {
-    type enumeration {
-      enum "ios-snpa-type-illegal" {
-        value 0;
-        description
-          "illegal address";
-      }
-      enum "ios-snpa-type-ieee48" {
-        value 1;
-        description
-          "48bit IEEE 802.X address";
-      }
-      enum "ios-snpa-type-ieee16" {
-        value 2;
-        description
-          "16bit IEEE 802.X address";
-      }
-      enum "ios-snpa-type-xerox" {
-        value 3;
-        description
-          "Xerox 3MB experimental ether";
-      }
-      enum "ios-snpa-type-x121" {
-        value 4;
-        description
-          "CCITT X.121 address";
-      }
-      enum "ios-snpa-type-cisco-hdlc" {
-        value 5;
-        description
-          "cisco HDLC framing";
-      }
-      enum "ios-snpa-type-cisco-mlapb" {
-        value 6;
-        description
-          "cisco multi-LAPB framing";
-      }
-      enum "ios-snpa-type-lapb" {
-        value 7;
-        description
-          "ISO/CCITT LAPB framing";
-      }
-      enum "ios-snpa-type-smds48" {
-        value 8;
-        description
-          "SMDS w/ 48 bit addresses";
-      }
-      enum "ios-snpa-type-cisco-msdlc" {
-        value 9;
-        description
-          "cisco multi-SDLC framing";
-      }
-      enum "ios-snpa-type-fr10" {
-        value 10;
-        description
-          "Frame Relay with 10-bit DLCI";
-      }
-      enum "ios-snpa-type-ultra" {
-        value 11;
-        description
-          "CCCI defined Ultranet";
-      }
-      enum "ios-snpa-type-cisco-tunnel" {
-        value 12;
-        description
-          "cisco tunnel and EON encoding";
-      }
-      enum "ios-snpa-type-cisco-ctunnel" {
-        value 13;
-        description
-          "CLNP tunnel";
-      }
-      enum "ios-snpa-type-rrr-tunnel" {
-        value 14;
-        description
-          "rrr tunnel";
-      }
-      enum "ios-snpa-type-ppp" {
-        value 15;
-        description
-          "PPP framing";
-      }
-      enum "ios-snpa-type-smds64" {
-        value 16;
-        description
-          "SMDS 64-bit addressing";
-      }
-      enum "ios-snpa-type-atmvc" {
-        value 17;
-        description
-          "AIP VC no.";
-      }
-      enum "ios-snpa-type-atm-bundle" {
-        value 18;
-        description
-          "ATM PVC bundle";
-      }
-      enum "ios-snpa-type-atm-svc-bundle" {
-        value 19;
-        description
-          "ATM SVC bundle";
-      }
-      enum "ios-snpa-type-atmnsap" {
-        value 20;
-        description
-          "ATM NSAP address";
-      }
-      enum "ios-snpa-type-atm-e164" {
-        value 21;
-        description
-          "ATM E164 address";
-      }
-      enum "ios-snpa-type-atm-userspecified" {
-        value 22;
-        description
-          "ATM User Specified address";
-      }
-      enum "ios-snpa-type-sdlc" {
-        value 23;
-        description
-          "SDLC address";
-      }
-      enum "ios-snpa-type-x25pvc" {
-        value 24;
-        description
-          "X.25 Lci fpr PVC's";
-      }
-      enum "ios-snpa-type-lapd" {
-        value 25;
-        description
-          "LAPD framing";
-      }
-      enum "ios-snpa-type-masked-atmnsap" {
-        value 26;
-        description
-          "masked ATM NSAP address";
-      }
-      enum "ios-snpa-type-atmesi" {
-        value 27;
-        description
-          "ATM ESI address";
-      }
-      enum "ios-snpa-type-slip" {
-        value 28;
-        description
-          "SLIP Framing";
-      }
-      enum "ios-snpa-type-routedesc" {
-        value 29;
-        description
-          "route descriptor for TR LANE";
-      }
-      enum "ios-snpa-type-srp-outer" {
-        value 30;
-        description
-          "48bit SRP address on outer ring";
-      }
-      enum "ios-snpa-type-srp-inner" {
-        value 31;
-        description
-          "48bit SRP address on inner ring";
-      }
-    }
-    description
-      "SNPA Type";
-  }
-
-  typedef ios-encaps-type {
-    type enumeration {
-      enum "ios-encaps-type-null" {
-        value 0;
-        description
-          "undefined -- error";
-      }
-      enum "ios-encaps-type-arpa" {
-        value 1;
-        description
-          "Ethernet - DDN style";
-      }
-      enum "ios-encaps-type-sap" {
-        value 2;
-        description
-          "Ethernet";
-      }
-      enum "ios-encaps-type-snap" {
-        value 3;
-        description
-          "802.2 SNAP types";
-      }
-      enum "ios-encaps-type-1822" {
-        value 4;
-        description
-          "DDN - 1822 (obsolete)";
-      }
-      enum "ios-encaps-type-hdlc" {
-        value 5;
-        description
-          "Serial - raw HDLC";
-      }
-      enum "ios-encaps-type-unused2" {
-        value 6;
-        description
-          "Unused Placeholder (3MB)";
-      }
-      enum "ios-encaps-type-unused1" {
-        value 7;
-        description
-          "Unused Placeholder (HDH)";
-      }
-      enum "ios-encaps-type-lapb" {
-        value 8;
-        description
-          "Serial - LAPB";
-      }
-      enum "ios-encaps-type-x25" {
-        value 9;
-        description
-          "Serial - X.25";
-      }
-      enum "ios-encaps-type-hub" {
-        value 10;
-        description
-          "HUB fiber optic";
-      }
-      enum "ios-encaps-type-novell-ether" {
-        value 11;
-        description
-          "Novell style XNS on Ethernet";
-      }
-      enum "ios-encaps-type-unsupported" {
-        value 12;
-        description
-          "Unsupported protocols";
-      }
-      enum "ios-encaps-type-3com-tr" {
-        value 13;
-        description
-          "3Com XNS over TR 802.2 0x80";
-      }
-      enum "ios-encaps-type-ub-tr" {
-        value 14;
-        description
-          "Ungermann-Bass XNS over TR SNAP";
-      }
-      enum "ios-encaps-type-apollo" {
-        value 15;
-        description
-          "Apollo domain packets";
-      }
-      enum "ios-encaps-type-ppp" {
-        value 16;
-        description
-          "Serial PPP";
-      }
-      enum "ios-encaps-type-unused4" {
-        value 17;
-        description
-          "Unused Placeholder (ISO3)";
-      }
-      enum "ios-encaps-type-vines-tr" {
-        value 18;
-        description
-          "ISO1 with Vines demux byte";
-      }
-      enum "ios-encaps-type-ethertalk" {
-        value 19;
-        description
-          "AppleTalk phase 1 on ethernet";
-      }
-      enum "ios-encaps-type-frame-relay" {
-        value 20;
-        description
-          "Frame Relay";
-      }
-      enum "ios-encaps-type-smds" {
-        value 21;
-        description
-          "Switched Multimegabit Data Service (SMDS)";
-      }
-      enum "ios-encaps-type-mac" {
-        value 22;
-        description
-          "MAC level packets";
-      }
-      enum "ios-encaps-type-ultra-iso2" {
-        value 23;
-        description
-          "Ultranet";
-      }
-      enum "ios-encaps-type-ultra-iso1" {
-        value 24;
-        description
-          "Ultranet-Hello";
-      }
-      enum "ios-encaps-type-stun" {
-        value 25;
-        description
-          "Serial - serial tunnelling";
-      }
-      enum "ios-encaps-type-bridge" {
-        value 26;
-        description
-          "Packet in bridge encapsulation";
-      }
-      enum "ios-encaps-type-llc2" {
-        value 27;
-        description
-          "LLC 2";
-      }
-      enum "ios-encaps-type-sdlcp" {
-        value 28;
-        description
-          "Serial - SDLC (primary)";
-      }
-      enum "ios-encaps-type-sdlcs" {
-        value 29;
-        description
-          "Serial - SDLC (secondary)";
-      }
-      enum "ios-encaps-type-slip" {
-        value 30;
-        description
-          "Async SLIP encapsulation";
-      }
-      enum "ios-encaps-type-tunnel" {
-        value 31;
-        description
-          "Standard Tunnel Interface";
-      }
-      enum "ios-encaps-type-bridge-encaps" {
-        value 32;
-        description
-          "Bridge encap on local gen packs";
-      }
-      enum "ios-encaps-type-atm" {
-        value 33;
-        description
-          "ATM interface encaps";
-      }
-      enum "ios-encaps-type-atm-dxi" {
-        value 34;
-        description
-          "ATM DXI implementation";
-      }
-      enum "ios-encaps-type-fr-ietf" {
-        value 35;
-        description
-          "Frame Relay with IETF encaps";
-      }
-      enum "ios-encaps-type-smds-dxi" {
-        value 36;
-        description
-          "SMDS DXI implementation";
-      }
-      enum "ios-encaps-type-atm-dxi-ietf" {
-        value 37;
-        description
-          "atm-dxi with IETF encaps";
-      }
-      enum "ios-encaps-type-channel" {
-        value 38;
-        description
-          "IBM Channel";
-      }
-      enum "ios-encaps-type-sdlc" {
-        value 39;
-        description
-          "CLSI compliant SDLC";
-      }
-      enum "ios-encaps-type-sde" {
-        value 40;
-        description
-          "802.10 Secure Data Exchange";
-      }
-      enum "ios-encaps-type-bstun" {
-        value 41;
-        description
-          "block serial tunnel";
-      }
-      enum "ios-encaps-type-dialer" {
-        value 42;
-        description
-          "Dialer encapsulation";
-      }
-      enum "ios-encaps-type-novell-fddi" {
-        value 43;
-        description
-          "Novell style XNS on FDDI";
-      }
-      enum "ios-encaps-type-v120" {
-        value 44;
-        description
-          "V120 ISDN->ASYNC encaps";
-      }
-      enum "ios-encaps-type-isl" {
-        value 45;
-        description
-          "Inter Switch Link - vLANs on FEIP";
-      }
-      enum "ios-encaps-type-loop" {
-        value 46;
-        description
-          "loopback interface";
-      }
-      enum "ios-encaps-type-channel-ilan" {
-        value 47;
-        description
-          "IBM Channel internal LAN";
-      }
-      enum "ios-encaps-type-serial-autodetect" {
-        value 48;
-        description
-          "Autodetected for Serials";
-      }
-      enum "ios-encaps-type-cpp" {
-        value 49;
-        description
-          "Combinet proprietary protocol";
-      }
-      enum "ios-encaps-type-ndlc" {
-        value 50;
-        description
-          "NCIA DLC";
-      }
-      enum "ios-encaps-type-lapd" {
-        value 51;
-        description
-          "ISDN Q.921";
-      }
-      enum "ios-encaps-type-ftc-trunk" {
-        value 52;
-        description
-          "StrataCom IPX/Fastpad protocol";
-      }
-      enum "ios-encaps-type-atmces-t1" {
-        value 53;
-        description
-          "ATM T1 Circuit Emulation.";
-      }
-      enum "ios-encaps-type-atmces-e1" {
-        value 54;
-        description
-          "ATM E1 Circuit Emulation.";
-      }
-      enum "ios-encaps-type-voice" {
-        value 55;
-        description
-          "Packetized Voice";
-      }
-      enum "ios-encaps-type-alc" {
-        value 56;
-        description
-          "ALC (P1024B) sync protocol";
-      }
-      enum "ios-encaps-type-uts" {
-        value 57;
-        description
-          "UTS (P1024C) sync protocol";
-      }
-      enum "ios-encaps-type-trisl" {
-        value 58;
-        description
-          "Token Ring Inter-Switch Link (TRISL)";
-      }
-      enum "ios-encaps-type-mcns" {
-        value 59;
-        description
-          "Cable - MCNS";
-      }
-      enum "ios-encaps-type-atmces" {
-        value 60;
-        description
-          "ATM circuit emulation service";
-      }
-      enum "ios-encaps-type-trans" {
-        value 61;
-        description
-          "for transparent mode";
-      }
-      enum "ios-encaps-type-clear-channel" {
-        value 62;
-        description
-          "TDM clear channel";
-      }
-      enum "ios-encaps-type-tc-atm" {
-        value 63;
-        description
-          "Tag Controlled ATM interface";
-      }
-      enum "ios-encaps-type-fr-ppp" {
-        value 64;
-        description
-          "PPP over Frame Relay";
-      }
-      enum "ios-encaps-type-dot1q" {
-        value 65;
-        description
-          "IEEE 802.1Q";
-      }
-      enum "ios-encaps-type-funi" {
-        value 66;
-        description
-          "Frame based user network interface";
-      }
-      enum "ios-encaps-type-lapbta" {
-        value 67;
-        description
-          "LAPB terminal adapter";
-      }
-      enum "ios-encaps-type-docsis" {
-        value 68;
-        description
-          "Cable Modem";
-      }
-      enum "ios-encaps-type-np-inband" {
-        value 69;
-        description
-          "NextPort DSP modem in-band message";
-      }
-      enum "ios-encaps-type-ss7-mtp2" {
-        value 70;
-        description
-          "SS7 MTP-2 over serial/TDM interface";
-      }
-      enum "ios-encaps-type-gtp" {
-        value 71;
-        description
-          "General Packet Radio Service (GPRS)";
-      }
-      enum "ios-encaps-type-isl-switchport" {
-        value 72;
-        description
-          "ISL SW encap pkt sent on swch prt";
-      }
-      enum "ios-encaps-type-srp" {
-        value 73;
-        description
-          "Spatial Reuse Protocol";
-      }
-      enum "ios-encaps-type-ppp-etype" {
-        value 74;
-        description
-          "PPP hdr w/Ethertype protocol type";
-      }
-      enum "ios-encaps-type-atm-ppp" {
-        value 75;
-        description
-          "PPP over ATM";
-      }
-      enum "ios-encaps-type-mfr" {
-        value 76;
-        description
-          "Multilink Frame Relay";
-      }
-      enum "ios-encaps-type-srp2" {
-        value 77;
-        description
-          "SRP version 2";
-      }
-      enum "ios-encaps-type-fr-extended" {
-        value 78;
-        description
-          "Frame Relay extended addressing";
-      }
-      enum "ios-encaps-type-pppoe" {
-        value 79;
-        description
-          "PPP Over Ethernet";
-      }
-      enum "ios-encaps-type-ouni-sdcc" {
-        value 80;
-        description
-          "OIF UNI SDCC per OIF2000.125";
-      }
-      enum "ios-encaps-type-multiservice" {
-        value 81;
-        description
-          "encap type for multiservice i/f";
-      }
-      enum "ios-encaps-type-container" {
-        value 82;
-        description
-          "Container";
-      }
-      enum "ios-encaps-type-dot1ad" {
-        value 83;
-        description
-          "Dot1ad ether type";
-      }
-      enum "ios-encaps-type-cem" {
-        value 84;
-        description
-          "Circuit Emulation Type";
-      }
-      enum "ios-encaps-type-dot1ah" {
-        value 85;
-        description
-          "IEEE 802.1ah Ether type";
-      }
-      enum "ios-encaps-type-ptp" {
-        value 86;
-        description
-          "PTP type";
-      }
-      enum "ios-encaps-type-ssl" {
-        value 87;
-        description
-          "For SSLVPN";
-      }
-      enum "ios-encaps-type-lisp" {
-        value 88;
-        description
-          "Locator/ID Separation Protocol (LISP)";
-      }
-      enum "ios-encaps-type-dsp-spa" {
-        value 89;
-        description
-          "DSP-based SPA";
-      }
-      enum "ios-encaps-type-t101" {
-        value 90;
-        description
-          "IEC-60870-5-101 for Async Serial interface";
-      }
-      enum "ios-encaps-type-crypto" {
-        value 91;
-        description
-          "Crypto";
-      }
-      enum "ios-encaps-type-rawtcp" {
-        value 92;
-        description
-          "Raw socket TCP for Async line interface";
-      }
-      enum "ios-encaps-type-async" {
-        value 93;
-        description
-          "Async line raw data";
-      }
-      enum "ios-encaps-type-cmd" {
-        value 94;
-        description
-          "Cisco Meta Data (CMD) EtherType=0x8909 encap";
-      }
-      enum "ios-encaps-type-scada" {
-        value 95;
-        description
-          "SCADA for Async Serial Interface";
-      }
-      enum "ios-encaps-type-rawudp" {
-        value 96;
-        description
-          "Raw socket UDP for Async line interface";
-      }
-      enum "ios-encaps-type-relay-line" {
-        value 97;
-        description
-          "Line relay for Async line interface";
-      }
-      enum "ios-encaps-type-rawmpls" {
-        value 98;
-        description
-          "Raw socket over MPLS for Async line interface
-           Market want to call it trans. It's a little conflict
-           TRANSPARENT";
-      }
-      enum "ios-encaps-type-arpa-nid" {
-        value 99;
-        description
-          "if NID added after ARPA we add a new type";
-      }
-    }
-    description
-      "Encaps Type";
-  }
-
-  typedef ios-linktype {
-    type enumeration {
-      enum "ios-linktype-illegal" {
-        value 0;
-        description
-          "invalid link type";
-      }
-      enum "ios-linktype-arp" {
-        value 1;
-        description
-          "IP ARP";
-      }
-      enum "ios-linktype-rarp" {
-        value 2;
-        description
-          "Reverse ARP";
-      }
-      enum "ios-linktype-xarp" {
-        value 3;
-        description
-          "Xerox ARP";
-      }
-      enum "ios-linktype-probe" {
-        value 4;
-        description
-          "HP's 802 version of ARP";
-      }
-      enum "ios-linktype-loop" {
-        value 5;
-        description
-          "Ethernet loopback";
-      }
-      enum "ios-linktype-address" {
-        value 6;
-        description
-          "cisco Systems Serial ARP";
-      }
-      enum "ios-linktype-ip" {
-        value 7;
-        description
-          "Internet Protocol (IP)";
-      }
-      enum "ios-linktype-pup" {
-        value 8;
-        description
-          "Xerox PARC Universal Protocol (PUP)";
-      }
-      enum "ios-linktype-9-unused" {
-        value 9;
-        description
-          "Available Unused Slot";
-      }
-      enum "ios-linktype-xns" {
-        value 10;
-        description
-          "XNS protocol (Xerox original)";
-      }
-      enum "ios-linktype-novell" {
-        value 11;
-        description
-          "Novell IPX";
-      }
-      enum "ios-linktype-apollo" {
-        value 12;
-        description
-          "Apollo Domain";
-      }
-      enum "ios-linktype-vines" {
-        value 13;
-        description
-          "Banyan Vines IP";
-      }
-      enum "ios-linktype-pad" {
-        value 14;
-        description
-          "X.2[89] PAD protocol";
-      }
-      enum "ios-linktype-x25" {
-        value 15;
-        description
-          "X.25 for purists";
-      }
-      enum "ios-linktype-appletalk" {
-        value 16;
-        description
-          "AppleTalk - Extended DDP";
-      }
-      enum "ios-linktype-aarp" {
-        value 17;
-        description
-          "Appletalk ARP";
-      }
-      enum "ios-linktype-dec-spanning" {
-        value 18;
-        description
-          "DEC spanning tree";
-      }
-      enum "ios-linktype-ieee-spanning" {
-        value 19;
-        description
-          "IEEE spanning tree BPDU";
-      }
-      enum "ios-linktype-nbf" {
-        value 20;
-        description
-          "NBF NetBios Frames";
-      }
-      enum "ios-linktype-21-unused" {
-        value 21;
-        description
-          "Unused Link Type";
-      }
-      enum "ios-linktype-decnet" {
-        value 22;
-        description
-          "DECnet Phase IV node unicast";
-      }
-      enum "ios-linktype-decnet-router-l1" {
-        value 23;
-        description
-          "(Old) DECnet PhaseIV router multicast";
-      }
-      enum "ios-linktype-decnet-node" {
-        value 24;
-        description
-          "DECnet Phase IV node multicast";
-      }
-      enum "ios-linktype-clns" {
-        value 25;
-        description
-          "OSI 8473 ES-IS 9542, etc.";
-      }
-      enum "ios-linktype-clns-all-es" {
-        value 26;
-        description
-          "ES-IS Multicast - all end systems";
-      }
-      enum "ios-linktype-clns-all-is" {
-        value 27;
-        description
-          "ES-IS Multicast - all intermed.";
-      }
-      enum "ios-linktype-clns-bcast" {
-        value 28;
-        description
-          "CLNS & ES-IS Broadcasts";
-      }
-      enum "ios-linktype-xot" {
-        value 29;
-        description
-          "X.25 over TCP";
-      }
-      enum "ios-linktype-ppp" {
-        value 30;
-        description
-          "Protocol PPP";
-      }
-      enum "ios-linktype-lat" {
-        value 31;
-        description
-          "DEC LAT terminal protocol";
-      }
-      enum "ios-linktype-vines-echo" {
-        value 32;
-        description
-          "Banyan Vines Echo Protocol";
-      }
-      enum "ios-linktype-vines-loop" {
-        value 33;
-        description
-          "Banyan Vines Loopback Protocol";
-      }
-      enum "ios-linktype-atalk-short" {
-        value 34;
-        description
-          "AppleTalk short DDP";
-      }
-      enum "ios-linktype-mop-boot" {
-        value 35;
-        description
-          "DEC MOP booting protocol";
-      }
-      enum "ios-linktype-mop-console" {
-        value 36;
-        description
-          "DEC MOP console protocol";
-      }
-      enum "ios-linktype-rsrb" {
-        value 37;
-        description
-          "RSRB raw";
-      }
-      enum "ios-linktype-bridge" {
-        value 38;
-        description
-          "transparent bridge traffic";
-      }
-      enum "ios-linktype-stun" {
-        value 39;
-        description
-          "Stunnel";
-      }
-      enum "ios-linktype-fr-arp" {
-        value 40;
-        description
-          "Frame Relay";
-      }
-      enum "ios-linktype-smds-arp" {
-        value 41;
-        description
-          "SMDS own ARP";
-      }
-      enum "ios-linktype-mac" {
-        value 42;
-        description
-          "MAC packets";
-      }
-      enum "ios-linktype-ibmnm" {
-        value 43;
-        description
-          "IBM Network Management packets";
-      }
-      enum "ios-linktype-uarp" {
-        value 44;
-        description
-          "Ultranet";
-      }
-      enum "ios-linktype-ultra-hello" {
-        value 45;
-        description
-          "Ultranet";
-      }
-      enum "ios-linktype-x25service" {
-        value 46;
-        description
-          "X.25 services";
-      }
-      enum "ios-linktype-uncompressed-tcp" {
-        value 47;
-        description
-          "Uncompressed TCP/IP";
-      }
-      enum "ios-linktype-compressed-tcp" {
-        value 48;
-        description
-          "Compressed TCP/IP";
-      }
-      enum "ios-linktype-llc2" {
-        value 49;
-        description
-          "LLC type II";
-      }
-      enum "ios-linktype-cmns" {
-        value 50;
-        description
-          "CMNS--X.25 over non-serial media";
-      }
-      enum "ios-linktype-isis-all-l1-is" {
-        value 51;
-        description
-          "ISIS - All Level 1 ISes";
-      }
-      enum "ios-linktype-isis-all-l2-is" {
-        value 52;
-        description
-          "ISIS - All Level 2 ISes";
-      }
-      enum "ios-linktype-fr-switch" {
-        value 53;
-        description
-          "FR switching over IP tunnel";
-      }
-      enum "ios-linktype-decnet-prime-router" {
-        value 54;
-        description
-          "Ph-IV Prime all routers";
-      }
-      enum "ios-linktype-srb" {
-        value 55;
-        description
-          "source route bridge traffic";
-      }
-      enum "ios-linktype-qllc" {
-        value 56;
-        description
-          "qllc (SNA over X.25)";
-      }
-      enum "ios-linktype-x25-multi-enc" {
-        value 57;
-        description
-          "X.25 multiprotocol encapsulation";
-      }
-      enum "ios-linktype-lex" {
-        value 58;
-        description
-          "Lan Extension Protocol";
-      }
-      enum "ios-linktype-lex-rcmd" {
-        value 59;
-        description
-          "Lex-NCP + LEX Remote commands";
-      }
-      enum "ios-linktype-decnet-router-l2" {
-        value 60;
-        description
-          "DECnet PhaseIV L2 router multcast";
-      }
-      enum "ios-linktype-cls" {
-        value 61;
-        description
-          "Frames from RSRB vring->CLS vring";
-      }
-      enum "ios-linktype-snapshot" {
-        value 62;
-        description
-          "Start dialing, don't send frame";
-      }
-      enum "ios-linktype-dlsw" {
-        value 63;
-        description
-          "Data Link Switching traffic";
-      }
-      enum "ios-linktype-sde" {
-        value 64;
-        description
-          "802.10 Secure Data Exchange";
-      }
-      enum "ios-linktype-cdp" {
-        value 65;
-        description
-          "Cisco Discovery Protocol";
-      }
-      enum "ios-linktype-ppp-compression" {
-        value 66;
-        description
-          "Compression Control Protocol PPP";
-      }
-      enum "ios-linktype-nmp" {
-        value 67;
-        description
-          "Local LNM packet traffic";
-      }
-      enum "ios-linktype-bstun" {
-        value 68;
-        description
-          "block serial tunnel";
-      }
-      enum "ios-linktype-ipc" {
-        value 69;
-        description
-          "Out-of-band IPC";
-      }
-      enum "ios-linktype-love" {
-        value 70;
-        description
-          "CIP statistics";
-      }
-      enum "ios-linktype-cfgack" {
-        value 71;
-        description
-          "CIP asynchronous cfg acks";
-      }
-      enum "ios-linktype-appn-anr" {
-        value 72;
-        description
-          "APPN HPR ANR traffic";
-      }
-      enum "ios-linktype-multilink" {
-        value 73;
-        description
-          "Multilink protocol";
-      }
-      enum "ios-linktype-nhrp" {
-        value 74;
-        description
-          "Next Hop Resolution Protocol (NHRP)";
-      }
-      enum "ios-linktype-mac-exp" {
-        value 75;
-        description
-          "MAC frames are express buffered";
-      }
-      enum "ios-linktype-cgmp" {
-        value 76;
-        description
-          "Cisco Group Management Protocol";
-      }
-      enum "ios-linktype-vtp" {
-        value 77;
-        description
-          "Cisco VLAN Transport Protocol";
-      }
-      enum "ios-linktype-cpp" {
-        value 78;
-        description
-          "Combinet proprietary encaps";
-      }
-      enum "ios-linktype-ipv6" {
-        value 79;
-        description
-          "IP version 6";
-      }
-      enum "ios-linktype-atm" {
-        value 80;
-        description
-          "Asynchronous Transfer Mode (ATM)";
-      }
-      enum "ios-linktype-isl" {
-        value 81;
-        description
-          "Cisco Inter Switch Link";
-      }
-      enum "ios-linktype-bap" {
-        value 82;
-        description
-          "Bandwidth Allocation Protocol";
-      }
-      enum "ios-linktype-compressed-rtp" {
-        value 83;
-        description
-          "Compressed RTP-UDP-IP";
-      }
-      enum "ios-linktype-compressed-udp" {
-        value 84;
-        description
-          "Compressed UDP-IP";
-      }
-      enum "ios-linktype-uncompressed-udp" {
-        value 85;
-        description
-          "Unompressed RTP-UDP-IP";
-      }
-      enum "ios-linktype-context-status" {
-        value 86;
-        description
-          "RTP context error";
-      }
-      enum "ios-linktype-fr-switch-serial" {
-        value 87;
-        description
-          "FR switching over serial line
-           internal packet identification only";
-      }
-      enum "ios-linktype-c5-ibipc" {
-        value 88;
-        description
-          "Cat5k inband ipc";
-      }
-      enum "ios-linktype-nlsp-multicast" {
-        value 89;
-        description
-          "NLSP multicast hello/update";
-      }
-      enum "ios-linktype-tag" {
-        value 90;
-        description
-          "Tag switched packet";
-      }
-      enum "ios-linktype-mtag" {
-        value 91;
-        description
-          "Multicast TAG (MTAG)";
-      }
-      enum "ios-linktype-alps" {
-        value 92;
-        description
-          "Airline Protocol Support";
-      }
-      enum "ios-linktype-drip" {
-        value 93;
-        description
-          "Cisco DRIP";
-      }
-      enum "ios-linktype-voice" {
-        value 94;
-        description
-          "Voice over ATM";
-      }
-      enum "ios-linktype-fr-atm" {
-        value 95;
-        description
-          "FR-ATM network interworking";
-      }
-      enum "ios-linktype-fcp" {
-        value 96;
-        description
-          "layer3 switching on earl2";
-      }
-      enum "ios-linktype-voice-no-rt" {
-        value 97;
-        description
-          "Non real time voice";
-      }
-      enum "ios-linktype-vlan-br-spanning" {
-        value 98;
-        description
-          "VLAN Bridge spanning tree BPDU";
-      }
-      enum "ios-linktype-dot1q" {
-        value 99;
-        description
-          "IEEE 802.1Q";
-      }
-      enum "ios-linktype-cisco-ipc" {
-        value 100;
-        description
-          "cisco ipc msg.";
-      }
-      enum "ios-linktype-vsi" {
-        value 101;
-        description
-          "Cisco VSI Protocol";
-      }
-      enum "ios-linktype-isdn-manual-call" {
-        value 102;
-        description
-          "for manual ISDN call";
-      }
-      enum "ios-linktype-comp-non-tcp" {
-        value 103;
-        description
-          "IPHC compression";
-      }
-      enum "ios-linktype-comp-tcp-nodelta" {
-        value 104;
-        description
-          "IPHC compression";
-      }
-      enum "ios-linktype-fr-atm-srv" {
-        value 105;
-        description
-          "FR-ATM service interworking";
-      }
-      enum "ios-linktype-fr-eek" {
-        value 106;
-        description
-          "FR end-to-end keepalive";
-      }
-      enum "ios-linktype-ehsa" {
-        value 107;
-        description
-          "Test type for EHSA";
-      }
-      enum "ios-linktype-mscp" {
-        value 108;
-        description
-          "Multicast Shortcut PDU";
-      }
-      enum "ios-linktype-scp" {
-        value 109;
-        description
-          "Cat6k - linecard control";
-      }
-      enum "ios-linktype-pppoe-discovery" {
-        value 110;
-        description
-          "PPP over Ethernet Discovery";
-      }
-      enum "ios-linktype-pppoe-session" {
-        value 111;
-        description
-          "PPP over Ethernet Session";
-      }
-      enum "ios-linktype-l2rly" {
-        value 112;
-        description
-          "GPRS l2rly";
-      }
-      enum "ios-linktype-gtp" {
-        value 113;
-        description
-          "GPRS GTP";
-      }
-      enum "ios-linktype-comp-rtp-16" {
-        value 114;
-        description
-          "Compressed RTP-UDP-IP 16 bit CID";
-      }
-      enum "ios-linktype-comp-udp-16" {
-        value 115;
-        description
-          "Compressed RTP-UDP-IP 16 bit CID";
-      }
-      enum "ios-linktype-atm-switch" {
-        value 116;
-        description
-          "ATM PDU switching";
-      }
-      enum "ios-linktype-pagp" {
-        value 117;
-        description
-          "Port Aggregation Protocol";
-      }
-      enum "ios-linktype-sstp" {
-        value 118;
-        description
-          "Shared Spanning Tree BPDU";
-      }
-      enum "ios-linktype-rlq-req" {
-        value 119;
-        description
-          "STP Root Link Query Request";
-      }
-      enum "ios-linktype-rlq-resp" {
-        value 120;
-        description
-          "STP Root Link Query Response";
-      }
-      enum "ios-linktype-dyntrk" {
-        value 121;
-        description
-          "Dynamic Trunk Protocol (DTP) PDU";
-      }
-      enum "ios-linktype-mls-ip" {
-        value 122;
-        description
-          "layer3 switching internal flush";
-      }
-      enum "ios-linktype-dyntrk-encap" {
-        value 123;
-        description
-          "DTP PDUs sent w/ SW ISL encap";
-      }
-      enum "ios-linktype-udld" {
-        value 124;
-        description
-          "UniDirectional Link Protocol";
-      }
-      enum "ios-linktype-srp" {
-        value 125;
-        description
-          "Spatial Reuse Protocol (SRP)";
-      }
-      enum "ios-linktype-rgmp" {
-        value 126;
-        description
-          "Router-port Group Management Protocol (RGMP)";
-      }
-      enum "ios-linktype-mistp" {
-        value 127;
-        description
-          "Multi Instance Spanning Tree";
-      }
-      enum "ios-linktype-compressed-fr" {
-        value 128;
-        description
-          "Compressed Frame Relay";
-      }
-      enum "ios-linktype-vito-scp" {
-        value 129;
-        description
-          "Vito SCP protocol";
-      }
-      enum "ios-linktype-const-ftep" {
-        value 130;
-        description
-          "Constellation Forwarding Table Edit Protocol";
-      }
-      enum "ios-linktype-vlan-switch" {
-        value 131;
-        description
-          "VLAN PDU switching";
-      }
-      enum "ios-linktype-atom" {
-        value 132;
-        description
-          "ATOM (Process) switching";
-      }
-      enum "ios-linktype-raw" {
-        value 133;
-        description
-          "Raw switching";
-      }
-      enum "ios-linktype-oscp" {
-        value 134;
-        description
-          "Optical Supervisory Channel Protocol";
-      }
-      enum "ios-linktype-diag" {
-        value 135;
-        description
-          "For Diag lpback via Ethernet chip";
-      }
-      enum "ios-linktype-stack-disc" {
-        value 136;
-        description
-          "STP DUF STACK discovery";
-      }
-      enum "ios-linktype-fast-trans" {
-        value 137;
-        description
-          "STP DUF Fast Transition";
-      }
-      enum "ios-linktype-dot1x" {
-        value 138;
-        description
-          "802.1X Port Access Entity Type";
-      }
-      enum "ios-linktype-fr-frag" {
-        value 139;
-        description
-          "FR fragmentation";
-      }
-      enum "ios-linktype-slow-proto" {
-        value 140;
-        description
-          "802.3AD Slow Protocol";
-      }
-      enum "ios-linktype-eompls" {
-        value 141;
-        description
-          "sync damage please name me";
-      }
-      enum "ios-linktype-ieee-dot1q" {
-        value 142;
-        description
-          "sync damage please name me";
-      }
-      enum "ios-linktype-voice-nrt" {
-        value 143;
-        description
-          "sync damage please name me";
-      }
-      enum "ios-linktype-uti-raw" {
-        value 144;
-        description
-          "sync damage please name me";
-      }
-      enum "ios-linktype-hdlc-hapi" {
-        value 145;
-        description
-          "ACE IPsec accelerator control";
-      }
-      enum "ios-linktype-cwan-ipsec" {
-        value 146;
-        description
-          "IPSec acceleration for CWAN";
-      }
-      enum "ios-linktype-sstp-spanning" {
-        value 147;
-        description
-          "Shared Spanning Tree BPDU";
-      }
-      enum "ios-linktype-fr-saa" {
-        value 148;
-        description
-          "FR SAA round trip measurement";
-      }
-      enum "ios-linktype-froe" {
-        value 149;
-        description
-          "Frame Relay over Ethernet";
-      }
-      enum "ios-linktype-vpdn" {
-        value 150;
-        description
-          "Forwarded VPDN packets";
-      }
-      enum "ios-linktype-slm-saa" {
-        value 151;
-        description
-          "SAA SLM Link Type";
-      }
-      enum "ios-linktype-rf-kpa" {
-        value 152;
-        description
-          "Redundancy Facility keepalives";
-      }
-      enum "ios-linktype-rbcp" {
-        value 153;
-        description
-          "Router blade control protocol";
-      }
-      enum "ios-linktype-p2ipc" {
-        value 154;
-        description
-          "P2IPC LinkType";
-      }
-      enum "ios-linktype-p2ipc-mpls" {
-        value 155;
-        description
-          "P2IPC LinkType for MPLS controller";
-      }
-      enum "ios-linktype-xconnect" {
-        value 156;
-        description
-          "Xconnect (Process switching)";
-      }
-      enum "ios-linktype-slm-fr-saa" {
-        value 157;
-        description
-          "FR SLM Link Type";
-      }
-      enum "ios-linktype-cdma-rp" {
-        value 158;
-        description
-          "CDMA RP";
-      }
-      enum "ios-linktype-pw-ip-deprecated" {
-        value 159;
-        description
-          "Deprecated
-           do not reuse due to potential ISSU conflict";
-      }
-      enum "ios-linktype-vj-uncomp-tcp" {
-        value 160;
-        description
-          "VJ Uncompressed TCP/IP";
-      }
-      enum "ios-linktype-vj-comp-tcp" {
-        value 161;
-        description
-          "VJ Compressed TCP/IP";
-      }
-      enum "ios-linktype-online-diags" {
-        value 162;
-        description
-          "Online Diags";
-      }
-      enum "ios-linktype-vrf-ipsec" {
-        value 163;
-        description
-          "VRF Aware Ipsec Crypto";
-      }
-      enum "ios-linktype-broadcom" {
-        value 164;
-        description
-          "Link Broadcom";
-      }
-      enum "ios-linktype-http" {
-        value 165;
-        description
-          "HyperText Transfer Protocol (HTTP)";
-      }
-      enum "ios-linktype-lfp" {
-        value 166;
-        description
-          "Link Fault Propagation";
-      }
-      enum "ios-linktype-drprip" {
-        value 167;
-        description
-          "Dual RPR Interconnect Protocol";
-      }
-      enum "ios-linktype-ether-cfm" {
-        value 168;
-        description
-          "Ethernet Connectivity Fault Management
-           (Version D1)";
-      }
-      enum "ios-linktype-ether-oam" {
-        value 169;
-        description
-          "Ethernet OAM (802.3ah) ";
-      }
-      enum "ios-linktype-mmu" {
-        value 170;
-        description
-          "Mac Move Update";
-      }
-      enum "ios-linktype-vslp" {
-        value 171;
-        description
-          "Virtual Switch Link Protocol";
-      }
-      enum "ios-linktype-ether-lmi" {
-        value 172;
-        description
-          "Ethernet Local Management Interface";
-      }
-      enum "ios-linktype-lldp" {
-        value 173;
-        description
-          "Link Layer Discovery Protocol(IEEE 802.1AB)";
-      }
-      enum "ios-linktype-gvrp" {
-        value 174;
-        description
-          "GARP VLAN Registration Protocol (802.1Q GVRP)";
-      }
-      enum "ios-linktype-gmrp" {
-        value 175;
-        description
-          "GARP Multicast Registration Protocol (802.1Q GMRP)";
-      }
-      enum "ios-linktype-ancp" {
-        value 176;
-        description
-          "Access Node Control Protocol";
-      }
-      enum "ios-linktype-rep" {
-        value 177;
-        description
-          "Resilient Ethernet Protocol";
-      }
-      enum "ios-linktype-rep-hfl" {
-        value 178;
-        description
-          "Resilient Ethernet Protocol Hardware Flood Layer";
-      }
-      enum "ios-linktype-ipe" {
-        value 179;
-        description
-          "IPe Bootstrap";
-      }
-      enum "ios-linktype-mvrp" {
-        value 180;
-        description
-          "Multiple VLAN Registration Protocol
-           MVRP (802.1ak)";
-      }
-      enum "ios-linktype-vsda" {
-        value 181;
-        description
-          "Virtual Switch Dual Active Protocol";
-      }
-      enum "ios-linktype-ecfm" {
-        value 182;
-        description
-          "Ethernet Connectivity Fault Management
-           (IEEE Version)";
-      }
-      enum "ios-linktype-dot1ah" {
-        value 183;
-        description
-          "Ethernet Mac tunneling Protocol
-           (802.1ah I-TAG Version)";
-      }
-      enum "ios-linktype-sdp" {
-        value 184;
-        description
-          "Satellite Discovery And Control protocol";
-      }
-      enum "ios-linktype-cdpfwd" {
-        value 185;
-        description
-          "CDP Forwarding (CDPFWD)";
-      }
-      enum "ios-linktype-t101" {
-        value 186;
-        description
-          "IEC 60870-5 101 Async Link";
-      }
-      enum "ios-linktype-rsvp" {
-        value 187;
-        description
-          "RSVP Protocol ";
-      }
-      enum "ios-linktype-isisl2-otv-all-l1-is" {
-        value 188;
-        description
-          "ISIS L2 OTV - All Level 1 ISes";
-      }
-      enum "ios-linktype-isisl2-otv-all-l2-is" {
-        value 189;
-        description
-          "ISIS L2 OTV - All Level 2 ISes";
-      }
-      enum "ios-linktype-g8032" {
-        value 190;
-        description
-          "G.8032";
-      }
-      enum "ios-linktype-sdac" {
-        value 191;
-        description
-          "Satellite Discovery And Control protocol";
-      }
-      enum "ios-linktype-ptppd" {
-        value 192;
-        description
-          "PTP Peer Delay protocol";
-      }
-      enum "ios-linktype-rawtcp" {
-        value 193;
-        description
-          "RAWTCP";
-      }
-      enum "ios-linktype-an-ch" {
-        value 194;
-        description
-          "Autonomic Networking";
-      }
-      enum "ios-linktype-fex-sdp" {
-        value 195;
-        description
-          "FEX SDP/SRP Satellite Discovey Protocol
-           Satellite Registration Protocols";
-      }
-      enum "ios-linktype-esmc" {
-        value 196;
-        description
-          "Ethernet Synchronous Messaging Channel (ESCM)";
-      }
-      enum "ios-linktype-cisp" {
-        value 197;
-        description
-          "Client Information Signaling Protocol (CISP)";
-      }
-      enum "ios-linktype-async" {
-        value 198;
-        description
-          "punt/inject path Async Packet";
-      }
-      enum "ios-linktype-msrp" {
-        value 199;
-        description
-          "Multiple Stream Reservation Protocol";
-      }
-      enum "ios-linktype-macsec-post-exp" {
-        value 200;
-        description
-          "Online Diags";
-      }
-      enum "ios-linktype-macsec-sectag" {
-        value 201;
-        description
-          "Online Diags";
-      }
-    }
-    description
-      "Link Type";
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip-sla-oper.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip-sla-oper.yang
deleted file mode 100644
index e089a81ed..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip-sla-oper.yang
+++ /dev/null
@@ -1,637 +0,0 @@
-module Cisco-IOS-XE-ip-sla-oper {
-  yang-version 1;
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-ip-sla-oper";
-  prefix ip-sla-ios-xe-oper;
-
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for monitoring of IP SLA statistics of a Network Element.
-     Copyright (c) 2016-2017 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2017-09-25 {
-    description
-      "Reinstate when clauses";
-    reference "3.0.0";
-  }
-  revision 2017-08-22 {
-    description
-      "Addition of ICMP echo operational type enum";
-    reference "2.1.0";
-  }
-  revision 2017-04-01 {
-    description
-      "Enum name changes. Remove when clauses";
-    reference "2.0.0";
-  }
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-    reference "1.0.0";
-  }
-
-  typedef sla-oper-type {
-    type enumeration {
-      enum "oper-type-unknown" {
-        value 0;
-      }
-      enum "oper-type-udp-echo" {
-        value 1;
-      }
-      enum "oper-type-udp-jitter" {
-        value 2;
-      }
-      enum "oper-type-icmp-jitter" {
-        value 3;
-      }
-      enum "oper-type-ethernet-jitter" {
-        value 4;
-      }
-      enum "oper-type-ethernet-echo" {
-        value 5;
-      }
-      enum "oper-type-y1731-delay" {
-        value 6;
-      }
-      enum "oper-type-y1731-loss" {
-        value 7;
-      }
-      enum "oper-type-video" {
-        value 8;
-      }
-      enum "oper-type-mcast" {
-        value 9;
-      }
-      enum "oper-type-pong" {
-        value 10;
-      }
-      enum "oper-type-path-jitter" {
-        value 11;
-      }
-      enum "oper-type-icmp-echo" {
-        value 12;
-      }
-    }
-    description
-      "IP SLA operational type";
-  }
-
-  typedef sla-return-code {
-    type enumeration {
-      enum "ret-code-unknown" {
-        value 0;
-      }
-      enum "ret-code-ok" {
-        value 1;
-      }
-      enum "ret-code-disconnected" {
-        value 2;
-      }
-      enum "ret-code-busy" {
-        value 3;
-      }
-      enum "ret-code-timeout" {
-        value 4;
-      }
-      enum "ret-code-no-connection" {
-        value 5;
-      }
-      enum "ret-code-internal-error" {
-        value 6;
-      }
-      enum "ret-code-operation-failure" {
-        value 7;
-      }
-      enum "ret-code-could-not-find" {
-        value 8;
-      }
-    }
-    description
-      "IP SLA return code";
-  }
-
-  typedef accuracy-type {
-    type enumeration {
-      enum "accuracy-milliseconds" {
-        value 0;
-      }
-      enum "accuracy-microseconds" {
-        value 1;
-      }
-    }
-    description
-      "IP SLA accuracy type";
-  }
-
-  typedef rtt-type {
-    type enumeration {
-      enum "rtt-known" {
-        value 0;
-      }
-      enum "rtt-unknown" {
-        value 1;
-      }
-      enum "rtt-could-not-find" {
-        value 2;
-      }
-    }
-    description
-      "IP SLA RTT type";
-  }
-
-  typedef ttl-type {
-    type enumeration {
-      enum "ttl-finite" {
-        value 0;
-      }
-      enum "ttl-forever" {
-        value 1;
-      }
-    }
-    description
-      "IP SLA time-to-live type";
-  }
-
-  grouping sla-time-values {
-    description
-      "SLA time values";
-    leaf min {
-      type uint32;
-      description
-        "Minimum value reading";
-    }
-    leaf avg {
-      type uint32;
-      description
-        "Average value reading";
-    }
-    leaf max {
-      type uint32;
-      description
-        "Maximum value reading";
-    }
-    leaf accuracy {
-      type ip-sla-ios-xe-oper:accuracy-type;
-      description
-        "Reading accuracy";
-    }
-  }
-
-  grouping sla-packet-loss-info {
-    description
-      "SLA packet loss information";
-    leaf loss-period-count {
-      type uint32;
-      description
-        "Loss period count";
-    }
-    leaf loss-period-len-min {
-      type uint32;
-      description
-        "Shortest loss period length";
-    }
-    leaf loss-period-len-max {
-      type uint32;
-      description
-        "Longest loss period length";
-    }
-    leaf inter-loss-period-len-min {
-      type uint32;
-      description
-        "Shortest inter loss period length";
-    }
-    leaf inter-loss-period-len-max {
-      type uint32;
-      description
-        "Longest inter loss period length";
-    }
-  }
-
-  grouping voice-score {
-    description
-      "Voice quality assessement info";
-    leaf icpif {
-      type uint32;
-      description
-        "Calculated planning impairment factor";
-    }
-    leaf mos {
-      type uint32;
-      description
-        "Mean opinion score";
-    }
-  }
-
-  grouping latest-rtt-type {
-    description
-      "Latest round-trip-time information";
-    choice latestrtt-choice {
-      description
-        "Last Round Trip Time recorded for this SLA";
-      case rtt-known {
-        leaf rtt {
-          type uint64;
-          description
-            "Round trip time value";
-        }
-      }
-      case rtt-unknown {
-        leaf unknown {
-          type empty;
-          description
-            "Round trip time is unknown";
-        }
-      }
-      case rtt-could-not-find {
-        leaf could-not-find {
-          type empty;
-          description
-            "Round trip time could not be determined";
-        }
-      }
-    }
-  }
-
-  grouping time-to-live-type {
-    description
-      "Latest time to live information";
-    choice timetolive-choice {
-      description
-        "For the timetolive-choice item, ip sla items can be configured to have a set (finite) time-to-live, or they can just be configured to go forever.";
-      case ttl-finite {
-        leaf ttl {
-          type uint64;
-          description
-            "Time to live value";
-        }
-      }
-      case ttl-forever {
-        leaf forever {
-          type empty;
-          description
-            "Time to live unbound";
-        }
-      }
-    }
-  }
-
-  grouping rtt-info {
-    description
-      "Round trip time information";
-    container latest-rtt {
-      description
-        "The last Round Trip Time recorded for this SLA";
-      uses ip-sla-ios-xe-oper:latest-rtt-type;
-    }
-    container time-to-live {
-      description
-        "Time-to-live for the SLA operation";
-      uses ip-sla-ios-xe-oper:time-to-live-type;
-    }
-  }
-
-  grouping y1731-interval-stats {
-    description
-      "Y.1731 internal statistics";
-    leaf intv-start-time {
-      type yang:date-and-time;
-      description
-        "Interval start time";
-    }
-    leaf init-count {
-      type uint32;
-      description
-        "Initial count";
-    }
-    leaf complete-count {
-      type uint32;
-      description
-        "Complete count";
-    }
-    leaf valid {
-      type boolean;
-      description
-        "Validity";
-    }
-  }
-
-  grouping rtt {
-    description
-      "RTT information";
-    leaf rtt-count {
-      type uint32;
-      description
-        "RTT count";
-    }
-    container sla-time-values {
-      description
-        "Timing information";
-      uses ip-sla-ios-xe-oper:sla-time-values;
-    }
-  }
-
-  grouping oneway-latency {
-    description
-      "Latency information";
-    leaf sample-count {
-      type uint32;
-      description
-        "Sample count";
-    }
-    container sd {
-      description
-        "Source to Destination for the one-way latency";
-      uses ip-sla-ios-xe-oper:sla-time-values;
-    }
-    container ds {
-      description
-        "Destination to Source for the one-way latency";
-      uses ip-sla-ios-xe-oper:sla-time-values;
-    }
-  }
-
-  grouping jitter {
-    description
-      "Jitter information";
-    leaf sd-sample-count {
-      type uint32;
-      description
-        "Sample count";
-    }
-    leaf ds-sample-count {
-      type uint32;
-      description
-        "Sample count";
-    }
-    container sd {
-      description
-        "Source to Destination for the jitter";
-      uses ip-sla-ios-xe-oper:sla-time-values;
-    }
-    container ds {
-      description
-        "Destination to Source for the jitter";
-      uses ip-sla-ios-xe-oper:sla-time-values;
-    }
-  }
-
-  grouping over-threshold {
-    description
-      "Over the threshold information";
-    leaf rtt-count {
-      type uint32;
-      description
-        "Round Trip Time (RTT) over threshold count (the number of times that the RTT was over the configured threshold)";
-    }
-    leaf percent {
-      type uint8;
-      description
-        "Round Trip Time over threshold percentage (the percentage that the RTT was over the configured threshold)";
-    }
-  }
-
-  grouping packet-loss {
-    description
-      "Packet loss information";
-    leaf unprocessed-packets {
-      when "(../../../oper-type='oper-type-ethernet-jitter') or (../../../oper-type='oper-type-ethernet-echo')";
-      type uint32;
-      description
-        "Unprocessed packet count";
-    }
-    leaf sd-count {
-      type uint32;
-      description
-        "Number of packets lost from Source to Destination";
-    }
-    container sd-loss {
-      when "(../../../oper-type!='oper-type-ethernet-jitter') and (../../../oper-type!='oper-type-ethernet-echo')";
-      description
-        "Source to Destination packet loss details";
-      uses ip-sla-ios-xe-oper:sla-packet-loss-info;
-    }
-    leaf ds-count {
-      type uint32;
-      description
-        "Number of packets lost from Destination to Source";
-    }
-    container ds-loss {
-      when "(../../../oper-type!='oper-type-ethernet-jitter') and (../../../oper-type!='oper-type-ethernet-echo')";
-      description
-        "Destination to Source packet loss details";
-      uses ip-sla-ios-xe-oper:sla-packet-loss-info;
-    }
-    leaf out-of-sequence {
-      type uint32;
-      description
-        "Out of sequence packet count";
-    }
-    leaf drops {
-      type uint32;
-      description
-        "Dropped packet count";
-    }
-    leaf late-arrivals {
-      type uint32;
-      description
-        "Late arrival packet count";
-    }
-    leaf skipped-packets {
-      type uint32;
-      description
-        "Skipped packet count";
-    }
-  }
-
-  grouping icmp-packet-loss {
-    description
-      "ICMP packet loss information";
-    leaf late-arrivals {
-      type uint32;
-      description
-        "Late arrival packet count";
-    }
-    leaf out-of-sequence {
-      type uint32;
-      description
-        "Out of sequence packet count";
-    }
-    leaf out-of-sequence-sd {
-      type uint32;
-      description
-        "Out of sequence packet count";
-    }
-    leaf out-of-sequence-ds {
-      type uint32;
-      description
-        "Out of sequence packet count";
-    }
-    leaf out-of-sequence-both {
-      type uint32;
-      description
-        "Out of sequence packet count";
-    }
-    leaf skipped-packets {
-      type uint32;
-      description
-        "Skipped packet count";
-    }
-    leaf unprocessed-packets {
-      type uint32;
-      description
-        "Unprocessed packet count";
-    }
-    leaf packet-loss {
-      type uint32;
-      description
-        "Lost packet count";
-    }
-    leaf loss-period-count {
-      type uint32;
-      description
-        "Loss period count";
-    }
-    leaf loss-period-len-min {
-      type uint32;
-      description
-        "Shortest loss period length";
-    }
-    leaf loss-period-len-max {
-      type uint32;
-      description
-        "Longest loss period length";
-    }
-    leaf inter-loss-period-len-min {
-      type uint32;
-      description
-        "Shortest inter loss period length";
-    }
-    leaf inter-loss-period-len-max {
-      type uint32;
-      description
-        "Longest inter loss period length";
-    }
-  }
-
-  grouping stats {
-    description
-      "Statistics";
-    container rtt {
-      description
-        "RTT value";
-      uses ip-sla-ios-xe-oper:rtt;
-    }
-    container oneway-latency {
-      description
-        "Latency information";
-      uses ip-sla-ios-xe-oper:oneway-latency;
-    }
-    container jitter {
-      description
-        "Jitter information";
-      uses ip-sla-ios-xe-oper:jitter;
-    }
-    container over-threshold {
-      description
-        "Over threshold information";
-      uses ip-sla-ios-xe-oper:over-threshold;
-    }
-    container packet-loss {
-      when "(../../oper-type!='oper-type-icmp-jitter')";
-      description
-        "Packet loss information";
-      uses ip-sla-ios-xe-oper:packet-loss;
-    }
-    container icmp-packet-loss {
-      when "(../../oper-type='oper-type-icmp-jitter')";
-      description
-        "ICMP packet loss information";
-      uses ip-sla-ios-xe-oper:icmp-packet-loss;
-    }
-    container voice-score {
-      description
-        "Voice score information";
-      uses ip-sla-ios-xe-oper:voice-score;
-    }
-  }
-
-  grouping sla-oper-entry {
-    description
-      "SLA operational data entry";
-    leaf oper-id {
-      type uint32;
-      description
-        "Entry unique identifier";
-    }
-    leaf oper-type {
-      type ip-sla-ios-xe-oper:sla-oper-type;
-      description
-        "Entry type";
-    }
-    leaf latest-return-code {
-      type ip-sla-ios-xe-oper:sla-return-code;
-      description
-        "Latest return code";
-    }
-    leaf success-count {
-      type uint32;
-      description
-        "Success count";
-    }
-    leaf failure-count {
-      type uint32;
-      description
-        "Failure count";
-    }
-    leaf latest-oper-start-time {
-      type yang:date-and-time;
-      description
-        "Latest start time";
-    }
-    container rtt-info {
-      description
-        "RTT information";
-      uses ip-sla-ios-xe-oper:rtt-info;
-    }
-    container measure-stats {
-      when "(../oper-type='oper-type-y1731-delay') or (../oper-type='oper-type-y1731-loss')";
-      description
-        "Measured statistics";
-      uses ip-sla-ios-xe-oper:y1731-interval-stats;
-    }
-    container stats {
-      when "(../oper-type!='oper-type-unknown') and(../oper-type!='oper-type-y1731-delay') and(../oper-type!='oper-type-y1731-loss')";
-      description
-        "Statistics";
-      uses ip-sla-ios-xe-oper:stats;
-    }
-  }
-
-  container ip-sla-stats {
-    config false;
-    description
-      "Data nodes for All IP SLA Statistics";
-    list sla-oper-entry {
-      key "oper-id";
-      description
-        "The list of IP SLA operations with statistics info";
-      uses ip-sla-ios-xe-oper:sla-oper-entry;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip.yang
deleted file mode 100644
index 460776b49..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ip.yang
+++ /dev/null
@@ -1,2499 +0,0 @@
-submodule Cisco-IOS-XE-ip {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  import Cisco-IOS-XE-interface-common {
-    prefix ios-ifc;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native IP Yang Model.
-     Copyright (c) 2016-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-10-13 {                                                          
-     description                                                                  
-       "added model for ip route vrf topology and ip route topology";             
-  }
-  revision 2018-10-09 {
-    description
-      "Make dhcp option available to 'ip route' following outgoing interface";
-  }
-  revision 2018-10-08 {
-    description
-      "Add must constraint to ip route vrf, on vrf & address-family";
-  }
-  revision 2018-09-26 {
-    description
-      "Add cli-disallow-value 'dhcp|DHCP' to 'ip route' for non-dhcp configs";
-  }
-  revision 2018-09-06 {
-    description
-      "Added support to all option under 'ip route static install-routes-recurse-via-nexthop'";
-  }
-  revision 2018-08-20 {
-    description
-      "add more support to vrf definition";
-  }
-  revision 2018-08-03 {
-    description
-      "Corrected ip prefix-list model to make one entry with one representation with seq";
-  }
-  revision 2018-07-11 {
-    description
-     "add support to vrf definition rd to use rd asn dot notation";
-  }
-  revision 2018-05-09 {
-    description
-      "stitching leaf moved to the vrf group";
-  }
-  revision 2018-05-03 {
-    description
-      "stitching leaf added in vrf definition";
-  }
- 
-  revision 2018-04-04 {
-    description
-      "add tailf:cli-remove-before-change for vrf definition rd";
-  }
-
-  revision 2018-03-12 {
-    description
-      "Add dependency to 'export map' on rd, in order to match CLI behavior";
-  }
-
-  revision 2018-02-09 {
-    description
-      "fix ip prefix-list deleting issue";
-  }
-
-  revision 2018-02-02 {
-    description
-      "Change ip domain to leaf-list to match IOS behavior";
-  }
-
-  revision 2018-01-11 {
-    description
-      "Support ip host and ip host vrf replacement";
-  }
-
-  revision 2017-10-25 {
-    description
-      "Support ip host and ip host vrf with multiple ipv4/ipv6 address";
-  }
-
-  revision 2017-08-28 {
-    description
-      "Extend modeling for multicast";
-  }
-
-   revision 2017-07-24 {
-     description
-       "Add ip ssh server peruser session limit";
-   }
-
-   revision 2017-06-29 {
-     description
-       "This revision fixes the compiling warning in ip route";
-   }
- 
-   revision 2017-06-27 {
-     description
-       "Add maxstartups to ssh-server";
-   }
-
-   revision 2017-05-17 {
-    description
-      "This revision fixes the problem in ip route";
-  }
-
-  revision 2017-04-10 {
-    description
-      "This revision fixes the problem where CDB not updated when configuring
-      through CLI for ip routing protocol purge interface";
-  }
-
-  revision 2017-03-14 {
-    description
-      "This revision fixes the problem where interface Loopback joining with
-      its name in display";
-  }
-
-  revision 2017-03-02 {
-    description
-      "This revision enhances NED model for IWAN 3.0.2 Ph 1 - Misc Config:
-       - adds config-ip-ssh-algorithm-grouping grouping.
-       - adds vrf list node under host node";
-  }
-  
-  revision 2017-02-23 {
-    description
-      "This revision adds support for IP explicit-path";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  // Router Distinguisher
-  typedef rd-type {
-    type string {
-      pattern "(\\d*(.\\d*)*)?:(\\d*(.\\d*)*)?";
-    }
-  }
-
-  typedef mdt-data-list-type {
-    type union {
-      type uint16 {
-        range "100..199";
-      }
-      type uint16 {
-        range "2000..2699";
-      }
-      type string {
-        pattern "[a-fA-F].*";
-      }
-    }
-  }
-
-  typedef vpn-id-type {
-    type string {
-      pattern "[0-9a-fA-F][0-9a-fA-F]?[0-9a-fA-F]?:[0-9a-fA-F][0-9a-fA-F]?[0-9a-fA-F]?[0-9a-fA-F]?";
-    }
-  }
-
-  grouping ip-route-static-bfd-group-grouping {
-    leaf group {
-      description "assign a bfd group";
-      type string;
-    }
-    leaf passive {
-      description "passive member of the group";
-      when "../group";
-      type empty;
-    }
-    leaf log {
-      description "Log changes in BFD Up/Down events";
-      type empty;
-    }
-    leaf unassociate {
-      description "Static Route not associated";
-      type empty;
-    }
-  }
-
-  grouping ip-route-static-bfd-ip-grouping {
-    list ipv4_addr {
-      key "ipv4_des";
-      leaf ipv4_des {
-        description "Multihop BFD Destination IP address";
-        type inet:ipv4-address;
-      }
-      list vrf {
-        description "Source VRF name";
-        key "name ipv4_source";
-        leaf name {
-          must "(/ios:native/ios:vrf/ios:definition[ios:name=current()] and
-                 /ios:native/ios:vrf/ios:definition[ios:name=current()]/ios:address-family/ios:ipv4) or
-                 /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
-            error-message "% vrf does not exist. Create first";
-          }
-          type string;
-        }
-        leaf ipv4_source {
-          type inet:ipv4-address;
-        }
-        uses ip-route-static-bfd-group-grouping;
-      }
-      list ipv4 {
-        key "ipv4_source";
-        leaf ipv4_source {
-          type inet:ipv4-address;
-        }
-        uses ip-route-static-bfd-group-grouping;
-      }
-    }
-  }
-
-  grouping vrf-default-route-target-grouping {
-    choice export-choice {
-      leaf export {
-        type empty;
-      }
-      container export-asn {
-        list export {
-          description
-            "Export Target-VPN community";
-          key "asn-ip";
-          leaf asn-ip {
-            type ios-types:asn-ip-type;
-          }
-        }
-      }
-    }
-    choice import-choice {
-      leaf import {
-        type empty;
-      }
-      container import-asn {
-        list import {
-          description
-            "Import Target-VPN community";
-          key "asn-ip";
-          leaf asn-ip {
-            type ios-types:asn-ip-type;
-          }
-        }
-      }
-    }
-  }
-
-  grouping vrf-route-target-grouping {
-    list export {
-      description
-        "Export Target-VPN community";
-      key "asn-ip";
-      leaf asn-ip {
-        type ios-types:asn-ip-type;
-      }
-      leaf stitching {
-        description
-           "VXLAN route target set";
-           type empty;
-      }
-    }
-    list import {
-      description
-        "Import Target-VPN community";
-      key "asn-ip";
-      leaf asn-ip {
-        type ios-types:asn-ip-type;
-      }
-      leaf stitching {
-        description
-           "VXLAN route target set";
-           type empty;
-      }
-    }
-  }
-
-  grouping vrf-maximum-grouping {
-    container maximum {
-      description
-        "Maximum number of routes allowed in this routing table";
-      presence "Maximum number of routes allowed in this routing table";
-      leaf routes {
-        description
-          "Maximum number of routes allowed in this routing table";
-        type uint32 {
-          range "1..4294967295";
-        }
-      }
-      choice maximum-choice {
-        mandatory true;
-        case threshold-case {
-          leaf threshold {
-            description
-              "Threshold";
-            type uint16 {
-              range "1..100";
-            }
-          }
-          leaf reinstall {
-            description
-              "Reinstall previous rejected route due to over maximum route limit";
-            type uint16 {
-              range "1..100";
-            }
-          }
-        }
-        case warning-case {
-          leaf warning-only {
-            description
-              "Only give a warning message if is limit exceeded";
-            type empty;
-          }
-        }
-      }
-    }
-  }
-
-  grouping vrf-loopback-grouping {
-    leaf Loopback {
-      description
-        "Loopback interface number";
-      type uint32 {
-        range "0..2147483647";
-      }
-    }
-  }
-
-  grouping conf-vrf-definition-default-grouping {
-    // vrf definition * / description
-    leaf description {
-      description
-        "VRF specific description";
-        type empty;
-    }
-    // vrf definition * / ipv4
-    container ipv4 {
-      description 
-        "VRF IPv4 configuration";
-      container multicast {
-        description
-          "IP multicast configuration";
-        leaf multitopology {
-          description
-            "Enable Multicast-Specific RPF Topology";
-          type empty;
-        }
-      } 
-    }
-    // vrf definition * / ipv6
-    container ipv6 {
-      description 
-        "VRF IPv6 configuration";
-      container multicast {
-        description
-          "IP multicast configuration";
-        leaf multitopology {
-          description
-            "Enable Multicast-Specific RPF Topology";
-          type empty;
-        }
-      } 
-    }
-    // vrf definition * / rd
-    leaf rd {
-      description
-        "Specify Route Distinguisher";
-      type ios-types:asn-ip-type;
-    }
-
-    // vrf definition * / address-family
-    container address-family {
-      description
-        "Enter Address Family command mode";
-      // vrf definition * / address-family ipv4
-      container ipv4 {
-        description
-          "Address family";
-        presence "true";
-        choice modifier {
-          leaf unicast {
-            type empty;
-          }
-          leaf multicast {
-            type empty;
-          }
-        }
-      }
-      container ipv6 {
-        description
-          "Address family";
-        presence "true";
-        choice modifier {
-          leaf unicast {
-            type empty;
-          }
-          leaf multicast {
-            type empty;
-          }
-        }
-      }
-    }
-    // vrf definition * / route-target
-    container route-target {
-      description
-        "Specify Target VPN Extended Communities";
-      choice def-route-target {
-        case emtpy-rt-case {
-          leaf empty-rt {
-            type empty;
-          }
-        }
-        case default-rt { 
-          uses vrf-default-route-target-grouping;
-        }    
-      }
-    }
-    //  vnet            Virtual NETworking configuration
-    container vnet {
-      description
-        "Virtual NETworking configuration";
-      leaf tag {
-        description
-          "use default tag";
-        type empty;
-      }
-    }
-
-    // vrf definition * / vpn
-    container vpn {
-      description
-        "Configure VPN ID as specified in rfc2685";
-      leaf id {
-        description
-          "use default VPN ID";
-        type empty;
-      }
-    }
-  }
-
-  grouping config-vrf-definition-grouping {
-    container vrf { 
-      description
-        "VRF commands";
-      // vrf definition *
-      list definition {
-        description
-          "VRF definition mode";
-        key "name";
-        leaf name {
-          description
-            "WORD;;VRF name";
-          type string;
-        }
-        // vrf definition * / default
-        container default {
-          uses conf-vrf-definition-default-grouping;
-        } 
-        // vrf definition * / description
-        leaf description {
-          description
-            "VRF specific description";
-          type string {
-            length "1..244";
-          }
-        }
-        // vrf definition * / ipv4
-        container ipv4 {
-          description 
-            "VRF IPv4 configuration";
-          container multicast {
-            description
-              "IP multicast configuration";
-            leaf multitopology {
-              description
-                "Enable Multicast-Specific RPF Topology";
-              type empty;
-            }
-          } 
-        }
-        // vrf definition * / ipv6
-        container ipv6 {
-          description 
-            "VRF IPv6 configuration";
-          container multicast {
-            description
-              "IP multicast configuration";
-            leaf multitopology {
-              description
-                "Enable Multicast-Specific RPF Topology";
-              type empty;
-            }
-          } 
-        }
-        // vrf definition * / rd
-        leaf rd {
-          description
-            "Specify Route Distinguisher";
-          type ios-types:asn-ip-type;
-        }
-        // vrf definition * / address-family
-        container address-family {
-          description
-            "Enter Address Family command mode";
-          // vrf definition * / address-family ipv4
-          container ipv4 {
-            description
-              "Address family";
-            presence "true";
-            container export {
-              description
-                "VRF export";
-              leaf map {
-                description
-                  "WORD;;Route-map reference";
-                must "../../../../rd" {
-                  error-message "%vrf does not have rd configured, please configure rd before configuring export route-map";
-                }
-                type string;
-              }
-            }
-
-            // vrf definition */ address-family ipv4 / maximum;
-            uses vrf-maximum-grouping;
-
-            //  inter-as-hybrid      Inter AS hybrid mode
-            //  maximum              Set a limit
-            // vrf definition * / address-family ipv4 mdt
-            container mdt {
-              description
-                "Backbone Multicast Distribution Tree";
-              container default {
-                description
-                  "The default group";
-                leaf address {
-                  type inet:ipv4-address;
-                }
-                container mpls {
-                  description
-                    "MPLS tunnel options";
-                  leaf mldp {
-                    description
-                      "Use a MLDP LSP to create the default MDT";
-                    type inet:ipv4-address;
-                  }
-                }
-              }
-              container auto-discovery {
-                description
-                  "BGP auto-discovery for MVPN";
-                leaf pim {
-                  description
-                    "BGP auto-discovery for PIM";
-                  type empty;
-                }
-              }
-              container data {
-                description
-                  "MDT data trees";
-                list multicast {
-                  key "address wildcard";
-                  leaf address {
-                    type inet:ipv4-address;
-                  }
-                  leaf wildcard {
-                    type inet:ipv4-address;
-                  }
-                }
-                leaf list {
-                  description
-                    "Access-list";
-                  type ios-types:ext-acl-type;
-                }
-                // mpls     MPLS tunnel options
-                leaf threshold {
-                  description
-                    "MDT switching threshold";
-                  type uint32;
-                }
-              }
-              leaf log-reuse {
-                description
-                  "Event logging for data MDT reuse";
-                type empty;
-              }
-              leaf mtu {
-                description
-                  "The MTU";
-                type uint16 {
-                  range "576..18010";
-                }
-              }
-              container overlay {
-                description
-                  "MDT Overlay Protocol";
-                leaf use-bgp {
-                  description
-                    "Use BGP for Overlay Signaling";
-                  type empty;
-                }
-              }
-              leaf-list preference {
-                description
-                  "MDT preference (default pim mldp)";
-                type enumeration {
-                  enum "mldp";
-                  enum "pim";
-                }
-              }
-            }
-            //  route-replicate      Replicate (import) routes..
-            // ..from another topology (and another VRF)
-            container route-target {
-              description
-                "Specify Target VPN Extended Communities";
-              uses vrf-route-target-grouping;
-            }
-            //  bgp                  Commands pertaining to BGP
-            container bgp {
-              description
-                "Commands pertaining to BGP";
-              container next-hop {
-                description
-                  "Next-hop for the routes of a VRF in the backbone";
-		uses vrf-loopback-grouping;
-              }
-            }
-            //  import               VRF import
-            container import {
-              description
-                "VRF import";
-              leaf  map {
-                description
-                  "Route-map based VRF import";
-                type string;
-              }
-            }
-            //  snmp                 Modify snmp parameters
-          }
-          // vrf definition * / address-family ipv6
-          container ipv6 {
-            description
-              "Address family";
-            presence "true";
-            //  exit-address-family  Exit from vrf
-            //                       address-family configuration submode
-            //  export               VRF export
-            //  inter-as-hybrid      Inter AS hybrid mode
-            //  maximum              Set a limit
-            // vrf definition * / address-family ipv6 mdt
-            container mdt {
-              description
-                "Backbone Multicast Distribution Tree";
-              leaf mtu {
-                description
-                  "The MTU";
-                type uint16 {
-                  range "576..18010";
-                }
-              }
-            }
-            //  route-target         Specify Target VPN Extended Communities
-            container route-target {
-              description
-                "Specify Target VPN Extended Communities";
-              uses vrf-route-target-grouping;
-            }
-            //  bgp                  Commands pertaining to BGP
-            container bgp {
-              description
-                "Commands pertaining to BGP";
-              container next-hop {
-                description
-                  "Next-hop for the routes of a VRF in the backbone";
-                choice ipv4-ipv6 {
-                  container ipv4 {
-                    description
-                      "Use ipv4 address of the Loopback";
-		    uses vrf-loopback-grouping;
-                  }
-                  container ipv6 {
-                    description
-                      "Use ipv6 address of the Loopback";
-		    uses vrf-loopback-grouping;
-                  }
-                }
-              }
-            }
-            //  import               VRF import
-            container import {
-              description
-                "VRF import";
-              leaf  map {
-                description
-                  "Route-map based VRF import";
-                type string;
-              }
-            }
-            //  snmp                 Modify snmp parameters
-          }
-        }
-        // vrf definition * / route-target
-        container route-target {
-          description
-            "Specify Target VPN Extended Communities";
-          uses vrf-route-target-grouping;
-        }
-        //  vnet            Virtual NETworking configuration
-        container vnet {
-          description
-            "Virtual NETworking configuration";
-          leaf tag {
-            description
-              "Identifier used to tag packets associated with this VNET";
-            type uint16 {
-              range "2..4094";
-            }
-          }
-        }
-        // vrf definition * / vpn
-        container vpn {
-          description
-            "Configure VPN ID as specified in rfc2685";
-          leaf id {
-            description
-              "Configure VPN ID in rfc2685 format";
-            type vpn-id-type;
-          }
-        }
-      }
-      // list "list" {
-      //   key id;
-      // }
-      //  selection    selection criteria
-      //  upgrade-cli  upgrade cli
-    }
-  }
-
-  grouping password-grouping {
-    container password-container {
-      leaf encryption {
-        type uint8 {
-          range "0..7";
-        }
-      }
-      leaf password {
-        type string {
-          pattern "([1-680-9a-zA-Z].*)|(0.+)|(7.+)";
-          //length "1..80";
-        }
-      }
-    }
-  }
-
-  grouping ip-route-dhcp-grouping {
-    leaf dhcp {
-      description
-        "Default Gateway obtained from DHCP";
-      type empty;
-    }
-  }
-
-  grouping ip-route-dhcp-only-options-grouping {
-    uses ip-route-dhcp-grouping;
-    leaf metric {
-      type uint8 {
-        range "1..255";
-      }
-    }
-  }
-  grouping ip-route-options-grouping {
-    leaf metric {
-      type uint8 {
-        range "1..255";
-      }
-    }
-    leaf global {
-      description
-        "Next hop address is global";
-      type empty;
-    }
-    leaf name {
-      description
-        "Specify name of the next hop";
-      type string;
-    }
-    leaf permanent {
-      description
-        "permanent route";
-      type empty;
-    }
-    leaf multicast {
-      description
-        "multicast route";
-      type empty;
-    }
-    leaf tag {
-      description
-        "Set tag for this route";
-      type uint32 {
-        range "1..4294967295";
-      }
-    }
-    leaf track {
-      description
-        "Install route depending on tracked item";
-      type uint16 {
-        range "1..1000";
-      }
-    }
-  }
-
- grouping ip-route-grouping-min-elements {
-    list ip-route-interface-forwarding-list {
-      key "prefix mask";
-      min-elements 1;
-      leaf prefix {
-        type inet:ipv4-address;
-      }
-      leaf mask {
-        type inet:ipv4-address;
-      }
-      uses ip-route-dhcp-only-options-grouping;
-      list fwd-list {
-        key fwd;
-        leaf fwd {
-            type union {
-               type enumeration {
-                  enum "Null0" {
-                  }
-               }
-               type inet:ipv4-address;
-               type string;
-            }
-        }
-        list interface-next-hop {
-          key ip-address;
-          leaf ip-address {
-            type inet:ipv4-address;
-          }
-          uses ip-route-options-grouping;
-        }
-        uses ip-route-dhcp-grouping;
-        uses ip-route-options-grouping;
-      }
-    }
-  }
-
-  grouping ip-route-grouping {
-    list ip-route-interface-forwarding-list {
-      key "prefix mask";
-      leaf prefix {
-        type inet:ipv4-address;
-      }
-      leaf mask {
-        type inet:ipv4-address;
-      }
-      uses ip-route-dhcp-only-options-grouping;
-      list fwd-list {
-        key fwd;
-        leaf fwd {
-            type union {
-               type enumeration {
-                  enum "Null0" {
-                  }
-               }
-               type inet:ipv4-address;
-               type string;
-            }
-        }
-        list interface-next-hop {
-          key ip-address;
-          leaf ip-address {
-            type inet:ipv4-address;
-          }
-          uses ip-route-options-grouping;
-        }
-        uses ip-route-dhcp-grouping;
-        uses ip-route-options-grouping;
-      }
-    }
-  }
-
-  grouping ip-exp-path-mode-cfg-grouping {
-    // ip explicit-path * / index
-    list index {
-      description
-        "Specify the next entry index to add, edit (or delete): <1..65535>";
-      key "idx";
-      leaf idx {
-        type uint32 {
-          range "1..65535";
-        }
-      }
-      choice ip-exp-path-option {
-        container next-address {
-          description
-            "Specify the next address in the path";
-          leaf loose {
-            description
-              "Target IPv4 address is loose";
-            type empty;
-          }
-          leaf ipv4 {
-            description
-              "Target IPv4 address (strict)";
-            type inet:ipv4-address;
-          }
-        }
-        leaf next-label {
-          description
-            "Specify the next MPLS label in the path: <0..1048575>";
-          type uint32 {
-            range "0..1048575";
-          }
-        }
-        leaf exclude-address {
-          description
-            "Exclude an address from subsequent partial path segments";
-          type inet:ipv4-address;
-        }
-        leaf exclude-srlg {
-          description
-            "Specify an address to get SRLGs from for exclusion";
-          type inet:ipv4-address;
-        }
-      }
-    }
-  }
-
-  grouping config-ip-ssh-algorithm-grouping {
-    container algorithm {
-      description 
-        "Configure different algorithms used in SSH";
-      container encryption {
-        description 
-          "Encryption algorithms advertised to other party";
-        leaf aes128-ctr {
-          description
-            "AES with 128-bit key in CTR mode";
-          type empty;
-        }
-        leaf aes192-ctr {
-          description
-            "AEC with 192-bit key in CTR mode";
-          type empty;
-        }
-        leaf aes256-ctr {
-          description
-            "AEC with 256-bit key in CTR mode";
-          type empty;
-        }
-      }  
-    }    
-  }
-
-  grouping config-ip-grouping {
-    container ip {
-      description
-        "Global IP configuration subcommands";
-      // ip mroute
-      // @mount Cisco-IOS-XE-multicast.yang
-
-       container ospf {
-         description
-           "Configure for ospf";
-         leaf name-lookup {
-           description
-             "Display OSPF router ids as DNS names";
-           type empty;
-         }
-       }
-
-      //ip admission
-      container admission { 
-        description
-          "Network Admission Control (NAC)";
-        container watch-list {
-          description
-            "Watch-list";
-          leaf expiry-time {
-            description
-              "Configure expiry time for watch-list entries";
-            type uint16{
-              range "0..35791";
-            }
-          }
-        }
-        container name {
-          description
-            "Specify an Authentication Proxy Rule";
-          container webauth {
-            description "help";
-            container proxy {
-              description
-                "Authentication Proxy Protocol";
-              leaf http {
-                description
-                  "HTTP Protocol";
-                type empty;
-              }
-            }
-          }
-        }
-      }
-
-      //ip radius
-      //@ mount Cisco-IOS-XE-aaa
-
-      //ip arp
-      container arp { 
-        description
-          "IP ARP global configuration";
-        container incomplete {
-          description "Fine-tune the ARP Retry parameters";
-          leaf entries {
-            description "Specify the number of IP addresses to resolve";
-            type uint32 {
-              range "1..2147483647";
-            }
-          }
-        }
-        container inspection {
-          description
-            "Arp Inspection configuration";
-          list filter {
-            description "Specify ARP acl to be applied";
-            key arpacl ;
-            leaf arpacl {
-              type string;
-            }
-            list vlan {
-              description "Vlans to apply the filter";
-              key vlan-range;
-              leaf vlan-range{
-                type string;
-              }
-              leaf static {
-                description "Apply the ACL statically";
-                type empty;
-              }
-            }
-          }
-          container validate {
-            description "Validate addresses";
-            leaf src-mac {
-              description "Validate source MAC address";
-              type empty;
-            }
-            leaf dst-mac {
-              description "Validate destination MAC address";
-              type empty;
-            }
-            leaf ip {
-              description "Validate IP addresses";
-              type empty;
-            }
-            container allow{
-              leaf zeros{
-                description "Allow 0.0.0.0 sender IP address";
-                type empty;
-              }
-            }
-          }
-          container log-buffer {
-            description
-              "Log Buffer Configuration";
-            leaf entries {
-              description
-                "Number of entries for log buffer";
-              type uint16 {
-                range "0..1024";
-              }
-            }
-            container logs {
-              description
-                "Number of logs per interval";
-              leaf entries {
-                description
-                  "Number of entries for log buffer";
-                type uint16 {
-                  range "0..1024";
-                }
-              }
-              leaf interval {
-                description
-                  "Interval for controlling logging rate";
-                type uint32 {
-                  range "0..86400";
-                }
-              }
-            }
-          }
-          leaf vlan {
-            description
-              "Enable/Disable ARP Inspection on vlans";
-            type string;
-          }
-        }
-        // ip arp proxy
-        container proxy {
-          description
-            "Gratuitous ARP control";
-          leaf disable {
-            description
-              "Disable proxy ARP on all interfaces";
-            type empty;
-          }
-        }
-      }
-
-      //ip domain-list
-      container domain-list { 
-        description
-          "Domain name to complete unqualified host names";
-        leaf domain-name {
-          type string;
-        }
-        container vrf {
-          description
-            "Specify VRF";
-          leaf vrf-name {
-            type string;
-          }
-          leaf domain-name {
-            type string;
-          }
-        }
-      }
-
-      //ip finger
-      container finger { 
-        description
-          "finger server";
-        presence "true";
-      }
-
-      // @mount Cisco-IOS-XE-icmp
-
-      //ip rcmd
-      container rcmd { 
-        description
-          "Rcmd commands";
-        leaf rcp-enable {
-          description
-            "Enable server side of RCP";
-          type empty;
-        }
-        leaf rsh-enable {
-          description
-            "Enable server side of RSh";
-          type empty;
-        }
-      }
-
-      // ip subnet-zero
-      leaf subnet-zero { 
-        description
-          "Allow 'subnet zero' subnets";
-        type boolean;
-      }
-
-      // ip bgp-community
-      container bgp-community {
-        description
-          "format for BGP community";
-        leaf new-format {
-          description
-            "select aa:nn format for BGP community";
-          type empty;
-        }
-      }
-
-      //ip host-routing
-      leaf host-routing { 
-        description
-          "Enable host-based routing (proxy ARP and redirect)";
-        type empty;
-      }
-
-      //@mount Cisco-IOS-XE-msdp
-
-      // ip vrf *
-      list vrf { 
-        description
-          "Configure an IP VPN Routing/Forwarding instance";
-        key "name";
-        leaf name {
-          description
-            "WORD;;VPN Routing/Forwarding instance name";
-          type string;
-        }
-        // ip vrf * / bgp
-        container bgp {
-          description
-            "Commands pertaining to BGP";
-          container next-hop {
-            description
-              "Next-hop for the routes of a VRF in the backbone";
-            leaf Loopback {
-              description
-                "Loopback interface number";
-              type uint32 {
-                range "0..2147483647";
-              }
-            }
-          }
-        }
-        // ip vrf * / context
-        leaf context {
-          description
-            "Associate SNMP context with this vrf";
-          type string;
-        }
-        leaf description {
-          description
-            "VRF specific description";
-          type string {
-            length "1..244";
-          }
-        }
-        // ip vrf * / rd
-        leaf rd {
-          description
-            "Specify Route Distinguisher";
-          type rd-type;
-        }
-        // ip vrf * / export
-        container export {
-          description
-            "VRF export";
-                leaf map {
-                 description
-                   "Route-map based VRF export";
-                 type string;  
-               }
-               container ipv4 {
-                 description
-                   "Address family based VRF export";
-                 leaf ipv4-type {
-                   type enumeration {
-                     enum "unicast" {
-                     }
-                     enum "multicast" { 
-                     }
-                   }
-                 }
-                 choice map-choice {
-                   case upper-limit-case { 
-                     leaf upper-limit {
-                       type uint32 {
-                         range "1..2147483647";
-                       }
-                     }
-                     leaf map {
-                       description
-                       "Route-map based VRF export";
-                       type string;
-                     }
-                   } 
-                   case map-only-case {
-                     leaf map-only {
-                       description
-                       "Route-map based VRF export";
-                       type string;
-                     }
-                   }
-                 } 
-               }
-             }
-
-        // ip vrf * / import
-        container import {
-          // NOTE: needs special treatment when talking to backend
-          // broken in real c7200 CLI
-          description
-            "VRF import";
-          choice import-choice {
-            leaf map {
-              description
-                "Route-map based VRF import";
-              type string;
-            }
-            container ipv4 {
-              description
-                "Address family based VRF import";
-              leaf ipv4-type {
-                type enumeration {
-                  enum "unicast" {
-                  }
-                  enum "multicast" {
-                  }
-                }
-              }
-              leaf upper-limit {
-                type uint32 {
-                  range "1..2147483647";
-                }
-              }
-              leaf map {
-                description
-                  "Route-map based VRF import";
-                type string;
-              }
-            }
-          }
-        }
-        // ip vrf * / maximum
-        uses vrf-maximum-grouping;
-
-        // ip vrf * / mdt
-        container mdt {
-          description
-            "Backbone Multicast Distribution Tree";
-          presence "Backbone Multicast Distribution Tree";
-          leaf default {
-            description
-              "The default group";
-            type inet:ipv4-address;
-          }
-          leaf log-reuse {
-            description
-              "Event logging for data MDT reuse";
-            type empty;
-          }
-          container data {
-            description
-              "MDT data group range";
-            leaf mulicast-address {
-              type inet:ipv4-address;
-            }
-            leaf wildcard-bits {
-              type inet:ipv4-address;
-            }
-            choice mdt-data-choice {
-              case mdt-data-threshold {
-                leaf threshold {
-                  description
-                    "MDT switching threshold";
-                  type uint32 {
-                    range "1..4294967";
-                  }
-                }
-                leaf threshold-list {
-                  description
-                    "Access-list";
-                  type mdt-data-list-type;
-                }
-              }
-              case mdt-data-list {
-                leaf list {
-                  description
-                    "Access-list";
-                  type mdt-data-list-type;
-                }
-              }
-            }
-          }
-        }
-        // ip vrf * / route-target
-        list route-target {
-          description
-            "Specify Target VPN Extended Communities";
-          key "direction target";
-          // NOTE: the Cisco CLI does not require you to give
-          // the direction, it will default to 'export' if not
-          // given.
-          leaf direction {
-            type enumeration {
-              enum "both";
-              enum "export" {
-              }
-              enum "import" {
-              }
-            }
-          }
-          leaf target {
-            type rd-type;
-          }
-        }
-        // ip vrf * / vpn
-        container vpn {
-          description
-            "Configure VPN ID as specified in rfc2685";
-          leaf id {
-            description
-              "Configure VPN ID in rfc2685 format";
-            type vpn-id-type;
-          }
-        }
-      }
-
-      // ip multicast-routing
-      // @mount Cisco-IOS-XE-multicast
-
-      // ip as-path
-      container as-path { 
-        description
-          "BGP autonomous system path filter";
-        //@mount cisco-ios-native-community-list
-      }
-
-      // ip local
-      container local {
-        description
-          "Specify local options";
-        // ip local pool *
-        list pool {
-          description
-            "IP Local address pool lists";
-          key "id";
-          leaf id {
-            type union {
-              type string;
-              type enumeration {
-                enum "default";
-              }
-            }
-          }
-          leaf start {
-            type inet:ipv4-address;
-          }
-          leaf last {
-            type inet:ipv4-address;
-          }
-          leaf group {
-            description
-              "Create ip local pool group";
-            type string;
-          }
-        }
-      }
-
-      // ip cef
-      container cef {
-        description
-          "Cisco Express Forwarding";
-        presence "true";
-      }
-
-      // ip classless
-      leaf classless { 
-        description
-          "Follow classless routing forwarding rules";
-        type empty;
-      }
-
-      // ip domain
-      container domain { 
-        description
-          "IP DNS Resolver";
-        container list {
-          description
-            "Domain name to complete unqualified host names";
-          leaf-list domain-name {
-            type string;
-          }
-          container vrf {
-            description
-              "Specify VRF";
-            leaf vrf-name {
-              type string;
-            }
-            leaf domain-name {
-              type string;
-            }
-          }
-        }
-        // ip domain lookup
-        leaf lookup {
-          description
-            "Enable IP Domain Name System hostname translation";
-          type boolean;
-        }
-        container lookup-settings {
-          container lookup {
-            description
-              "Enable IP Domain Name System hostname translation";
-            leaf nsap {
-              description
-                "Enable IP DNS queries for CLNS NSAP addresses";
-              type empty;
-            }
-            container source-interface {
-              description
-                "Specify source interface for DNS resolver";
-              uses ios-ifc:interface-grouping;
-            }
-          }
-          leaf name {
-            description
-              "Define the default domain name";
-            type string;
-          }
-        }
-        // ip domain name
-        leaf name {
-          description
-            "Define the default domain name";
-          type string;
-        }
-      }
-      // ip domain-lookup
-      container domain-lookup-conf { 
-        leaf domain-lookup {
-          type boolean;
-        }
-      }
-      container domain-lookup { 
-        description
-          "Enable IP Domain Name System hostname translation";
-        presence "true";
-        leaf nsap {
-          description
-            "Enable IP DNS queries for CLNS NSAP addresses";
-          type empty;
-        }
-        container source-interface {
-          description
-            "Specify source interface for DNS resolver";
-          uses ios-ifc:interface-grouping;
-        }
-      }
-      // ip domain-name
-      leaf domain-name { 
-        description
-          "Define the default domain name";
-        type string;
-      }
-      // ip dns
-      container dns { 
-        description
-          "Configure DNS server for a zone";
-        container server {
-          description
-            "Enable DNS server";
-          presence "true";
-        }
-      }
-
-      // ip default-gateway
-      leaf default-gateway { 
-        description
-          "Specify default gateway (if not routing IP)";
-        type inet:ipv4-address;
-      }
-
-      // ip dhcp
-      container dhcp {
-        description
-          "Configure DHCP server and relay parameters";
-      }
-
-      // ip flow-cache
-      //@ mount Cisco-IOS-XE-flow 
-
-      //ip flow-export
-      //@ mount Cisco-IOS-XE-flow
-
-      // ip forward-protocol
-      container forward-protocol { 
-        description
-          "Controls forwarding of physical and directed IP broadcasts";
-        choice protocol-choice {
-          leaf protocol {
-            type enumeration {
-              enum "nd";
-              enum "sdns";
-              enum "turbo-flood";
-            }
-          }
-          container spanning-tree {
-            description
-              "Use transparent bridging to flood UDP broadcasts";
-            presence "true";
-            leaf any-local-broadcast {
-              description
-                "Accept any local broadcast when flooding";
-              type empty;
-            }
-          }
-          container udp {
-            description
-              "Packets to a specific UDP port";
-            leaf biff {
-              description
-                "Biff (mail notification, comsat, 512)";
-              type boolean;
-            }
-            leaf bootpc {
-              description
-                "Bootstrap Protocol (BOOTP) client (68)";
-              type boolean;
-            }
-            leaf bootps {
-              description
-                "Bootstrap Protocol (BOOTP) server (67)";
-              type boolean;
-            }
-            leaf discard {
-              description
-                "Discard (9)";
-              type boolean;
-            }
-            leaf dnsix {
-              description
-                "DNSIX security protocol auditing (195)";
-              type boolean;
-            }
-            leaf domain {
-              description
-                "Domain Name Service (DNS, 53)";
-              type boolean;
-            }
-            leaf echo {
-              description
-                "Echo (7)";
-              type boolean;
-            }
-            leaf isakmp {
-              description
-                "Internet Security Association and Key Management Protocol(500)";
-              type boolean;
-            }
-            leaf mobile-ip {
-              description
-                "Mobile IP registration (434)";
-              type boolean;
-            }
-            leaf nameserver {
-              description
-                "IEN116 name service (obsolete, 42)";
-              type boolean;
-            }
-            leaf netbios-dgm {
-              description
-                "NetBios datagram service (138)";
-              type boolean;
-            }
-            leaf netbios-ns {
-              description
-                "NetBios name service (137)";
-              type boolean;
-            }
-            leaf netbios-ss {
-              description
-                "NetBios session service (139)";
-              type boolean;
-            }
-            leaf non500-isakmp {
-              description
-                "Internet Security Association and Key Management Protocol(4500)";
-              type boolean;
-            }
-            leaf ntp {
-              description
-                "Network Time Protocol (123)";
-              type boolean;
-            }
-            leaf pim-auto-rp {
-              description
-                "PIM Auto-RP (496)";
-              type boolean;
-            }
-            leaf rip {
-              description
-                "Routing Information Protocol (router, in.routed, 520)";
-              type boolean;
-            }
-            leaf snmp {
-              description
-                "Simple Network Management Protocol (161)";
-              type boolean;
-            }
-            leaf snmptrap {
-              description
-                "SNMP Traps (162)";
-              type boolean;
-            }
-            leaf sunrpc  {
-              description
-                "Sun Remote Procedure Call (111)";
-              type boolean;
-            }
-            leaf syslog  {
-              description
-                "System Logger (514)";
-              type boolean;
-            }
-            leaf tacacs  {
-              description
-                "TAC Access Control System (49)";
-              type boolean;
-            }
-            leaf talk {
-              description
-                "Talk (517)";
-              type boolean;
-            }
-            leaf tftp {
-              description
-                "Trivial File Transfer Protocol (69)";
-              type boolean;
-            }
-            leaf time {
-              description
-                "Time (37)";
-              type boolean;
-            }
-            leaf who  {
-              description
-                "Who service (rwho, 513)";
-              type boolean;
-            }
-            leaf xdmcp {
-              description
-                "X Display Manager Control Protocol (177)";
-              type boolean;
-            }
-          }
-        }
-      }
-// <no> ip gratuitous-arps
-      container gratuitous-arps-conf {
-        leaf gratuitous-arps {
-          type boolean;
-        }
-      }
-      // ip ftp
-      container ftp { 
-        description
-          "FTP configuration commands";
-        container source-interface {
-          description
-            "Specify interface for source address in FTP connections";
-          uses ios-ifc:interface-grouping;
-        }
-        leaf passive {
-          description
-            "Connect using passive mode";
-          type empty;
-        }
-        container password {
-          description
-            "Specify password for FTP connections;";
-          uses password-grouping;
-        }
-        leaf username {
-          description
-            "Specify username for FTP connections";
-          type string;
-        }
-      }
-
-      // ip telnet
-      container telnet {
-        description
-          "Specify telnet options";
-        leaf source-interface {
-          description
-            "Specify source interface";
-          type string;
-        }
-      }
-
-      // ip host
-      container host { 
-        description
-          "Add an entry to the ip hostname table";
-        list host-list {
-          key "name";
-          leaf name {
-            description "Name of host";   
-            type string;
-          }
-          leaf-list ip-list {
-            description "Host IP address";
-            type inet:ip-address;
-          }
-        }  
-        list vrf {
-          description "Specify VRF";
-          key "vrf-name";
-          leaf vrf-name {
-            description "VRF name";
-            type string;
-          }
-          list host-name {
-            description "Name of host";
-            key "host-name";
-            leaf host-name {
-              description "Name of host";
-              type string;
-            }
-            leaf-list ip-list {
-              description "Host IP address";
-              type inet:ip-address;
-            }
-          }      
-        }
-      }
-
-      //@mount Cisco-IOS-XE-http
-
-      //@mount Cisco-IOS-XE-igmp
-
-      //ip multicast
-      container multicast { 
-        description
-          "Global IP Multicast Commands";
-        //@ mount Cisco-IOS-XE-mcast
-      }
-
-      // ip nat
-      //@ mount Cisco-IOS-XE-nat
-
-      // ip name-server
-      container name-server { 
-        leaf-list no-vrf {
-          type union {
-            type inet:ipv4-address;
-            type inet:ipv6-address;
-          }
-        }
-        list vrf {
-          description "";
-          key "word";
-          leaf word {
-            type string;
-          }
-          leaf server-ip {
-            type union {
-              type inet:ipv4-address;
-              type inet:ipv6-address;
-            }
-          }
-        }
-      }
-
-      // ip pim
-      container pim { 
-        description
-          "PIM global commands";
-        //@ mount Cisco-IOS-XE-mcast
-      }
-
-      // ip prefix-list
-      container prefix-list {
-        description
-          "Build a prefix list";
-        // ip prefix-list *
-        list prefixes {
-          key "name";
-          leaf name {
-            type string {
-              pattern "([^s].*)|(s[^e].*)|(se[^q].*)(seq[^u].*)|(sequ[^e].*)|(seque[^n].*)|(sequen[^c].*)|(sequenc[^e].*)|(sequence[^\\-].*)|(sequence\\-[^n].*)|(sequence\\-n[^u].*)|(sequence\\-nu[^m].*)|(sequence\\-num[^b].*)|(sequence\\-numb[^e].*)|(sequence\\-numbe[^r].*)|(sequence\\-number..*)";
-            }
-          }
-          // ip prefix-list * description
-          leaf description {
-            description
-              "Prefix-list specific description";
-            type string {
-              length "1..80";
-            }
-          }
-          // ip prefix-list * seq *
-          list seq {
-            // NOTE: the seq element is not actually mandatory
-            // in the Cisco CLI. If it isn't give
-            description
-              "sequence number of an entry";
-            key "no";
-            leaf no {
-              type uint32 {
-                range "1..4294967294";
-              }
-            }
-	    leaf action {
-	      type enumeration {
-	        enum permit;
-		enum deny;
-	      }
-	    }
-            leaf ip {
-              type inet:ipv4-prefix;
-            }
-            leaf ge {
-              description
-                "Minimum prefix length to be matched";
-              type uint8 {
-                range "1..32";
-              }
-            }
-            leaf le {
-              description
-                "Maximum prefix length to be matched";
-              type uint8 {
-                range "1..32";
-              }
-            }
-          }
-        }
-        // ip prefix-list sequence-number
-        leaf sequence-number {
-          description
-            "Include/exclude sequence numbers in NVGEN";
-          type empty;
-        }
-      }
-
-      // ip route
-      container route { 
-        description
-          "Establish static routes";
-        uses ip-route-grouping;
-        // ip route profile
-        leaf profile {
-          description
-            "Enable IP routing table profile";
-          type empty;
-        }
-        // ip route static
-        container static {
-          description
-            "Allow static routes";
-          leaf adjust-time {
-            description
-              "Time period for adjusting static routes";
-            type uint8 {
-              range "1..60";
-            }
-          }
-          container bfd {
-            description  
-              "BFD tracked";
-            list iface_name {
-              key "interface ipv4_source";
-              leaf interface {
-                type union {
-                  type enumeration {
-                    enum "Null0" {
-                    }
-                  }
-                  type string;
-                }
-              }
-              leaf ipv4_source {
-                type inet:ipv4-address;
-              }
-              uses ip-route-static-bfd-group-grouping;
-            }
-            uses ip-route-static-bfd-ip-grouping;
-            list vrf {
-              description "Destination VRF name";
-              key "destination_vrf";
-              leaf destination_vrf {
-                must "(/ios:native/ios:vrf/ios:definition[ios:name=current()] and 
-                       /ios:native/ios:vrf/ios:definition[ios:name=current()]/ios:address-family/ios:ipv4) or 
-                       /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
-                  error-message "% vrf does not exist. Create first";
-                }
-                type string;
-              }
-              uses ip-route-static-bfd-ip-grouping;
-            }
-          }
-          container install-routes-recurse-via-nexthop {
-            description 
-              "installing recursive route next hop";
-            leaf all {
-              description
-                "Configure for all default topologies";
-              type empty;
-            }
-
-            container recurse-nexthop {
-              description 
-                "Recursive route next hop's";
-
-              list topology {
-                key "topology-id";
-                leaf topology-id {
-                  description
-                    "Configure recursive static route for a Topology";
-                  type string;
-                }
-                uses routes-recurse-grouping;
-              }
-              list vrf {
-                key "vrf-id";
-                leaf vrf-id {
-                  description 
-                    "Configure static route for a VPN Routing/Forwarding instance";
-                  type string;
-                }
-                uses routes-recurse-grouping;
-              }
-              uses routes-recurse-grouping;
-            }
-
-            leaf install-routes-recurse-via-nexthop {
-              description 
-                "installing recursive route next hop";
-              type empty;
-            }
-
-          }
-          leaf inter-vrf {
-            description
-              "Across VRF interfaces";
-            type empty;
-          }
-        }
-        // ip route vrf *
-        list vrf {
-          description
-            "Configure static route for a VPN Routing/Forwarding instance";
-          key "name";
-          leaf name {
-            must "(/ios:native/ios:vrf/ios:definition[ios:name=current()] and " +
-                  "/ios:native/ios:vrf/ios:definition[ios:name=current()]/ios:address-family/ios:ipv4) or " +
-                 "/ios:native/ios:ip/ios:vrf[ios:name=current()]" {
-              error-message "Please create ipv4 vrf first, and delete the last";
-            }
-            type string;
-          }
-          list topology {
-            description
-              "Configure static route for a Topology Routing/Forwarding instance";
-            key name;
-            leaf "name" {
-              must "not (current() = 'base')" {
-                error-message "only non 'base' topology is allowed";
-              }
-              type string;
-            }
-            list ip-route-interface-forwarding-list {
-              key "prefix mask";
-              leaf prefix {
-                type inet:ipv4-address;
-              }
-              leaf mask {
-                type inet:ipv4-address;
-              }
-              uses ip-route-dhcp-only-options-grouping;
-              list fwd-list {
-                key fwd;
-                leaf fwd {
-                  type union {
-                    type enumeration {
-                      enum "Null0" {
-                      }
-                    }
-                    type inet:ipv4-address;
-                    type string;
-                  }
-                }
-                list interface-next-hop {
-                  key ip-address;
-                  leaf ip-address {
-                    type inet:ipv4-address;
-                  }
-                  uses ip-route-options-grouping {
-                    refine multicast {
-                      mandatory true;
-                    }
-                  }
-                }
-                uses ip-route-options-grouping {
-                  refine multicast {
-                    mandatory true;
-                  }
-                }
-              }
-            }
-          }
-          uses ip-route-grouping-min-elements;
-        }
-        list topology {
-          description
-            "Configure static route for a Topology Routing/Forwarding instance";
-          key name;
-          leaf "name" {
-            must "not (current() = 'base')" {
-              error-message "only non 'base' topology is allowed";
-            }
-            type string;
-          }
-          uses ip-route-grouping;
-        }
-      }
-
-      // ip routing
-      container routing { 
-        description
-          "Enable IP routing";
-        presence "true"; 
-        container protocol {
-          description
-            "IP routing protocol";
-          container purge {
-            description
-              "routes purge";
-            leaf interface {
-              description
-                "Perform IP routing protocol routes purge on link failures";
-              type boolean;
-            }
-          }
-        }
-      }
-
-      // ip explicit-path name *
-      container explicit-path {
-        description
-          "Configure explicit-path";
-        list identifier {
-          description
-            "Specify explicit path by number: <1..65535>";
-          key "pnum";
-          leaf pnum {
-            type uint16 {
-              range "1..65535";
-            }
-          }
-          leaf mode {
-            type enumeration {
-              enum "enable";
-              enum "disable";
-            }
-          }
-          uses ip-exp-path-mode-cfg-grouping;
-        }
-        list name {
-          description
-            "Specify explicit path by name";
-          key "pname";
-          leaf pname {
-            type string;
-          }
-          leaf mode {
-            type enumeration {
-              enum "enable";
-              enum "disable";
-            }
-          }
-          uses ip-exp-path-mode-cfg-grouping;
-        }
-      }
-
-      // ip rsvp
-      // @mount Cisco-IOS-XE-rsvp
-
-      // ip scp
-      container scp { 
-        description
-          "Scp commands";
-        container server {
-          description
-            "Configure SCP server-side functionality";
-          leaf enable {
-            description
-              "Enable server side of SCP";
-            type empty;
-          }
-        }
-      }
-
-      //ip spd
-      container spd { //45456
-        description
-          "spd";
-        leaf mode {
-          type enumeration {
-            enum "aggressive";
-          }
-        }
-        container queue {
-          description
-            "queue";
-          leaf max-threshold {
-            description "Max threshold";
-            type uint16 {
-              range "0..65535";
-            }
-          }
-          leaf min-threshold {
-            description "Min threshold";
-            must ". < ../max-threshold" {
-              error-message "min-threshold must be less than max-threshold";
-            }
-            type uint16 {
-              range "0..65535";
-            }
-          }
-        }
-      }
-
-      // ip bootp
-      container bootp { 
-        description
-          "Config BOOTP services";
-        leaf server {
-          description
-            "Enable BOOTP server";
-          type boolean;
-        }
-      }
-
-      // ip source-route
-      leaf source-route { 
-        description
-          "Process packets with source routing header options";
-        type boolean;
-      }
-
-      // ip ssh
-      container ssh { 
-        description
-          "Configure ssh options";
-        leaf authentication-retries {
-          description
-            "Specify number of authentication retries";
-          type uint8 {
-            range "0..5";
-          }
-        }
-        // ip ssh client
-        container client {
-          description
-            "Configuration for client";
-          uses config-ip-ssh-algorithm-grouping;
-        }    
-        leaf dscp {
-          description
-            "IP DSCP value for SSH traffic";
-          type uint8 {
-            range "0..63";
-          }
-        }
-        container logging {
-          description
-            "Configure logging for SSH";
-          leaf events {
-            description
-              "Log SSH events";
-            type empty;
-          }
-        }
-        container pubkey-chain {
-          description
-            "Configure public key-chain parameters";
-          list username {
-            max-elements "10";
-            key "name";
-            leaf name {
-              type string;
-            }
-            list key-hash {
-              max-elements "2";
-              key "key-type key-hash-value";
-              leaf key-type {
-                type enumeration {
-                  enum "ssh-rsa";
-                }
-              }
-              leaf key-hash-value {
-                type string;
-              }
-            }
-          }
-        }
-        leaf precedence {
-          description
-            "IP Precedence value for SSH traffic";
-          type uint8 {
-            range "0..7";
-          }
-        }
-        container rsa {
-          description
-            "Configure RSA keypair name for SSH";
-          leaf keypair-name {
-            description
-              "keypair-name";
-            type string;
-          }
-        } 
-        // ip ssh server
-        container server {
-          description 
-            "Configuration for server";
-          uses config-ip-ssh-algorithm-grouping;
-          container peruser {
-             description
-               "Per User configs";
-             container session {
-               description
-                 "Per User Session";
-               leaf limit {
-                 description
-                   "Per User Session Limit";
-                 type uint8 {
-                   range "1..16";
-                 }
-               }
-             }
-           }
-        }    
-        //  source-interface Specify interface for source address in
-        // ip ssh source-interface
-        leaf source-interface {
-          description
-            "Specify interface for source address in SSH connections";
-          type string;
-        }
-        //  SSH connections
-        leaf time-out {
-          description
-            "Specify SSH time-out interval";
-          type uint8 {
-            range "1..120";
-          }
-        }
-        leaf version {
-          description
-            "Specify protocol version supported";
-          type uint8 {
-            range "1..2";
-          }
-        }
-         leaf maxstartups {
-           description
-             "Maximum number of server sessions";
-           type uint8 {
-             range "2..128";
-           }
-         }
-
-        list port {
-          description
-            "Starting (or only) Port number to listen on";
-          key port-no;
-          leaf port-no {
-            description
-              "Starting Port number";
-            type uint16{
-              range "2000..10000";
-            }
-          }
-          leaf low-rotary {
-            description
-              "Starting (or only) rotary group number";
-            type uint8 {
-              range "1..127";
-            }
-          }
-          leaf high-rotary {
-            description
-              "Starting (or only) rotary group number";
-            type uint8 {
-              range "1..127";
-            }
-          }
-        }
-      }
-
-      //ip tacacs
-      //@ mount Cisco-IOS-XE-aaa
-
-      // ip tcp
-      container tcp { 
-        description
-          "Global TCP parameters";
-        container path-mtu-discovery {
-          description
-            "Enable path-MTU discovery on new TCP connections";
-          presence "true";
-          leaf age-timer {
-            description
-              "Set PMTU aging timer";
-            type union {
-              type enumeration {
-                enum "infinite";
-              }
-              type uint8 {
-                range "10..30";
-              }
-            }
-          }
-        }
-        leaf selective-ack {
-          description "Enable TCP selective-ACK";
-          type empty;
-        }
-        leaf synwait-time {
-          description "Set time to wait on new TCP connections";
-          type uint16 {
-            range "5..300";
-          }
-        }
-        leaf timestamp {
-          description "Enable TCP timestamp option";
-          type empty;
-        }
-        leaf window-size {
-          description "TCP window size";
-          type uint32 {
-            range "0..1073741823";
-          }
-        }
-      }
-
-      // ip tftp
-      container tftp { 
-        description
-          "tftp configuration commands";
-        container boot-interface {
-          description
-            "Force interface to use for TFTP booting";
-          uses ios-ifc:interface-grouping;
-        }
-        container source-interface {
-          description
-            "Specify interface for source address in TFTP connections";
-          uses ios-ifc:interface-grouping;
-        }
-        leaf blocksize {
-          description
-            "Specify TFTP client blocksize";
-          type uint16 {
-            range "512..8192";
-          }
-        }
-      }
-
-      container access-list { 
-        description
-          "IOS Named access list";
-      }
-
-      // ip device
-      container device {
-        description
-          "Device tracking";
-        //@mount Cisco-IOS-XE-device-tracking.yang
-      }
-
-      //@ mount Cisco-IOS-XE-nbar
-
-      //@ mount Cisco-IOS-XE-wccp
-
-      //@ mount Cisco-IOS-XE-sla
-    }
-  }
-  grouping routes-recurse-grouping {
-    leaf route-map {
-      description
-        "Configure route-map";
-      type string;
-    }
-    leaf multicast {
-      description
-        "Configure multicast topology";
-      type empty;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6-oper.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6-oper.yang
deleted file mode 100644
index d29707f43..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6-oper.yang
+++ /dev/null
@@ -1,151 +0,0 @@
-module Cisco-IOS-XE-ipv6-oper {
-  yang-version 1;
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-ipv6-oper";
-  prefix ipv6-ios-xe-oper;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for IPv6 operational data.
-     Copyright (c) 2017 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2017-11-01 {
-    description
-      "Initial revision";
-    reference "1.0.0";
-  }
-
-  typedef ipv6-nd-tdl-state {
-    type enumeration {
-      enum "ipv6-nd-incomplete" {
-        value 0;
-        description
-          "Address resolution is in progress and the 
-           link-layer address of the neighbor has not
-           yet been determined.";
-      }
-      enum "ipv6-nd-reachable" {
-        value 1;
-        description
-          "The neighbor is known to have been reachable
-           recently (within tens of seconds ago).";
-      }
-      enum "ipv6-nd-stale" {
-        value 2;
-        description
-          "The neighbor is no longer known to be reachable
-           but until traffic is sent to the neighbor, no 
-           attempt should be made to verify its reachability";
-      }
-      enum "ipv6-nd-glean" {
-        value 3;
-        description
-          "Received updated link-layer information. 
-           Behaviour like STALE.";
-      }
-      enum "ipv6-nd-delay" {
-        value 4;
-        description
-          "The neighbor is no longer known to be reachable, and traffic
-           has recently been sent to the neighbor. Rather than probe the
-           neighbor immediately, however, delay sending probes for a short
-           while in order to give upper layer protocols a chance to provide
-           reachability confirmation.";
-      }
-      enum "ipv6-nd-probe" {
-        value 5;
-        description
-          "The neighbor is no longer known to be reachable, and unicast
-           Neighbor Solicitation probes are being sent to verify 
-           reachability.";
-      }
-      enum "ipv6-nd-delete" {
-        value 6;
-        description
-          "Entry is deleted.";
-      }
-    }
-    description
-      "Indicate the current state of 
-       the Neighbor-Discovery entry.";
-  }
-
-  grouping nd6-info-key {
-    description
-      "Key for IPv6 neighbor infomation table";
-    leaf vrf-name {
-      type string;
-      description
-        "The Virtual Router and Forwarding instance that 
-         this neighbor information is associated with";
-    }
-    leaf if-name {
-      type string;
-      description
-        "The Interface name.";
-    }
-    leaf ip {
-      type inet:ip-address;
-      description
-        "IPv6 address of this neighbor entry";
-    }
-  }
-
-  grouping nd6-info {
-    description
-      "Value for IPv6 neighbor info table entry";
-    leaf mac-address {
-      type yang:mac-address;
-      description
-        "MAC address";
-    }
-    leaf state {
-      type ipv6-ios-xe-oper:ipv6-nd-tdl-state;
-      description
-        "State of the entry";
-    }
-    leaf idle-timer {
-      type uint32;
-      description
-        "Time before expiration, in seconds.";
-    }
-    leaf uptime {
-      type uint32;
-      description
-        "Indicates how long this neighbor entry has 
-         been active, in seconds";
-    }
-  }
-
-  container ipv6-data {
-    config false;
-    description
-      "Operational state of IPv6";
-    list nd6-info {
-      key "vrf-name if-name ip";
-      description
-        "List of IPv6 neighbors";
-      uses ipv6-ios-xe-oper:nd6-info-key;
-      uses ipv6-ios-xe-oper:nd6-info;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6.yang
deleted file mode 100644
index efc1ebb42..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-ipv6.yang
+++ /dev/null
@@ -1,585 +0,0 @@
-submodule Cisco-IOS-XE-ipv6 {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native IPv6 Yang Model.
-     Copyright (c) 2016-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-08-31{
-      description
-          "Added model for ipv6 route static *";
-  }
-
-  revision 2018-07-19{
-    description
-        "Removed tag option under ipv6 route * multicast";
-  }
-
-  revision 2018-06-28{
-    description
-        "Added must constraints for deleting vrf";
-  }
-
-  revision 2017-07-05 {
-    description
-      "Adding model for ipv6 router ospf *";
-  }
-  revision 2017-05-17 {
-    description    
-      "This revision fixes the problem in ipv6 route";
-  }
-  revision 2017-02-23 {
-    description    
-      "Changes to support openconfig-network-instance mapping";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-
-  grouping ipv6-route-options-grouping {
-    leaf distance {
-      type uint8;
-    }
-    choice type-choice {
-      leaf multicast {
-        description
-          "Route only usable by multicast";
-        type empty;
-      }
-      leaf unicast {
-        description
-          "Route only usable by unicast";
-        type empty;
-      }
-    }
-    leaf tag {
-      description
-        "Tag value";
-      type uint32;
-      when not(../multicast);
-    }
-    leaf track {
-      description
-        "Tracked";
-      type uint32;
-    }
-    leaf name {
-      description
-        "Specify name of the next hop";
-      type string;
-    }
-  }
-  
-grouping ipv6-route-grouping {
-    list ipv6-route-list {
-      key "prefix";
-      leaf prefix {
-        type ios-types:ipv6-prefix;
-      }
-      list ipv6-fwd-list {
-        key fwd;
-        leaf fwd {
-          type union {
-             type enumeration {
-                 enum "Null0" {
-                 }
-             }
-             type inet:ipv6-address;
-             type string;
-           }
-        }
-        list interface-next-hop {
-          description
-            "IPv6 address of next-hop";
-          key ipv6-address;
-          leaf ipv6-address {
-            type inet:ipv6-address;
-          }
-          uses ipv6-route-options-grouping;
-        }
-        uses ipv6-route-options-grouping;
-      }
-    }
-  }
-
-grouping ipv6-route-grouping-min-elements {
-    list ipv6-route-list {
-      key "prefix";
-      min-elements 1;
-      leaf prefix {
-        type ios-types:ipv6-prefix;
-      }
-      list ipv6-fwd-list {
-        key fwd;
-        leaf fwd {
-          type union {
-             type enumeration {
-                 enum "Null0" {
-                 }
-             }
-             type inet:ipv6-address;
-             type string;
-           }
-        }
-        list interface-next-hop {
-          description
-            "IPv6 address of next-hop";
-          key ipv6-address;
-          leaf ipv6-address {
-            type inet:ipv6-address;
-          }
-          uses ipv6-route-options-grouping;
-        }
-        uses ipv6-route-options-grouping;
-      }
-    }
-  }
-
-grouping ipv6-bfd-unassociate-grouping {
-  leaf interface {
-    type union {
-      type enumeration {
-        enum "Null0" {
-        }
-      }
-      type string;
-    }
-  }
-  leaf ipv6 {
-    description "IPv6 address of BFD neighbor";
-    type inet:ipv6-address;
-  }
-  leaf unassociate {
-    description "Unassociated Neighbor";
-    when "../ipv6";
-    type empty;
-  }
-}
-
-  /////////////////////////////////////////////////////////
-  // native / ipv6
-  /////////////////////////////////////////////////////////
-  grouping config-ipv6-grouping {
-    container ipv6 { 
-      description
-        "Global IPv6 configuration commands";
-
-      container source-guard { 
-        description "Configure IPv6 sourceguard";
-        list policy {
-          description "Configure a policy for feature sourceguard";
-          key "source-guard-policy-name";
-          leaf source-guard-policy-name{
-            type string;
-          }
-          container validate {
-            description "Validate the src of the received data traffic";
-            leaf address {
-              description "Validate against addresses learned in NDP/DHCP traffic (default)";
-              type empty;
-            }
-            leaf prefix {
-              description "Validate against prefixes learned in RA or DHCP-PD traffic";
-              type empty;
-            }
-          }
-          container deny {
-            description "Block data traffic";
-            leaf global-autoconf {
-              description "Drop data traffic from global autoconfigued addresses";
-              type empty;
-            }
-          }			
-          container permit {
-            description "Allow data traffic";
-            leaf link-local {
-              description "Allow data traffic from all Link-local addresses";
-              type empty;
-            }
-          }			
-        }
-      }
-
-      container destination-guard { 
-        description "Configure Destination guard";
-        list policy {
-          description "Configure a policy for feature destguard";
-          key "destination-guard-policy-name" ;
-          leaf destination-guard-policy-name{
-            type string;
-          }
-          container enforcement {
-            description "Sets the enforcement level";
-            leaf always {
-              description "Enforced under all conditions (default)";
-              type empty;
-            }
-            leaf stressed {
-              description "Enforced when system is under stress";
-              type empty;
-            }
-          }
-        }
-      }
-
-      container dhcp { 
-        description 
-          "IPv6 DHCP";
-        // @mount Cisco-IOS-XE-dhcp
-      }
-
-      container access-list { 
-        description
-          "Configure access lists";
-        // @mount Cisco-IOS-XE-acl
-      }
-
-      // ipv6 flowset
-      leaf flowset {
-        description
-          "Set flow label random for originated packets";
-        type empty;
-      }
-
-      // ipv6 unicast-routing
-      leaf unicast-routing {
-        description
-          "Enable unicast routing";
-        type empty;
-      }
-
-      container multicast {
-        description
-          "Configure multicast related commands";
-        // @mount Cisco-IOS-XE-multicast
-      }
-
-      // ipv6 multicast-routing
-      // @mount Cisco-IOS-XE-multicast
-
-      // ipv6 cef
-      container cef { 
-        description
-          "Cisco Express Forwarding";
-        presence "true";
-        // @mount Cisco-IOS-XE-cef
-      }
-
-      //ipv6 nd
-      container nd {
-        description
-          "Configure IPv6 ND";
-        // @mount Cisco-IOS-XE-nd
-      }
-
-      container pim { 
-        description
-          "Configure Protocol Independent Multicast";
-        // @mount Cisco-IOS-XE-mcast
-      }
-
-      //ipv6 rip
-      //@mount Cisco-IOS-XE-rip
-
-      /////////////////////////////////////////////////////////
-      // native / ipv6 / route
-      /////////////////////////////////////////////////////////
-      container route {
-        description
-          "Configure static routes";
-        // ipv6 route prefix
-        uses ipv6-route-grouping;
-        // ipv6 route vrf *
-        list vrf {
-          description
-            "Configure static route for a VPN Routing/Forwarding instance";
-          key "name";
-          leaf name {
-	    must "/ios:native/ios:vrf/ios:definition[ios:name=current()] or /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
-	      error-message "VRF must be created 1st, deleted last";
-            }
-            type string;
-          }
-          uses ipv6-route-grouping-min-elements;
-        }
-        container static {
-          description "Configure static route attributes";
-          // ip route static bfd *
-          container bfd {
-            description "Configure a Static Route BFD neighbor";
-            list iface_name {
-              key "interface ipv6";
-              uses ipv6-bfd-unassociate-grouping;
-            } 
-            list vrf {
-              description "IPv6 Routing table";
-              key "name interface ipv6";
-              leaf name {
-                must "(/ios:native/ios:vrf/ios:definition[ios:name=current()] and 
-                       /ios:native/ios:vrf/ios:definition[ios:name=current()]/ios:address-family/ios:ipv6) or 
-                       /ios:native/ios:ip/ios:vrf[ios:name=current()]" {
-                  error-message "IPv6 routing table vrf does not exist";
-                }
-                type string;
-              }
-              uses ipv6-bfd-unassociate-grouping;
-            }           
-          }
-          // ip route static resolve * 
-          container resolve {
-            description "Configure static route resolution";
-            leaf default {
-              description "Static route resolution via default";
-                type empty;
-              }
-            }
-          }
-        }
-
-
-      /////////////////////////////////////////////////////////
-      // native / ipv6 / router
-      /////////////////////////////////////////////////////////
-      container router {
-        description
-          "Enable an IPV6 routing process";
-        list eigrp {
-          description
-            "Enhanced Interior Gateway Routing Protocol (EIGRP)";
-          // @mount Cisco-IOS-XE-eigrp
-          key "id";
-          leaf id {
-            description
-              "Autonomous System ID";
-            type uint16 {
-              range "1..65535";
-            }
-          }
-        }
-        list ospf {
-          description
-            "Open Shortest Path First (OSPFv3)";
-          key "id";
-          leaf id {
-            description
-              "Process ID";
-            type uint16 {
-              range "1..65535";
-            }
-          }
-        }
-        // ipv6 router rip
-        // @mount Cisco-IOS-XE-rip
-      }
-
-      // source-route Process packets with source routing header options
-      // ipv6 source-route
-      leaf source-route {
-        description
-          "Process packets with source routing header options";
-        type boolean;
-      }
-
-      //ipv6 spd
-      container spd {
-        description
-          "spd";
-        leaf mode {
-          type enumeration {
-            enum "aggressive";
-          }
-        }
-        container queue {
-          description
-            "queue";
-          leaf max-threshold {
-            description "Max threshold";
-            type uint16 {
-              range "0..65535";
-            }
-          }
-          leaf min-threshold {
-            description "Min threshold";
-            must ". < ../max-threshold" {
-              error-message "min-threshold must be less than max-threshold";
-            }
-            type uint16 {
-              range "0..65535";
-            }
-          }
-        }
-      }
-
-      // ipv6 prefix-list
-      container prefix-list { 
-        description
-          "Build a prefix list";
-        list prefixes {
-          key "name";
-          leaf name {
-            type string {
-              pattern "([^s].*)|(s[^e].*)|(se[^q].*)(seq[^u].*)|(sequ[^e].*)|(seque[^n].*)|(sequen[^c].*)|(sequenc[^e].*)|(sequence[^\\-].*)|(sequence\\-[^n].*)|(sequence\\-n[^u].*)|(sequence\\-nu[^m].*)|(sequence\\-num[^b].*)|(sequence\\-numb[^e].*)|(sequence\\-numbe[^r].*)|(sequence\\-number..*)";
-            }
-          }
-          leaf description {
-            description
-              "Prefix-list specific description";
-            type string {
-              length "1..80";
-            }
-          }
-          container permit {
-            description
-              "Specify packets to forward";
-            leaf address {
-              type ios-types:ipv6-prefix;
-            }
-            leaf ge {
-              description
-                "Minimum prefix length to be matched";
-              type uint8 {
-                range "0..128";
-              }
-            }
-            leaf le {
-              description
-                "Maximum prefix length to be matched";
-              type uint8 {
-                range "0..128";
-              }
-            }
-          }
-          container deny {
-            description
-              "Specify packets to reject";
-            leaf address {
-              type ios-types:ipv6-prefix;
-            }
-            leaf ge {
-              description
-                "Minimum prefix length to be matched";
-              type uint8 {
-                range "0..128";
-              }
-            }
-            leaf le {
-              description
-                "Maximum prefix length to be matched";
-              type uint8 {
-                range "0..128";
-              }
-            }
-          }
-          list seq {
-            // NOTE: the seq element is not actually mandatory
-            // in the Cisco CLI. If it isn't give
-            description
-              "sequence number of an entry";
-            key "no";
-            leaf no {
-              type uint32 {
-                range "1..4294967294";
-              }
-            }
-            container deny {
-              description
-                "Specify packets to reject";
-              leaf ip {
-                type ios-types:ipv6-prefix;
-              }
-              leaf ge {
-                description
-                  "Minimum prefix length to be matched";
-                type uint16 {
-                  range "1..128";
-                }
-              }
-              leaf le {
-                description
-                  "Maximum prefix length to be matched";
-                type uint16 {
-                  range "1..128";
-                }
-              }
-            }
-            container permit {
-              description
-                "Specify packets to forward";
-              leaf ip {
-                type ios-types:ipv6-prefix;
-              }
-              leaf ge {
-                description
-                  "Minimum prefix length to be matched";
-                type uint16 {
-                  range "1..128";
-                }
-              }
-              leaf le {
-                description
-                  "Maximum prefix length to be matched";
-                type uint16 {
-                  range "1..128";
-                }
-              }
-            }
-          }
-        }
-        leaf sequence-number {
-          description
-            "Include/exclude sequence numbers in NVGEN";
-          type empty;
-        }
-      }
-      
-      //ipv6 neighbor
-      list neighbor {
-        description "Neighbor";
-	key "address interface";
-	leaf address {
-	  description "X:X:X:X::X  IPv6 address";
-	  type inet:ipv6-address;
-	}
-	leaf interface {
-	  type string;
-	}
-	leaf hardware-address {
-	  description "H.H.H  48-bit hardware address";
-	  type string;
-	}
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-license.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-license.yang
deleted file mode 100644
index 5dbf85466..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-license.yang
+++ /dev/null
@@ -1,489 +0,0 @@
-submodule Cisco-IOS-XE-license {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native License Yang model.
-     Copyright (c) 2016 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2017-12-01 {
-    description
-      "Add licenses boot level addon for cat3k";
-  }
-  revision 2017-10-18 {
-    description
-      "Add licenses boot level on switch and smart licensing";
-  }
-  revision 2017-05-25 {
-    description
-      "Add licenses ax and security";
-  }
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-
-  grouping config-license-grouping {
-    container license { 
-      description
-        "Configure license features";
-      // license udi
-      container udi {
-        leaf pid {
-          type string;
-        }
-        leaf sn {
-          type string;
-        }
-      }
-      //license feature
-      container feature {
-        description
-          "License features";
-        leaf name {
-          type string;
-        }
-        container port {
-          description
-            "Enable Ports for IM";
-          leaf bulk {
-            description
-              "Enable Bulk port licenes";
-            type empty;
-          }
-          leaf onegig {
-            description
-              "Enable 1G port bundles";
-            type uint8 {
-              range "1..2";
-            }
-          }
-          leaf b-6xonegig {
-            description
-              "Enable 6x1G port bundles";
-            type uint8 {
-              range "1..2";
-            }
-          }
-          leaf tengig {
-            description
-              "Enable 10G port bundles";
-            type uint8 {
-              range "1..2";
-            }
-          }
-        }
-      }
-      // license accept
-      container accept {
-        leaf end {
-          type empty;
-        }
-        leaf user {
-          type empty;
-        }
-        leaf agreement {
-          type empty;
-        }
-      }
-      // license boot
-      container boot {
-        description
-          "license boot config commands";
-        container level {
-          description
-            "which level to boot";
-          choice license-choice {
-            case ipbase-case {
-              container ipbase{
-                description
-                  "ipbase level";
-                presence "true";
-                leaf switch {
-                  description
-                    "Switch license information";
-                  type uint8;
-                }
-              }
-            }
-            case ipbasek9-case {
-              container ipbasek9 {
-                description
-                  "License Level IPBASEK9";
-                presence "true";
-                leaf addon {
-                  description
-                    "select add-on to include";
-                  type enumeration {
-                    enum "dna-advantage";
-                    enum "dna-essentials";
-                  }
-                }
-              }
-            }
-            case ipservices-case {
-              container ipservices {
-              description
-                "ipservices level";
-                presence "true";
-                leaf switch {
-                  description
-                  "Switch license information";
-                  type empty;
-                }
-              }
-            }
-            case ipservicesk9-case {
-              container ipservicesk9 {
-                description
-                "ipservicesk9 level";
-                presence "true";
-                leaf addon {
-                  description
-                    "select add-on to include";
-                  type enumeration {
-                    enum "dna-advantage";
-                    enum "dna-essentials";
-                  }
-                }
-              }
-            }
-            case lanbase-case {
-              container lanbase {
-                description
-                  "lanbase level";
-                presence "true";
-                leaf switch {
-                  description
-                    "Switch license information";
-                  type empty;
-                }
-              }
-            }
-            case lanbasek9-case {
-              container lanbasek9 {
-                description
-                "License Level LANBASEK9";
-                presence "true";
-                leaf addon {
-                  description
-                    "select add-on to include";
-                  type enumeration {
-                    enum "dna-essentials";
-                  }
-                }
-              }
-            }
-            case lite-case {
-              container lite {
-                description
-                  "lite level";
-                presence "true";
-                leaf switch {
-                  description
-                    "Switch license information";
-                  type empty;
-                }
-              }
-            }
-            case metroaggrservices-case {
-              container metroaggrservices {
-                description
-                  "metroaggrservices level";
-                presence "true";
-                leaf switch {
-                  description
-                  "Switch license information";
-                  type empty;
-                }
-              }
-            }
-            case metroipservices-case {
-              leaf metroipservices {
-              description
-                "Metroipservices License Level";
-              type empty;
-              }
-            }
-            case metroservices-case {
-              leaf metroservices {
-              description
-                "Metroservices License Level";
-              type empty;
-              }
-            }
-            case advancedmetroipaccess-case {
-              leaf advancedmetroipaccess {
-                description
-                  "Advanced Metro IP Access License Level";
-                type empty;
-              }
-            }
-            case metroaccess-case {
-              leaf metroaccess {
-              description
-                "Metro Access License Level";
-              type empty;
-              }
-            }
-            case metroipaccess-case {
-              leaf metroipaccess {
-                description
-                  "Metro IP Access License Level";
-                type empty;
-              }
-            }
-            case entservices-case {
-              leaf entservices {
-                description
-                  "Entservices License Level";
-                type empty;
-              }
-            }
-            case adventerprise-case {
-              leaf adventerprise {
-                description
-                  "Adventerprise License Level";
-                type empty;
-              }
-            }
-            case appx-case {
-              leaf appx {
-                description
-                "Appx License Level";
-                type empty;
-              }
-            }
-            case appxk9-case {
-              leaf appxk9 {
-                description
-                  "Appxk9 License Level";
-                type empty;
-              }
-            }
-            case ax-case {
-              leaf ax {
-                description
-                  "ax(ipb+sec+appx) License Level";
-                type empty;
-              }
-            }
-            case security-case {
-              leaf security {
-                description
-                  "Security License Level";
-                type empty;
-              }
-            }
-            case securityk9-case {
-              leaf securityk9 {
-                description
-                  "Securityk9 License Level";
-                type empty;
-              }
-            }
-            case uck9-case {
-              container uck9 {
-                description
-                  "Uck9 License Level";
-                presence "true";
-                leaf disable {
-                  type empty;
-                }
-              }
-            }
-            case network-advantage-case {
-              container network-advantage {
-                description
-                  "License Level Network-Advantage";
-                presence true;
-                leaf addon {
-                  description
-                    "select add-on to include";
-                  type enumeration {
-                    enum "dna-advantage";
-                    enum "dna-essentials";
-                  }
-                }
-              }
-            }
-            case network-essentials-case {
-              container network-essentials {
-                description
-                  "License Level Network-Essentials";
-                presence true;
-                leaf addon {
-                  description
-                    "select add-on to include";
-                  type enumeration {
-                    enum "dna-essentials";
-                  }
-                }
-              }
-            }
-            case AdvUCSuiteK9-case {
-              leaf AdvUCSuiteK9 {
-                description
-                  "AdvUCSuiteK9 License Level";
-                type empty;
-              }
-            }
-            case FoundationSuiteK9-case {
-              leaf FoundationSuiteK9 {
-                description
-                  "FoundationSuiteK9 License Level";
-                type empty;
-              }
-            }
-          }
-        }
-
-        //license boot module
-        container boot-module {
-          leaf module {
-            type enumeration {
-              enum "c2900";
-            }
-          }
-          container technology-package {
-            leaf securityk9 {
-              type empty;
-            }
-            leaf uck9 {
-              type empty;
-            }
-            leaf datak9 {
-              type empty;
-            }
-          }
-        }
-      }
-
-      container smart {
-        description
-          "Smart licensing";
-	leaf customer-id {
-	  description "Customer defined id";
-	  type string;
-	}
-        leaf enable {
-          description
-            "Enable Smart licensing";
-          type empty;
-        }
-	leaf transport-type {
-	  type enumeration {
-	    enum "callhome";
-	    enum "smart";
-	  }
-	  description 
-	    "The transport type. If transport-type is set to 
-             callhome then any additional transport settings must 
-             be done from the callhome CLI.
-             If the transport-type is set to smart, additional 
-             settings are available below.";
-	}
-	container privacy {
-	  leaf hostname {
-	    type empty;
-	  }
-	  leaf version {
-	    type empty;
-	  }
-	}
-        container utility {
-          description
-            "Enable or disable usage reporting on the device";
-          leaf enable {
-	    description "Enable or disable usage reporting";
-            type empty;
-          }
-	  container customer-info {
-	    leaf city {
-	      description "Customer defined city";
-	      type string;
-          }
-	    leaf country {
-	      description "Customer defined country";
-	      type string;
-	    }
-	    leaf id {
-	      description "Customer defined id";
-	      type string;
-	    }
-	    leaf name {
-	      description "Customer defined name";
-	      type string;
-	    }
-	    leaf postalcode {
-	      description "Customer defined postalcode";
-	      type string;
-	    }
-	    leaf state {
-	      description "Customer defined state";
-	      type string;
-	    }
-	    leaf street {
-	      description "Customer defined street";
-	      type string;
-        }
-          }
-        }
-        container url {
-          description
-            "Specify the Smart Transport primary and the Utility URL";
-          choice url-setting {
-            description 
-                "Specify the URL(s) used for communications to the SSM,
-                 satellite or Third Party Billing Platform.";
-            case set-default {
-              leaf default {
-                type empty;
-                description
-                  "Enable the default URLs for both
-                   url-registration and url-utility that point to 
-                   the Cisco SSM.";
-              }
-            }
-            case set-urls {
-              leaf name {
-                type string;
-                description 
-                  "Specify the URL used for registration, authorization and
-                   anything else not related to utility usage reporting.";
-              }
-              leaf utility {
-                type string;
-                description
-                  "Specify the URL to be used for sending utility usage 
-                   reports. This should be the same as url-registration 
-                   if you are using a satellite.";
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-line.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-line.yang
deleted file mode 100644
index 555d1a932..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-line.yang
+++ /dev/null
@@ -1,876 +0,0 @@
-submodule Cisco-IOS-XE-line {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Line, configure a terminal line Yang Model.
-     Copyright (c) 2016 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-03-01 {
-    description
-      "Added line console authorization exec list commands ";
-  }
-
-  revision 2017-09-06 {
-    description
-      "Added line console/vty history ";
-  }
- 
-  revision 2017-07-24 {
-    description
-      "Add session-limit";
-  }
-
-  revision 2017-06-02 {
-     description
-       "Add alt-name for console line";
-   }
-
-  revision 2017-05-29 {
-    description
-      "Added /line/vty/session-limit";
-  }
-  revision 2017-03-24 {
-    description
-      "Remove refuse-message and vacant-message";
-  }
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  grouping password-07-grouping {
-    leaf level {
-      description
-        "Set exec level password";
-      type uint8;
-    }
-    leaf type {
-      type enumeration {
-        enum "0";
-        enum "7";
-      }
-    }
-    leaf secret {
-      type string;
-    }
-  }
-
-  grouping line-grouping {
-    // line * / authorization
-    container authorization {
-      description
-        "Authorization parameters";
-      container command {
-        description
-          "For exec (shell) commands";
-        leaf enable-level {
-          type uint8 {
-            range "0..15";
-          }
-        }
-        leaf auth-name {
-          type string;
-        }
-      }
-      container exec {
-        description
-          "For starting an exec (shell)";
-        leaf authorization-name {
-          description
-            "Use an authorization list with this name";
-          type string;
-        }
-        leaf default {
-          description
-            "Use the default authorization list";
-          type empty;
-        }
-      }
-    }
-
-    // line * / access-class
-    container access-class {
-      description
-        "Filter connections based on an IP access list";
-      list acccess-list {
-        key "direction";
-        leaf direction {
-          type enumeration {
-            enum "in";
-            enum "out";
-          }
-        }
-        leaf access-list {
-          type ios-types:exp-acl-type;
-          mandatory true;
-        }
-        leaf vrf-also {
-          description
-            "Same access list is applied for all VRFs";
-          type empty;
-        }
-      }
-    }
-    // line * / activation-character
-    leaf no-activation-character {
-      type boolean;
-    }
-    leaf activation-character {
-      description
-        "Define the activation character";
-      type union {
-        type string;
-        type uint8 {
-          range "0..127";
-        }
-      }
-    }
-    // line * / autocommand
-    container autocommand {
-      description
-        "Automatically execute an EXEC command";
-      leaf line {
-        description
-          "Appropriate EXEC command";
-        type string;
-      }
-      container no-suppress-linenumber {
-        description
-          "Display service linenumber message";
-        presence "true";
-        leaf line {
-          description
-            "Appropriate EXEC command";
-          type string;
-        }
-      }
-    }
-    // line * / autocommand-options
-    container autocommand-options {
-      description
-        "Autocommand options";
-      presence "true";
-      container abort-character {
-        description
-          "Autocommand abort character";
-        presence "true";
-        leaf character {
-          type union {
-            type uint8;
-            type string;
-          }
-        }
-      }
-      container delay {
-        description
-          "Delay autocommand execution";
-        presence "true";
-        leaf time {
-          description
-            "Time in seconds";
-          type uint8 {
-            range "0..120";
-          }
-        }
-      }
-      container nohangup {
-        description
-          "No hangup after autocommand completion";
-        presence "true";
-        leaf abort-character {
-          description
-            "Autocommand abort character";
-          type empty;
-        }
-        leaf delay {
-          description
-            "Delay autocommand execution";
-          type empty;
-        }
-      }
-    }
-    // line * / data-character-bits
-    leaf data-character-bits {
-      description
-        "Bits per character";
-      type uint8 {
-        range "7..8";
-      }
-    }
-    // line * / databits
-    container databits {
-      description
-        "Set number of data bits per character";
-      leaf set-to-5 {
-        description
-          "Number of data bits";
-        type empty;
-      }
-      leaf set-to-6 {
-        description
-          "Number of data bits";
-        type empty;
-      }
-      leaf set-to-7 {
-        description
-          "Number of data bits";
-        type empty;
-      }
-      leaf set-to-8 {
-        description
-          "Number of data bits";
-        type empty;
-      }
-    }
-    //line * / domain-lookup
-    leaf domain-lookup {
-      description
-        "Enable domain lookups in show commands";
-      type empty;
-    }
-    //line * /editing
-    leaf editing {
-      description
-        "Enable command line editing";
-      type empty;
-    }
-    // line * / escape-character
-    container escape-character {
-      description
-        "Change the current line's escape character";
-      leaf char {
-        type union {
-          type uint8;
-          type enumeration {
-            enum "BREAK";
-            enum "DEFAULT";
-            enum "NONE";
-          }
-          type string;
-        }
-      }
-      leaf soft {
-        type empty;
-      }
-    }
-    // line * / exec
-    choice exec-choice {
-      container no-exec {
-        leaf exec {
-          description
-            "Configure EXEC";
-          type boolean;
-        }
-      }
-      container exec {
-        container prompt {
-          leaf timestamp {
-            type empty;
-          }
-        }
-      }
-    }
-    // line * / exec-banner
-    leaf exec-banner {
-      description
-        "Enable the display of the EXEC banner";
-      type empty;
-    }
-    // line * /exec-character-bits
-    leaf exec-character-bits {
-      description
-        "Bits per character";
-      type uint8 {
-        range "7..8";
-      }
-    }
-    // line * / exec-timeout
-    container exec-timeout {
-      description
-        "Set the EXEC timeout";
-      leaf minutes {
-        description
-          "<0-35791>;;Timeout in minutes";
-        type uint32;
-      }
-      leaf seconds {
-        description
-          "<0-2147483>;;Timeout in seconds";
-        type uint32;
-      }
-    }
-    // line * / flowcontrol
-    container flowcontrol {
-      description
-        "Set the flow control";
-      leaf NONE {
-        description
-          "Set no flow control";
-        type empty;
-      }
-      leaf hardware {
-        description
-          "Set hardware flow control";
-        type empty;
-      }
-      leaf software {
-        description
-          "Set software flow control";
-        type empty;
-      }
-    }
-    // line * / full-help
-    leaf full-help {
-      description
-        "Provide help to unprivileged user";
-      type empty;
-    }
-    // line * / history
-    container history {
-      description
-        "Enable and control the command history function";
-      presence "true";
-      leaf size {
-        description
-          "Set history buffer size";
-        type uint16 {
-          range "0..256";
-        }
-      }
-    }
-    // line * / international
-    leaf international {
-      description
-        "Enable international 8-bit character support";
-      type empty;
-    }
-    // line * / ip
-    container ip {
-      description
-        "IP options";
-      container netmask-format {
-        description
-          "Change display of netmasks";
-        presence "true";
-        leaf format {
-          type enumeration {
-            enum "bit-count";
-            enum "decimal";
-            enum "hexadecimal";
-          }
-        }
-      }
-      leaf tcp {
-        type empty;
-      }
-    }
-    // line * / ipv6
-    container ipv6 {
-      container access-class {
-        list access-class {
-          key "access-class-name";
-          leaf access-class-name {
-            type string;
-          }
-          leaf enumeration-in-out {
-            type enumeration {
-              enum "in";
-              enum "out";
-            }
-          }
-        }
-      }
-    }
-    // line * / length
-    leaf length {
-      description
-        "Set number of lines on a screen";
-      type uint16 {
-        range "0..512";
-      }
-    }
-    // line * / line
-    leaf line {
-      type uint8;
-    }
-    // line * / location
-    leaf location {
-      description
-        "One text line describing the terminal's location";
-      type string;
-    }
-    // line * / logging
-    container logging {
-      description
-        "Modify message logging facilities";
-      container synchronous {
-        description
-          "Synchronized message output";
-        presence "true";
-      }
-    }
-    // line * / login
-    container login {
-      description
-        "Enable password checking";
-      presence "true";
-      leaf local {
-        type empty;
-      }
-      leaf authentication {
-        type string;
-      }
-    }
-    // line * / media-type
-    container media-type {
-      description
-        "Console connection media type";
-      leaf rj45 {
-        description
-          "Console connection set to RJ45";
-        type empty;
-      }
-    }
-    // line * / modem
-    container modem {
-      description
-        "Configure the Modem Control Lines";
-      leaf CTS-Alarm {
-        description
-          "Alarm device which only uses CTS for call control";
-        type empty;
-      }
-      leaf DTR-active {
-        description
-          "Leave DTR low unless line has an active incoming connection or EXEC";
-        type empty;
-      }
-      leaf Dialin {
-        description
-          "Configure line for a modern dial-in modem";
-        type empty;
-      }
-      leaf Host {
-        description
-          "Devices that expect an incoming modem call";
-        type empty;
-      }
-      leaf InOut {
-        description
-          "Configure line for incoming AND outgoing use of modem";
-        type empty;
-      }
-      leaf Printer {
-        description
-          "Devices that require DSR/CD active";
-        type empty;
-      }
-      leaf answer-timeout {
-        description
-          "Set interval between raising DTR and CTS response";
-        type empty;
-      }
-      leaf dtr-delay {
-        description
-          "Set interval during which DTR is held low";
-        type empty;
-      }
-    }
-    // line * / monitor
-    leaf monitor {
-      description
-        "Copy debug output to the current terminal line";
-      type empty;
-    }
-    // line * / motd-banner
-    leaf motd-banner {
-      description
-        "Enable the display of the MOTD banner";
-      type empty;
-    }
-    // line * / notify
-    leaf notify {
-      description
-        "Inform users of output from concurrent sessions";
-      type empty;
-    }
-    // line * / padding
-    container padding {
-      description
-        "Set padding for a specified output character";
-      leaf character {
-        description
-          "Character to be padded";
-        type union {
-          type uint8 {
-            range "0..127";
-          }
-          type string;
-        }
-      }
-      leaf null {
-        type uint8;
-      }
-    }
-    // line * / parity
-    container parity {
-      description
-        "Set terminal parity";
-      leaf even {
-        description
-          "Even parity";
-        type empty;
-      }
-      leaf mark {
-        description
-          "Mark parity";
-        type empty;
-      }
-      leaf none {
-        description
-          "No parity";
-        type empty;
-      }
-      leaf odd {
-        description
-          "Odd parity";
-        type empty;
-      }
-      leaf space {
-        description
-          "Space parity";
-        type empty;
-      }
-    }
-    // line * / password
-    container password {
-      description
-        "Set a password";
-      uses password-07-grouping;
-    }
-    // line * / prc
-    container prc {
-      description
-        "PRC commands";
-      leaf expose {
-        description
-          "Expose PRC data";
-        type empty;
-      }
-      leaf hide {
-        description
-          "Hide PRC data";
-        type empty;
-      }
-    }
-    // line * / privilege
-    container privilege {
-      description
-        "Change privilege level for line";
-      container level {
-        description
-          "Assign default privilege level for line";
-        presence "true";
-        leaf number {
-          type uint8 {
-            range "0..15";
-          }
-        }
-      }
-    }
-    // line * / rotary
-    leaf rotary {
-      description
-        "Rotary group to add line to";
-      type uint8 {
-        range "1..99";
-      }
-    }
-    // line * / rxspeed
-    leaf rxspeed {
-      description
-        "Receive speed";
-      type uint32 {
-        range "0..4294967295";
-      }
-    }
-    // line * / session-limit
-    leaf session-limit {
-       description
-        "Set maximum number of sessions";
-       type uint32; 
-    }
-    // line * / session-timeout
-    container session-timeout {
-      description
-        "Set interval for closing connection when there is no input traffic";
-      leaf session-timeout-value {
-        type uint16 {
-          range "0..35791";
-        }
-      }
-      leaf output {
-        description
-          "Include output traffic as well as input traffic";
-        type empty;
-      }
-    }
-    // line * / special-character-bits
-    leaf special-character-bits {
-      description
-        "Bits per character";
-      type uint8 {
-        range "7..8";
-      }
-    }
-    // line * / speed
-    leaf speed {
-      description
-        "Transmit and receive speeds";
-      type uint32 {
-        range "0..4294967295";
-      }
-    }
-    // line * / start-character
-    leaf start-character {
-      description
-        "Define the start character";
-      type union {
-        type uint8;
-        type string;
-      }
-    }
-    // line * / stop-character
-    leaf stop-character {
-      description
-        "Define the stop character";
-      type union {
-        type uint8;
-        type string;
-      }
-    }
-    // line * / stopbits
-    leaf stopbits {
-      description
-        "Set async line stop bits";
-      type enumeration {
-        enum "1";
-        enum "1.5";
-        enum "2";
-      }
-    }
-    // line * / terminal-type
-    leaf terminal-type {
-      description
-        "Terminal type";
-      type string;
-    }
-    // line * / timeout
-    container timeout {
-      description
-        "Timeouts for the line";
-      leaf login {
-        description
-          "Timeouts related to the login sequence";
-        type empty;
-      }
-    }
-    // line * / telnet
-    container telnet {
-      description
-        "Telnet protocol-specific configuration";
-      leaf transparent {
-        description
-          "Send a CR as a CR followed by a NULL instead of a CR followed by a LF";
-        type empty;
-      }
-    }
-    // line * / transport
-    container transport {
-      description
-        "Define transport protocols for line";
-      // line * / transport input
-      container input {
-        leaf-list input {
-          description
-            "Define which protocols to use when connecting to the terminal server";
-          ordered-by user;
-          type enumeration {
-            enum "acercon";
-            enum "all";
-            enum "lapb-ta";
-            enum "lat";
-            enum "mop";
-            enum "nasi";
-            enum "none";
-            enum "pad";
-            enum "rlogin";
-            enum "ssh";
-            enum "telnet";
-            enum "udptn";
-            enum "v120";
-          }
-        }
-      }
-      // line * / transport output
-      container output {
-        leaf-list output {
-          description
-            "Define which protocols to use for outgoing connections";
-          ordered-by user;
-          type enumeration {
-            enum "acercon";
-            enum "all";
-            enum "lapb-ta";
-            enum "lat";
-            enum "mop";
-            enum "nasi";
-            enum "none";
-            enum "pad";
-            enum "rlogin";
-            enum "ssh";
-            enum "telnet";
-            enum "udptn";
-            enum "v120";
-          }
-        }
-      }
-      // line * / transport preferred
-      container preferred {
-        description
-          "Specify the preferred protocol to use";
-        presence "true";
-        leaf protocol {
-          type enumeration {
-            enum "acercon";
-            enum "lat";
-            enum "mop";
-            enum "nasi";
-            enum "none";
-            enum "pad";
-            enum "rlogin";
-            enum "ssh";
-            enum "telnet";
-            enum "udptn";
-          }
-        }
-      }
-    }
-    // line * / txspeed
-    leaf txspeed {
-      description
-        "Transmit speed";
-      type uint32;
-    }
-    // line * / usb-inactivity-timeout
-    container usb-inactivity-timeout {
-      description
-        "Inactivity timeout for USB media type";
-      leaf switch {
-        description
-          "Switch Number";
-        type empty;
-      }
-    }
-    // line * / width
-    leaf width {
-      description
-        "Number of characters on a screen line";
-      type uint16 {
-        range "0..512";
-      }
-    }
-  }
-  /////////////////////////////////////////////////////////
-  // native / line *
-  /////////////////////////////////////////////////////////
-  grouping config-line-grouping {
-    container line { 
-      description
-        "Configure a terminal line";
-      /// line  0-17 >
-      list line-list {
-        key "first-number";
-        leaf first-number {
-          description
-            "First Line number";
-          type uint8 {
-            range "0..17";
-          }
-        }
-        leaf last-number {
-          type uint16 {
-            range "1..17";
-          }
-        }
-        uses line-grouping;
-      }
-      list aux {
-        description
-          "Auxiliary line";
-        key "first";
-        max-elements "1";
-        leaf first {
-          type enumeration {
-            enum "0";
-          }
-        }
-        uses line-grouping;
-      }
-      list console {
-        description
-          "Primary terminal line";
-        key "first";
-        max-elements "1";
-        leaf first {
-          type enumeration {
-            enum "0";
-          }
-        }
-        uses line-grouping;
-      }
-      list vty {
-        description
-          "Virtual terminal";
-        key "first";
-        leaf first {
-          type uint16 {
-            range "0..1869";
-          }
-        }
-        leaf last {
-          type uint16 {
-            range "1..1869";
-          }
-        }
-        uses line-grouping;
-      }
-    }
-  }
-}
-
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-logging.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-logging.yang
deleted file mode 100644
index c88d28581..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-logging.yang
+++ /dev/null
@@ -1,764 +0,0 @@
-submodule Cisco-IOS-XE-logging {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Logging Yang Model.
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-07-11 {
-    description
-      "Add full support for logging discriminator";
-  }
-  revision 2018-03-18 {
-    description
-      "Add diff-dependency for logging discriminator,
-       logging-level-type enumeration order fixed,
-       Change logging remote-host to work correctly for 
-       oc-system mapping";
-  }
-  revision 2018-03-15 {
-    description
-      "Add dependancy to buffered for persistent";
-  }
-  revision 2017-11-10 {
-    description
-      "Add more nodes under logging persistent";
-  }
-  revision 2017-08-25 {
-    description
-      "enforce order of deleting logging cli";
-  }
-
-  revision 2017-06-02 {
-    description
-      "logging host ipv6 more support";
-  }
-
-  revision 2017-03-01 {
-    description
-      "logging host/source-interface fix & enhancement";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  typedef logging-level-type {
-    type union {
-      type uint16 {
-        range "0..7";
-      }
-      type enumeration {
-        enum "emergencies";
-        enum "alerts";
-        enum "critical";
-        enum "errors";
-        enum "warnings";
-        enum "notifications";
-        enum "informational";
-        enum "debugging";
-        enum "bogus";
-      }
-    }
-  }
-
-  typedef severity-group-type {
-    type string {
-      pattern
-        "([0|1|3|6|7],){0,4}[0|1|3|6|7]";
-    }
-  }
-
-  /////////////////////////////////////////////////////////
-  // native / logging
-  /////////////////////////////////////////////////////////
-
-  grouping logging-host-option-group {
-    leaf discriminator {
-      description
-        "Specify a message discriminator identifier for this logging session";
-        type string;
-      }
-      //  filtered              Enable filtered logging
-      //  sequence-num-session  Include session sequence number tag in
-      //                        syslog message
-      //  session-id            Specify syslog message session ID tagging
-      //  xml                   Enable logging in XML
-  } 
-
-  grouping logging-host-transport-group {
-    container transport {
-      container udp {
-        leaf-list port {
-          type uint16;
-        }
-      }
-      container tcp {
-        leaf-list port {
-          type uint16;
-        }
-      }
-    }
-  }
-
-  grouping logging-rate-limit-common-group {
-    list ranges {
-      key "range";
-      leaf range {
-        description
-          "Messages per second";
-        type uint16 {
-          range "1..10000";
-        }
-      }
-      container except {
-        description
-          "Messages of this severity or higher";
-        presence true;
-        leaf range {
-          description
-            "Logging severity level";
-          type logging-level-type;
-        }
-      }
-    }
-  }
-
-  grouping config-logging-discriminator-severity-actions {
-    choice actions {
-      leaf drops {
-        description
-           "To drop messages including the specified regular expression string";
-        type severity-group-type; 
-      }
-      leaf includes {
-        description
-         "To deliver messages including the specified regular expression string";
-        type severity-group-type; 
-      } 
-    }
-  }
-
-  grouping config-logging-discriminator-common-actions {
-    choice actions {
-      leaf drops {
-        description
-           "To drop messages including the specified regular expression string";
-        type string;
-      }
-      leaf includes {
-        description
-         "To deliver messages including the specified regular expression string";
-        type string;
-      } 
-    }
-  }
-  
-  grouping config-logging-grouping {
-    container logging {
-      description
-        "Modify message logging facilities";
-      
-      // logging descriminator 
-      list discriminator {
-        description
-          "Create or modify a message discriminator";
-        key "name";
-        leaf name {
-          type string;
-        }
-        container severity {
-          description
-            "Msg-body pattern for messsage filtering";
-          uses config-logging-discriminator-severity-actions;
-        }
-        container facility {
-          description
-            "Facility pattern for messsage filtering";
-          uses config-logging-discriminator-common-actions;
-        }
-        container mnemonics {
-          description
-            "Mnemonics pattern for messsage filtering";
-          uses config-logging-discriminator-common-actions;
-        }
-        leaf rate-limit {
-          description
-            "Rate-limit value for messsage rate control"; 
-          type uint16 {
-            range "1..10000";
-          }
-        }
-        container msg-body {
-          description
-            "Msg-body pattern for messsage filtering";
-          uses config-logging-discriminator-common-actions;
-        }
-      }
-
-      container persistent {
-        description
-          "Set persistent logging parameters";
-        presence "true";
-        leaf url {
-          description
-            "URL to store logging messages";
-          type string;
-        }
-        leaf size {
-          description
-            "Set disk space for writing log messages";
-          type uint32 {
-            range "16384..2147483647";
-          }
-        }
-        leaf filesize {
-          description
-            "Set size of individual log files";
-          type uint32 {
-            range "8192..2147483647";
-          }
-        }
-        leaf batch {
-          description
-            "Batch size for writing to persistent storage";
-          type uint32 {
-            range "4096..2147483647";
-          }
-        }
-        leaf threshold {
-          description
-            "Setting threshold capacity. When setting circular logging is disabled";
-          type uint8 {
-            range "1..99";
-          }
-        }
-        leaf immediate {
-          description
-            "Write log entry to storage immediately (no buffering).";
-          type empty;
-        }
-        leaf notify {
-          description
-            "Notify when show logging [persistent] is activated.";
-          type empty;
-        }
-        leaf protected {
-          description
-            "Eliminates manipulation on logging-persistent files";
-          type empty;
-        }
-      }
-      // <no> logging monitor
-      container monitor-conf {
-        leaf monitor {
-          type boolean;
-        }
-      }
-      // logging monitor
-      container monitor {
-        description
-          "Set terminal line (monitor) logging parameters";
-        presence "true";
-        leaf severity {
-          type logging-level-type;
-        }
-        list discriminator {
-          description
-            "Establish MD-Console association";
-          key "name";
-          leaf name {
-            type string;
-          }
-          leaf severity {
-            type logging-level-type;
-          }
-        }
-      }
-      leaf alarm {
-        description
-          "Configure syslog for alarms";
-        type union {
-          type uint8 {
-            range "1..4";
-          }
-          type enumeration {
-            enum "critical";
-            enum "informational";
-            enum "major";
-            enum "minor";
-          }
-        }
-      }
-      container buffered {
-        description
-          "Set buffered logging parameters";
-        presence "true";
-        choice buffered-param {
-          case discriminator-param {
-            list discriminator {
-              key "name";
-              leaf name {
-                type string;
-              }
-              leaf size-value {
-                type uint32 {
-                  range "4096..2147483647";
-                }
-              }
-              leaf severity {
-                type logging-level-type;
-              }
-            }
-          }
-          case size-param {
-            container size {
-              leaf size-value {
-                type uint32 {
-                  range "4096..2147483647";
-                }
-              }
-              leaf severity {
-                type logging-level-type;
-                default "debugging";
-              }
-            }
-          }
-          case severity-level {
-            leaf severity {
-              type logging-level-type;
-            }
-          }
-          case xxml-buffer {
-            leaf xxml {
-              description
-                "Enable logging in XML to XML logging buffer";
-              type uint32 {
-                range "4096..2147483647";
-              }
-            }
-          }
-        }
-      }  
-      container console-conf {
-        leaf console {
-          description
-            "Set console logging parameters";
-          type boolean;
-        }
-      }
-      container console {
-        description
-          "Set console logging parameters";
-        presence "true";
-        list discriminator {
-          description
-            "Establish MD-Console association";
-          key "name";
-          leaf name {
-            type string;
-          }
-          leaf severity {
-            type logging-level-type;
-          }
-        }
-        leaf filtered {
-          description
-            "Enable filtered logging";
-          type empty;
-        }
-        leaf guaranteed {
-          description
-            "Guarantee console messages";
-          type empty;
-        }
-        leaf xxml {
-          description
-            "Enable logging in XML";
-          type logging-level-type;
-        }
-        leaf severity {
-          type logging-level-type;
-        }
-      }
-      container event {
-        description
-          "Global interface events";
-        container link-status {
-          description
-            "Globally enable/disable link UPDOWN message";
-          leaf boot {
-            description
-              "Supress/Allow link UPDOWN messages during boot";
-            type empty;
-          }
-          leaf global {
-            type empty;
-          }
-          leaf default {
-            description
-              "Link UPDOWN messages for all interfaces";
-            type empty;
-          }
-        }
-      }
-      container esm {
-        description
-          "Set ESM filter restrictions";
-        leaf config {
-          description
-            "Permit/Deny configuration changes from ESM filters";
-          type empty;
-        }
-      }
-      leaf facility {
-        description
-          "Facility parameter for syslog messages";
-        type enumeration {
-          enum "auth";
-          enum "cron";
-          enum "daemon";
-          enum "kern";
-          enum "local0";
-          enum "local1";
-          enum "local2";
-          enum "local3";
-          enum "local4";
-          enum "local5";
-          enum "local6";
-          enum "local7";
-          enum "lpr";
-          enum "mail";
-          enum "news";
-          enum "sys10";
-          enum "sys11";
-          enum "sys12";
-          enum "sys13";
-          enum "sys14";
-          enum "sys9";
-          enum "syslog";
-          enum "user";
-          enum "uucp";
-        }
-      }
-      container history {
-        description
-          "Configure syslog history table";
-        leaf size {
-          description
-            "Set history table size";
-          type uint16;
-        }
-        leaf severity-level {
-          type union {
-            type uint8 {
-              range "0..7";
-            }
-            type enumeration {
-              enum "emergencies";
-              enum "alerts";
-              enum "critical";
-              enum "errors";
-              enum "warnings";
-              enum "notifications";
-              enum "informational";
-              enum "debugging";
-            }
-          }
-        }
-      }
-      // logging host *
-      container host {
-        description
-          "Set syslog server IP address and parameters";
-        list ipv4-host-list {
-          key "ipv4-host";
-          leaf ipv4-host {
-            type inet:host;
-          }
-        }
-        list ipv4-host-transport-list {
-          key "ipv4-host";
-          leaf ipv4-host {
-            type inet:host;
-          }
-          uses logging-host-transport-group;
-          uses logging-host-option-group;
-        }
-        list ipv4-host-vrf-list {
-          key "ipv4-host vrf";
-          leaf ipv4-host {
-            type inet:host;
-          }
-          leaf vrf {
-            description
-            "Set VRF option";
-            type string;
-          }
-          uses logging-host-option-group;
-        }
-        list ipv4-host-vrf-transport-list {
-          key "ipv4-host vrf";
-          leaf ipv4-host {
-            type inet:host;
-          }
-          leaf vrf {
-            description "Set VRF option";
-            type string;
-          }
-          uses logging-host-transport-group;
-          uses logging-host-option-group;
-        }
-
-        // logging host ipv6 *
-        container ipv6 {
-          description
-            "Set syslog server IPv6 address";
-          list ipv6-host-list {
-            key "ipv6-host";
-            leaf ipv6-host {
-              type ios-types:ipv6-host;
-            }
-          }
-          list ipv6-host-transport-list {
-            key "ipv6-host";
-            leaf ipv6-host {
-              type ios-types:ipv6-host;
-            }
-            uses logging-host-transport-group;
-            uses logging-host-option-group;
-          }
-          list ipv6-host-vrf-list {
-            key "ipv6-host vrf";
-            leaf ipv6-host {
-              type ios-types:ipv6-host;
-            }
-            leaf vrf {
-              description
-              "Set VRF option";
-              type string;
-            }
-            uses logging-host-option-group;
-          }
-          list ipv6-host-vrf-transport-list {
-            key "ipv6-host vrf";
-            leaf ipv6-host {
-              type ios-types:ipv6-host;
-            }
-            leaf vrf {
-              description "Set VRF option";
-              type string;
-            }
-            uses logging-host-transport-group;
-            uses logging-host-option-group;
-          }
-        }
-      }
-      container origin-id {
-        description 
-          "Add origin ID to syslog messages";
-        choice origin-choice {
-          case origin-type { 
-            leaf type-value {
-              description 
-                "Use origin hostname/ip/ipv6 as ID";
-              type enumeration {
-                enum "hostname";
-                enum "ip";
-                enum "ipv6";
-              }
-            } 
-          }     
-          case origin-name {
-            leaf string {
-              description 
-                "Define a unique text string as ID";
-              type string;
-            }
-          }
-        } 
-      }
-      // <no> logging rate-limit
-      container rate-limit-conf {
-        leaf rate-limit {
-          type boolean;
-        }
-      }
-      // logging rate-limit
-      container rate-limit {
-        description
-          "Set messages per second limit";
-        presence true;
-        uses logging-rate-limit-common-group;
-        container console {
-          description
-            "Rate limit only console messages";
-          uses logging-rate-limit-common-group;
-          container all {
-            description "all";
-             uses logging-rate-limit-common-group;
-          }
-        }
-        container all {
-          description
-            "Rate limit only console messages";
-          uses logging-rate-limit-common-group;
-        }
-      }
-
-      // logging source-interface
-      list source-interface {
-        description 
-          "Specify interface for source address in logging transactions";
-        key interface-name;
-        leaf interface-name {
-          type string;
-        }
-        leaf vrf {
-          description
-            "Specify the vrf of source interface for logging transactions";
-          type string;
-        }
-      }
-
-      // logging snmp-trap
-      container snmp-trap {
-        description
-          "Set SNMP trap logging level";
-        leaf alerts {
-          description
-            "Immediate action needed           (severity=1)";
-          type empty;
-        }
-        leaf critical {
-          description
-            "Critical conditions               (severity=2)";
-          type empty;
-        }
-        leaf debugging {
-          description
-            "Debugging messages                (severity=7)";
-          type empty;
-        }
-        leaf emergencies {
-          description
-            "System is unusable                (severity=0)";
-          type empty;
-        }
-        leaf errors {
-          description
-            "Error conditions                  (severity=3)";
-          type empty;
-        }
-        leaf informational {
-          description
-            "Informational messages            (severity=6)";
-          type empty;
-        }
-        leaf notifications {
-          description
-            "Normal but significant conditions (severity=5)";
-          type empty;
-        }
-        leaf warnings {
-          description
-            "Warning conditions                (severity=4)";
-          type empty;
-        }
-      }
-      // logging trap
-      container trap {
-        description
-          "Set trap server logging level";
-        presence "true";
-        choice level {
-          case set-default {
-            leaf trap-default {
-              type empty;
-            }
-          }
-          case set-level {
-            leaf severity {
-              type union {
-                type uint8 {
-                  range "0..7";
-                }
-                type enumeration {
-                  enum "alerts";
-                  enum "critical";
-                  enum "debugging";
-                  enum "emergencies";
-                  enum "errors";
-                  enum "informational";
-                  enum "notifications";
-                  enum "warnings";
-                }
-              }
-              default "informational";
-            }
-          }
-        }
-      }
-      leaf hostip {
-            type inet:host;
-      }	
-      container file {
-        description
-          "Set logging file parameters";
-        leaf name {
-          type string;
-        }
-        leaf max-size {
-          type uint32;
-        }
-        leaf min-size {
-          type uint32;
-        }
-        leaf severity {
-          type logging-level-type;
-        }
-      }
-      leaf snmp-authfail {
-        type empty;
-      }
-      leaf buginf {
-        description "Enable buginf logging for debugging";
-        type empty;
-      }
-      leaf userinfo {
-        description "Enable logging of user info on privileged mode enabling";
-        type empty;
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-native.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-native.yang
deleted file mode 100644
index 6090005ec..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-native.yang
+++ /dev/null
@@ -1,4750 +0,0 @@
-module Cisco-IOS-XE-native {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-native";
-  prefix ios;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-
-  import Cisco-IOS-XE-types {
-    prefix ios-types;
-  }
-
-  import Cisco-IOS-XE-features {
-    prefix ios-features;
-  }
-
-  import Cisco-IOS-XE-interface-common {
-    prefix ios-ifc;
-  }
-
-  include Cisco-IOS-XE-parser;
-  include Cisco-IOS-XE-license;
-  include Cisco-IOS-XE-line;
-  include Cisco-IOS-XE-logging;
-  include Cisco-IOS-XE-ip;
-  include Cisco-IOS-XE-ipv6;
-  include Cisco-IOS-XE-interfaces;
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "NED YANG module for IOS-XE
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-07-27 {
-    description
-      "Add default value 'v2' for fhrp version vrrp";
-  }
-  revision 2018-07-10 {
-    description
-      "Remove 'presence true' from top level 'native / qos'";
-  }
-  revision 2018-05-22 {
-    description
-      "Remove wireless model";
-  }
-
-  revision 2018-03-27 {
-    description
-      "Move top level card to native before controller to keep the sequence.";
-  }
-
-  revision 2018-02-26 {
-     description
-       "Add model for username secret 9 SCRYPT";
-  }
-  revision 2018-02-06 {
-     description
-       "Refactor parameter-map";
-  }
-  revision 2018-02-01 {
-    description
-      "fix banner issue";
-  }
-  revision 2018-01-15 {
-    description
-      "Add monitor session type local and options";
-  }
-  revision 2018-01-07 {
-    description
-      "Add monitor session type erspan-dst and options under erspan-src";
-  }
-  revision 2017-10-24 {
-    description
-      "Add banner support back for login and motd";
-  }
-  revision 2017-10-23 {
-    description
-      "Support for AVB,PTP,MVRP";
-  }
-  revision 2017-10-16 {
-    description
-      "Add diff-dependency on VirtualPortGroup for virtual-service";
-  }
-  revision 2017-09-26 {
-    description
-      "Add username view";
-  }
-  revision 2017-08-30 {
-    description
-      "Add 'umbrella' to parameter-map enum";
-  }
-  revision 2017-08-14 {
-    description
-      "Model for monitor event-trace";
-  }
-  revision 2017-07-13 {
-    description
-      "Support for AVC";
-  } 
-
-  revision 2017-07-08 {
-    description
-      "Model for identity policy additional support";
-  }
-
-  revision 2017-06-26 {
-    description
-      "Model for identity policy";
-  }
-
-  revision 2017-06-23 {
-    description
-      "add options under monitor session type erspan-src";
-  }  
-
-  revision 2017-06-21 {
-    description
-      "add some model in domain";
-  }
-
-  revision 2017-06-15 {
-    description
-      "Removed native/access-list";
-  }
-
-  revision 2017-06-01 {
-    description
-      "add default crypto ikev2 policy and proposal";
-  }
-
-  revision 2017-03-24 {
-    description
-      "Removed banner";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-
-  /////////////////////////////////////////////////////////
-  // TYPEDEF
-  typedef monitor-event-type {
-    type enumeration {
-      enum "error";
-      enum "detail";
-      enum "major";
-//    enum "bfd";
-//    enum "event";
-//    enum "exact-match";
-//    enum "ffd";
-//    enum "fsm";
-//    enum "ha";
-//    enum "ldp";
-//    enum "pwoam";
-//    enum "rf";
-//    enum "status";
-//    enum "switching-point";
-//    enum "vccv";
-    }
-  }
-  /////////////////////////////////////////////////////////
-
-
-  /////////////////////////////////////////////////////////
-  // Grouping
-  /////////////////////////////////////////////////////////
-
-  container native {
-
-    /////////////////////////////////////////////////////////
-    // native / default
-    /////////////////////////////////////////////////////////
-    container default {
-      description
-        "Set a command to its defaults";
-      container crypto {
-        description
-          "Encryption module";
-        container ikev2 {
-          description
-            "Configure IKEv2 Options";
-          leaf proposal {
-            description
-              "Define IKEV2 proposals";
-            type empty;
-          }
-          leaf policy {
-            description
-              "Define IKEV2 policies";
-            type empty;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / bfd
-    /////////////////////////////////////////////////////////
-    container bfd { 
-      description
-        "BFD configuration commands";
-      // @mount Cisco-IOS-XE-bfd
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / version
-    /////////////////////////////////////////////////////////
-    leaf version {
-      description "Version";
-      type string {
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / stackwise-virtual
-    /////////////////////////////////////////////////////////
-
-    container stackwise-virtual{
-      description
-        "Enter stackwise-virtual configuration mode";
-      presence true;
-      // @mount Cisco-IOS-XE-stackwise-virtual.yang
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / boot
-    /////////////////////////////////////////////////////////
-    leaf boot-start-marker {
-      type empty;
-    }
-
-    container boot {
-      description
-        "Modify boot system parameters";
-      container system {
-        description
-          "System Image";
-        leaf tftp-path {
-          description
-            "Example: 192.x.x.x/<path to image>";
-          type string;
-        }
-        //@mount Cisco-IOS-XE-switch.yang
-        //container switch
-        leaf tftp {
-          description
-            "Example 192.168.x.x/<image-path>";
-          type string;
-        }
-        container bootfile {
-          description
-            "WORD - boot filename";
-          list filename-list {
-            key "filename";
-            leaf filename {
-              description
-                "WORD - TFTP filename or URL";
-              type string;
-            }
-          }
-        }
-        container flash {
-          description
-            "flash - Boot from flash memory";
-          list flash-list {
-            key "flash-leaf";
-            leaf flash-leaf {
-              type string;
-            }
-          }
-        }
-      }
-    }
-
-    //@mount Cisco-IOS-XE-switch.yang
-    //container enable-break and container manual
-
-    leaf boot-end-marker {
-      type empty;
-    }
-
-    /// ========================================================================
-    /// banner
-    /// ========================================================================
-    grouping banner-grouping {
-      leaf banner {
-        description
-          "Banner message format, c banner-text c, where 'c' is a delimiting character";
-        type string;
-      }
-    }
-    container banner {
-      description
-        "Define a login banner";
-      container exec {
-        description
-          "Set EXEC process creation banner";
-        uses banner-grouping;
-      }
-      container login {
-        description
-          "Set login banner";
-        uses banner-grouping;
-      }
-      container prompt-timeout {
-        description
-          "Set Message for login authentication timeout";
-        uses banner-grouping;
-      }
-      container motd {
-        description
-          "Set Message of the Day banner";
-        uses banner-grouping;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / captive-portal-bypass
-    /////////////////////////////////////////////////////////
-    leaf captive-portal-bypass { 
-      description
-        "Enable Captive portal bypass for apple devices";
-      type empty;
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / memory
-    /////////////////////////////////////////////////////////
-    container memory { 
-      description "Configure memory management";
-      container statistics {
-        description "Configure statistics history table";
-        container history {
-          description "Configure statistics history table";
-          leaf table {
-            description "Configure statistics history table";
-            type uint8 {
-              range "12..72";
-            }
-          }
-        }
-      }
-      container chunk {
-        description "chunk related configuration";
-        container siblings {
-          description "chunk siblings related configuration";
-          leaf threshold {
-            description "Default is platform dependent";
-            type uint32 {
-              range "2..4294967295";
-            }
-          }
-        }
-      }
-      container free {
-        description "free memory low water mark";
-        container low-watermark {
-          description "low water mark for notifications";
-          leaf IO {
-            description "low water mark of memory in KB";
-            type uint32 {
-              range "1..3994575";
-            }
-          }
-          leaf processor {
-            description "low water mark of memory in KB";
-            type uint32 {
-              range "1..3994575";
-            }
-          }
-        }
-      }
-      leaf lite {
-        description "Enable/disable memory lite";
-        type empty;
-      }
-      container reserve {
-        description "reserve memory";
-        container critical {
-          description "Reserve Critical Memory";
-          presence true;
-          leaf memory-range {
-            description "total amount of memory to be reserved in kilobytes";
-              type uint32 {
-                range "1..4294967295";
-              }
-          }
-        }
-      }
-      container sanity {
-        description "Enable memory sanity";
-        presence true;
-        leaf all {
-          description "Enable memory sanity all";
-          type empty;
-        }
-        leaf buffer {
-          description "Enable memory sanity buffer";
-          type empty;
-        }
-        leaf queue {
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / location
-    /////////////////////////////////////////////////////////
-    container location { 
-      description
-        "Global location configuration commands";
-      container civic-location {
-        description
-          "Civic location information";
-        list identifier {
-          description
-            "Set the identifier";
-          key identifier;
-          leaf identifier{
-            type string;
-          }
-          leaf building {
-            description
-              "Building information";
-            type string;
-          }
-          leaf floor {
-            description
-              "Floor number";
-            type string;
-          }
-          leaf landmark {
-            description
-              "Landmark";
-            type string;
-          }
-          leaf name {
-            description
-              "Resident name";
-            type string;
-          }
-          leaf number {
-            description
-              "Street number";
-            type string;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / call-home
-    /////////////////////////////////////////////////////////
-    container call-home { 
-      description
-        "Enter call-home configuration mode";
-      presence true;
-      // @mount Cisco-IOS-XE-call-home
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / hw-module
-    /////////////////////////////////////////////////////////
-    container hw-module { 
-      description
-        "Control of individual components in the system";
-      container uplink {
-        description
-          "Uplink control";
-        leaf select {
-          description
-            "Select uplink interface";
-          type string;
-        }
-        leaf mode {
-          description
-            "Uplink mode";
-          type enumeration {
-            enum "shared-backplane";
-          }
-        }
-      }
-      list switch {
-        description
-           "Switch in the system";
-          key "switch-number";
-          leaf switch-number {
-            description
-              "Switch number in the Stack (Refer to show switch CLI)";
-            type uint8 {
-              range "1..8";
-            }
-          }
-          container usbflash1 {
-            description
-              "USB SSD";
-            container security {
-              description
-                "Security on usbflash1";
-              container enable {
-                description
-                  "Enable security on usbflash1";
-                presence true;
-                leaf password {
-                  description
-                    "Enter password for enabling security on usbflash1";
-                  type string;
-                }
-              }
-            }
-          }
-        }
-
-      list slot {
-        description
-          "Control a component in a slot";
-          key "name";
-          leaf name {
-            description
-              "Slot of LC";
-            type string;
-          }
-          leaf shutdown {
-            description
-              "Shutdown a fru";
-            type empty;
-          }
-      }
-
-      leaf sm {
-        type uint8;
-      }
-      leaf pvdm {
-        type string;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / cisp
-    /////////////////////////////////////////////////////////
-    container cisp { 
-      description "Set CISP parameters";
-      leaf enable {
-        description "Enable CISP";
-        type empty;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / module
-    /////////////////////////////////////////////////////////
-    container module {
-      description
-        "Module";
-      // @module Cisco-IOS-XE-switch
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / domain
-    /////////////////////////////////////////////////////////
-    list domain { 
-      description
-        "Domain Configuration Commands";
-      key "name";
-      leaf name {
-        type string;
-      }
-      list vrf {
-        description
-          "Specify vrf for domain";
-        key "name";
-        leaf name {
-          type string;
-        }
-        container border {
-          description
-            "Enter border router configuration submode";
-          container advanced {
-            description
-              "Enter border router advanced configuration submode";
-            leaf monitor-cache-percent {
-              description
-                "cache usage (%), border instance will AUTOMATICALLY go through" +
-                " SHUT/NO SHUT any ACTIVE traffic on this border will be affected";
-              type uint8 {
-                range "1..100";
-              }
-            }
-          }
-          container source-interface {
-            description
-              "Source Interface for border";
-            leaf Loopback {
-              description
-                "Loopback interface";
-              type uint32;
-            }
-          }
-          leaf master {
-            description
-              "Specify IP address of Domain master controller";
-            type union {
-              type inet:ipv4-address;
-              type enumeration {
-                enum "local";
-              }
-            }
-          }
-          container password {
-            description
-              "MD5 password to be used with MC";
-            leaf encryption {
-              type enumeration {
-                enum "0";
-                enum "7";
-              }
-            }
-            leaf clear-key {
-              type string;
-            }
-          }
-        }
-        container master {
-          description
-            "Enter master controller configuration submode";
-          choice master-type {
-            case branch {
-              leaf branch {
-                description
-                  "Set master type as branch hub";
-                type empty;
-              }
-            }
-            case hub {
-              leaf hub {
-                description
-                  "Set master type as hub";
-                type empty;
-              }
-            }
-            case transit {
-              leaf transit {
-                description
-                  "Set master type as transit";
-                type uint8 {
-                  range "1..64";
-                }
-              }
-            }
-          }
-          container advanced {
-            description
-              "Advanced configuration submode";
-            leaf byte-loss-threshold {
-              description
-                "Specify minimum byte loss calculation threshold";
-              type uint16 {
-                range "0..5600";
-              }
-            }
-            leaf channel-unreachable-timer {
-              description
-                "Unreach interval detection";
-              type uint16 {
-                range "1..65535";
-              }
-            }
-            leaf load-sharing {
-              description
-                "Enable load-sharing";
-              type empty;
-            }
-            leaf minimum-mask-length {
-              description
-                "Specify minimum mask length";
-              type uint8 {
-                range "1..32";
-              }
-            }
-            leaf mitigation-mode {
-              description
-                "Enable brownout detection in domain";
-              type enumeration {
-                enum "aggressive";
-              }
-            }
-            leaf packet-loss-threshold {
-              description
-                "Specify minimum packet loss calculation threshold";
-              type uint8 {
-                range "1..100";
-              }
-            }
-            container smart-probes {
-              description
-                "Smart probes configuration";
-              leaf destination-port {
-                description
-                  "Specify smart probes destination port number";
-                type uint16 {
-                  range "1..65535";
-                }
-              }
-              leaf source-port {
-                description
-                  "Specify smart probes source port number";
-                type uint16 {
-                  range "1..65535";
-                }
-              }
-            }
-            container syslog {
-              description
-                "Specify syslog minimim time between tca";
-              leaf tca-time-min {
-                description
-                  "Specify time between syslog tcas in seconds";
-                type uint32 {
-                  range "30..36000";
-                }
-              }
-            }
-            container tcp {
-              description
-                "Specify tcp port numbers for mc-br communication";
-              leaf mc-port {
-                description
-                  "Specify tcp MC self port for mc-br communication";
-                type uint16 {
-                  range "1..65535";
-                }
-              }
-            }
-            leaf threshold-variance {
-              description
-                "Policy decision Threshold variance";
-              type uint8 {
-                range "0..100";
-              }
-            }
-            container traffic-class-ageout-timer {
-              description
-                "Traffic-class DB age timer";
-              leaf interval {
-                description
-                  "Specify new timer interval value mins/hours";
-                type uint16 {
-                  range "5..65535";
-                }
-              }
-              leaf interval-unit {
-                type enumeration {
-                  enum "hours";
-                  enum "minutes";
-                }
-              }
-            }
-            leaf transit-site-affinity {
-              description
-                "Enable Transit Site Affinity";
-              type empty;
-            }
-          }
-          container collector {
-            description
-              "NMS/v9 collector configuration";
-            leaf ip {
-              type inet:ipv4-address;
-            }
-            leaf port {
-              description
-                "Specify collector port number";
-              type uint16;
-            }
-          }
-          container enterprise-prefix {
-            description
-              "Enterprise prefix configuration";
-            leaf prefix-list {
-              description
-                "Specify prefix-list with static site targets";
-              type string;
-            }
-          }
-          container load-balance {
-            description
-              "load balance non-policy traffic";
-            presence "true";
-            container advanced {
-              description
-                "Load balancing configuration mode";
-              uses domain-vrf-master-hub-class-grouping;
-            }
-          }
-          container password {
-            description
-              "MD5 password to be used with BRs";
-            leaf encryption {
-              type enumeration {
-                enum "0";
-                enum "7";
-              }
-            }
-            leaf clear-key {
-              type string;
-            }
-          }
-          container site-prefixes {
-            description
-              "site-prefixes configuration";
-            leaf prefix-list {
-              description
-                "Specify prefix-list with static site targets";
-              type string;
-            }
-          }
-          container source-interface {
-            description
-              "Source Interface for master controller";
-            leaf Loopback {
-              description
-                "Loopback interface";
-              type uint32;
-            }
-          }
-          list class {
-            description
-              "Create domain class and enter domain class command mode";
-            key "name sequence";
-            leaf name {
-              type string;
-            }
-            leaf sequence {
-              description
-                "Set the Sequence for the class";
-              type uint16;
-            }
-            uses domain-vrf-master-hub-class-grouping;
-          }
-          leaf hub-ip {
-            type inet:ipv4-address;
-          }
-        }
-      }
-    }
-
-    grouping domain-vrf-master-hub-class-grouping { 
-      container match {
-        description
-          "Specify the applications the policy applies to";
-        list dscp {
-          description
-            "specify DSCP";
-          key "value";
-          leaf value {
-            type ios-types:dscp-type;
-          }
-          leaf policy {
-            description
-              "Specify the policy (user defined/predefined)";
-            type enumeration {
-              enum "best-effort";
-              enum "bulk-data";
-              enum "custom";
-              enum "low-latency-data";
-              enum "real-time-video";
-              enum "scavenger";
-              enum "voice";
-            }
-          }
-        }
-      }
-      container path-preference {
-        description
-          "Specify the preferred provider";
-        leaf primary {
-          description
-            "Primary service provider";
-          type string;
-        }
-        leaf primary2 {
-          description
-            "Primary service provider";
-          type string;
-        }
-        leaf primary3 {
-          description
-            "Primary service provider";
-          type string;
-        }
-        leaf fallback {
-          description
-            "Specify the fallback provider";
-          type union {
-            type enumeration {
-              enum "routing";
-              enum "blackhole";
-            }
-            type string;
-          }
-        }
-        leaf fallback2 {
-          description
-            "Fallback service provider";
-          type string;
-        }
-        leaf fallback3 {
-          description
-            "Fallback service provider";
-          type string;
-        }
-      }
-      leaf path-last-resort {
-        description
-          "Specify path of last resort provider";
-        type string;
-      }
-    }
-
-    grouping identity-policy-grouping {
-      leaf absolute-timer {
-        description
-          "Absolute timeout value in seconds";
-        type uint16 {
-          range "1..65535";
-        }
-      }
-      leaf access-group {
-        description
-          "Access list to be applied";
-        type string;
-      }
-      leaf description {
-        description
-          "Enter a description";
-        type string;
-
-      }
-      leaf inactivity-timer {
-        description
-          "Inactivity timeout value in seconds";
-        type uint16 {
-          range "0..65535";
-        }
-      }
-      leaf interface-template {
-        description
-          "Interface template to be applied";
-        type string;
-      }
-      container linksec {
-        description
-          "Configure link security parameters";
-        leaf policy {
-          description
-            "Set the link security policy";
-          type enumeration {
-            enum "must-not-secure";
-            enum "must-secure";
-            enum "should-secure";
-          }
-        }
-      }
-      container redirect {
-        description
-          "Redirect clients to a particular location";
-        leaf url {
-          description
-            "URL where clients should be redirected";
-          type string;
-        }
-      }
-      container service-policy {
-        description
-          "Configure service policy";
-        list qos {
-          description
-            "Configure qos policies for client";
-          key "direction";
-          leaf direction {
-            type enumeration {
-              enum "input";
-              enum "output";
-            } 
-          }
-          leaf name {
-            type string;
-          }
-        }
-      }
-      leaf sgt {
-        description
-          "SGT tag";
-        type uint16 {
-          range "2..65519";
-        }
-      }
-      leaf tag {
-        description
-          "tag name";
-        type string;
-      }
-      container tunnel {
-        description
-          "tunnel for wired client access";
-        container type {
-          description
-            "tunnel type";
-          container capwap {
-            description
-              "capwap tunnel type";
-            leaf name {
-              description
-                "tunnel profile name";
-              type string;
-            }
-          }
-        }
-      }
-      leaf vlan {
-        description
-          "Enter a VlanId";
-        type uint16 {
-          range "1..4094";
-        }
-      }
-      container voice {
-        description
-          "Voice feature";
-        leaf vlan {
-          description
-            "Critical voice vlan";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / parser
-    /////////////////////////////////////////////////////////
-    uses config-parser-grouping;
-
-
-    /////////////////////////////////////////////////////////
-    // native / service
-    /////////////////////////////////////////////////////////
-    container service { 
-      description
-        "Modify use of network based services";
-      // service internal
-      leaf internal {
-        // Note: allow additional control of the LTE modem
-        description
-          "Enable/Disable Internal commands";
-        type empty;
-      }
-      // service pad
-      container pad-conf {
-        leaf pad {
-          description
-            "Enable PAD commands";
-          type boolean;
-        }
-      }
-      container pad {
-        description
-          "Enable PAD commands";
-        presence "true";
-        leaf cmns {
-          description
-            "Enable PAD over CMNS connections";
-          type empty;
-        }
-        leaf from-xot {
-          description
-            "Accept XOT to PAD connections";
-          type empty;
-        }
-        leaf to-xot {
-          description
-            "Allow outgoing PAD over XOT connections";
-          type empty;
-        }
-      }
-      // service password-encryption
-      leaf password-encryption {
-        description
-          "Encrypt system passwords";
-        type empty;
-      }
-          // service password-recovery
-      leaf password-recovery {
-        description "Enable password recovery";
-        type boolean;
-      }
-
-      // service timestamps
-      container timestamps {
-        description
-          "Timestamp debug/log messages";
-        presence "true";
-        // service timestamps debug
-        container debug {
-          description
-            "Timestamp debug messages";
-          // service timestamps debug datetime
-          container datetime {
-            description
-              "Timestamp with date and time";
-            presence "true";
-            // service timestamps debug datetime localtime
-            container localtime {
-              description
-                "Use local time zone for timestamps";
-              presence "true";
-              // service timestamps debug datetime localtime msec
-              container msec {
-                description
-                  "Include milliseconds in timestamp";
-                presence "true";
-                uses service-timestamp-show-timezone-and-year;
-              }  
-              // service timestamps debug datetime localtime show-timezone 
-              container show-timezone {
-                description
-                  "Add time zone information to timestamp";
-                presence "true";
-                uses service-timestamp-msec-and-year;
-              }  
-              // service timestamps debug datetime localtime year 
-              container year {
-                description
-                  "Include year in timestamp";
-                presence "true";
-                uses service-timestamp-msec-and-show-timezone;				
-              }  
-            }
-            // service timestamps debug datetime msec 
-            container msec {
-              description
-                "Include milliseconds in timestamp";
-              presence "true";
-              // service timestamps debug datetime msec localtime
-              container localtime {
-                description
-                  "Use local time zone for timestamps";
-                presence "true";
-                uses service-timestamp-show-timezone-and-year;				
-              }  
-              // service timestamps debug datetime msec show-timezone 
-              container show-timezone {
-                description
-                  "Add time zone information to timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-year;				
-              }  
-              // service timestamps debug datetime msec year 
-              container year {
-                description
-                  "Include year in timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-show-timezone;				
-              }
-            }
-            // service timestamps debug datetime show-timezone 
-            container show-timezone {
-              description
-                "Add time zone information to timestamp";
-              presence "true";
-              // service timestamps debug datetime show-timezone localtime
-              container localtime {
-                description
-                  "Use local time zone for timestamps";
-                presence "true";
-                uses service-timestamp-msec-and-year;				
-              }  
-              // service timestamps debug datetime show-timezone msec 
-              container msec {
-                description
-                  "Include milliseconds in timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-year;				
-              }  
-              // service timestamps debug datetime show-timezone year 
-              container year {
-                description
-                  "Include year in timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-msec;				
-              }
-            }
-            // service timestamps debug datetime year 
-            container year {
-              description
-                "Include year in timestamp";
-              presence "true";
-              // service timestamps debug datetime year localtime
-              container localtime {
-                description
-                  "Use local time zone for timestamps";
-                presence "true";
-                uses service-timestamp-msec-and-show-timezone;   				
-              }
-              // service timestamps debug datetime year msec 
-              container msec {
-                description
-                  "Include milliseconds in timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-show-timezone;				
-              }
-              // debug service timestamps debug datetime year show-timezone 
-              container show-timezone {
-                description
-                  "Add time zone information to timestamp";
-                presence "true";
-                uses service-timestamp-local-time-and-msec;				
-              }
-            }
-          }                        
-          leaf uptime {
-            description
-              "Timestamp with system uptime";
-            type empty;
-          }
-        }
-        // service timestamps log
-        container log {
-          description
-            "Timestamp log messages";
-          container datetime {
-            description
-              "Timestamp with date and time";
-            presence "true";
-            leaf msec {
-              description
-                "Include milliseconds in timestamp";
-              type empty;
-            }
-            leaf localtime {
-              description
-                "Use local time zone for timestamps";
-              type empty;
-            }
-            leaf show-timezone {
-              description
-                "Add time zone information to timestamp";
-              type empty;
-            }
-            leaf year {
-              description
-                "Include year in timestamp";
-              type empty;
-            }
-          }
-          leaf uptime {
-            description
-              "Timestamp with system uptime";
-            type empty;
-          }
-        }
-      }
-      // service alignment
-      container alignment {
-        description
-          "Control alignment correction and logging";
-        leaf detection {
-          description
-            "Enable detection of alignment issues";
-          type empty;
-        }
-        leaf logging {
-          description
-            "Enable logging of alignment issues";
-          type empty;
-        }
-      }
-      // service call-home
-      leaf call-home {
-        description
-          "Enable call-home service";
-        type empty;
-      }
-      // service compress-config
-      leaf compress-config {
-        description
-          "Compress the configuration file";
-        type empty;
-      }
-      leaf config {
-        description
-          "TFTP load config files";
-        type empty;
-      }
-      // service counters
-      container counters {
-        description
-          "Control aging of interface counters";
-        container max {
-          description
-            "Maximum counter aging threshold";
-          leaf age {
-            description
-              "Aging threshold";
-            type uint8 {
-              range "0..60";
-            }
-          }
-        }
-      }
-
-      // service dhcp
-      leaf dhcp {
-        description
-          "Enable DHCP server and relay agent";
-        type empty;
-      }
-
-      // service disable-ip-fast-frag
-      leaf disable-ip-fast-frag {
-        description
-          "Disable IP particle-based fast fragmentation";
-        type empty;
-      }
-
-      // service exec-callback
-      leaf exec-callback {
-        description
-          "Enable exec callback";
-        type empty;
-      }
-
-      // service exec-wait
-      leaf exec-wait {
-        description
-          "Delay EXEC startup on noisy lines";
-        type empty;
-      }
-
-      // service finger
-      leaf finger {
-        description
-          "Allow responses to finger requests";
-        type empty;
-      }
-
-      // service heartbeat
-      container heartbeat {
-        description
-          "Enable heartbeat processing";
-        leaf fatal-count {
-          description
-            "Set heartbeat fatal count";
-          type uint8 {
-            range "1..60";
-          }
-        }
-        leaf interrupt-interval {
-          description
-            "Set heartbeat interrupt test interval";
-          type uint8 {
-            range "0..60";
-          }
-        }
-        leaf interrupt-max {
-          description
-            "Set maximum message count from interrupt test";
-          type uint8 {
-            range "0..60";
-          }
-        }
-        leaf transmit-interval {
-          description
-            "Set heartbeat transmit interval";
-          type uint8 {
-            range "1..30";
-          }
-        }
-        leaf warning-timeout {
-          description
-            "Set heartbeat warning timeout interval";
-          type uint8 {
-            range "5..60";
-          }
-        }
-      }
-      // service hide-telnet-addresses
-      leaf hide-telnet-addresses {
-        description
-          "Hide destination addresses in telnet command";
-        type empty;
-      }
-      //  image-version          image-version
-      // service linenumber
-      leaf linenumber {
-        description
-          "enable line number banner for each exec";
-        type empty;
-      }
-      // log-hidden
-      leaf log-hidden {
-          description
-            "Enable syslog msgs for hidden/internal commands";
-          type empty;
-      }
-      // service nagle
-      leaf nagle {
-        description
-          "Enable Nagle's congestion control algorithm";
-        type empty;
-      }
-      // service old-slip-prompts
-      leaf old-slip-prompts {
-        description
-          "Allow old scripts to operate with slip/ppp";
-        type empty;
-      }
-      //  prompt                 Enable mode specific prompt
-      container prompt {
-          description
-            "Enable mode specific prompt";
-          leaf config {
-              description
-                "Enable configuration mode prompt";
-              type empty;
-          }
-      }
-      // service pt-vty-logging
-      leaf pt-vty-logging {
-        description
-          "Log significant VTY-Async events";
-        type empty;
-      }
-      // service sequence-numbers
-      leaf sequence-numbers {
-        description
-          "Stamp logger messages with a sequence number";
-        type empty;
-      }
-      // service slave-log
-      leaf slave-log {
-        description
-          "Enable log capability of slave IPs";
-        type empty;
-      }
-      // service tcp-keepalives-in
-      leaf tcp-keepalives-in {
-        description
-          "Generate keepalives on idle incoming network connections";
-        type empty;
-      }
-      // service tcp-keepalives-out
-      leaf tcp-keepalives-out {
-        description
-          "Generate keepalives on idle outgoing network connections";
-        type empty;
-      }
-      //  telnet-zeroidle        Set TCP window 0 when connection is idle
-      leaf telnet-zeroidle {
-          description
-            "Set TCP window 0 when connection is idle";
-          type empty;
-      }
-      //  timestamps             Timestamp debug/log messages
-      //  service tcp-small-servers
-      leaf tcp-small-servers {
-        description
-          "Enable small TCP servers (e.g., ECHO)";
-        type empty;
-      }
-      //  service udp-small-servers      Enable small UDP servers (e.g., ECHO)
-      leaf udp-small-servers {
-        description
-          "Enable small UDP servers (e.g., ECHO)";
-        type empty;
-      }
-      // service unsupported-transceiver
-      leaf unsupported-transceiver {
-        description
-          "Enable support for third-party transceivers";
-        type empty;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / platform
-    /////////////////////////////////////////////////////////
-    container platform {
-      description
-        "platform specific configuration";
-      //@mount Cisco-IOS-XE-platform
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / hostname
-    /////////////////////////////////////////////////////////
-    leaf hostname {
-      description "Set system's network name";
-      type string {
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / enable
-    /////////////////////////////////////////////////////////
-    container enable {
-      description
-        "Modify enable password parameters";
-      container password {
-        description
-          "Assign the privileged level password (MAX of 25 characters)";
-        uses password-07-grouping;
-      }
-      leaf last-resort {
-        description
-          "Define enable action if no TACACS servers respond";
-        type enumeration {
-          enum "password";
-          enum "succeed";
-        }
-      }
-      container secret {
-        description
-          "Assign the privileged level secret";
-        leaf level {
-          description
-            "Set exec level password";
-          type uint8;
-        }
-        leaf type {
-          type enumeration {
-            enum "0";
-            enum "4";
-            enum "5";
-          }
-        }
-        leaf secret {
-          type string;
-        }
-      }
-      leaf use-tacacs {
-        description
-          "Use TACACS to check enable passwords";
-        type empty;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / password
-    /////////////////////////////////////////////////////////
-    container password { 
-      description "Configure encryption password (key)";
-      container encryption {
-        description "Encrypt system passwords";
-        leaf aes {
-          description "Enable stronger (AES) password encryption";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / eap
-    /////////////////////////////////////////////////////////
-    container eap { 
-      description "Configure EAP authenticator parameters";
-      list profile {
-        description "EAP authenticator profile configuration";
-        key "name";
-        leaf name {
-          description "WORD;;EAP authenticator profile name";
-          type string;
-        }
-        container method {
-          description "Add an allowed method";
-          leaf fast {
-            description
-              "EAP-FAST method allowed";
-            type empty;
-          }
-          leaf gtc {
-            description
-              "EAP-GTC method allowed";
-            type empty;
-          }
-          leaf leap {
-            description
-              "EAP-LEAP method allowed";
-            type empty;
-          }
-          leaf mschapv2 {
-            description
-              "EAP-MSCHAPV2 method allowed";
-            type empty;
-          }
-          leaf peap {
-            description
-              "EAP-PEAP method allowed";
-            type empty;
-          }
-          leaf md5 {
-            description "EAP-MD5 method allowed";
-            type empty;
-          }
-          leaf tls {
-            description "EAP-TLS method allowed";
-            type empty;
-          }
-        }
-        leaf pki-trustpoint {
-          description "Set the default pki trustpoint";
-          type string;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / archive
-    /////////////////////////////////////////////////////////
-    container archive { 
-      description
-        "Archive the configuration";
-      // archive log
-      container log {
-        description
-          "Logging commands";
-        container config {
-          description
-            "Logging changes to the running configuration";
-          leaf hidekeys {
-            description
-              "suppress output (e.g. passwords) when displaying logged commands";
-            type empty;
-          }
-          //archive log config / logging
-          container logging {
-            description
-              "Modify config logging parameters";
-            leaf enable {
-              description
-                "Enable the config logger";
-              type empty;
-            }
-            leaf size {
-              description
-                "Maximum number of logged commands that will be kept by the config log";
-              type uint16 {
-                range "1..1000";
-              }
-            }
-            container persistent {
-              description
-                "Log configuration persistent";
-              presence "true";
-              leaf auto {
-                description
-                  "Log configuration commands automatically";
-                type empty;
-              }
-              leaf reload {
-                description
-                  "Apply persisted commands on reload";
-                type empty;
-              }
-            }
-          }
-          //archive log config /notify
-          container notify {
-            description
-              "Send logged commands to target applications";
-            container syslog {
-              description
-                "Send logged commands as syslog messages";
-              presence "true";
-              leaf contenttype {
-                description
-                  "Type of the syslog message content";
-                type enumeration {
-                  enum "plaintext";
-                  enum "xml";
-                }
-              }
-            }
-          }
-        }
-      }
-      //archive path
-      leaf path {
-        description
-          "path for backups";
-        type union {
-          type enumeration {
-            enum "bootflash:";
-            enum "flash:";
-            enum "ftp:";
-            enum "harddisk:";
-            enum "http:";
-            enum "https:";
-            enum "pram:";
-            enum "rcp:";
-            enum "scp:";
-            enum "tftp:";
-          }
-          type string;
-        }
-      }
-      //archive maximum
-      leaf maximum {
-        description
-          "maximum number of backup copies";
-        type uint8 {
-          range "1..14";
-        }
-      }
-      //archive write-memory
-      leaf write-memory {
-        description
-          "Enable automatic backup generation during write memory";
-          type empty;
-      }
-      //archive time-period
-      leaf time-period {
-        description
-          "Period of time in minutes to automatically archive the running-config";
-        type uint32 {
-          range "1..525600";
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / username
-    /////////////////////////////////////////////////////////
-    list username {
-      description
-        "Establish User Name Authentication";
-      key "name";
-      leaf name {
-        type string;
-      }
-      // username * privilege
-      leaf privilege {
-        description
-          "Set user privilege level";
-        type uint8 {
-          range "0..15";
-        }
-      }
-      // username * view
-      leaf view {
-        description
-          "Set view name";
-        type string;
-      }
-      leaf one-time {
-        description
-          "Specify that the username/password is valid for only one time";
-        type empty;
-      }
-      // username * password
-      container password {
-        description
-          "Specify the password for the user";
-        leaf encryption {
-          type enumeration {
-            enum "0";
-            enum "7";
-          }
-        }
-        leaf password {
-          type string;
-        }
-      }
-      // username * secret
-      container secret {
-        description
-          "Specify the secret for the user";
-        leaf encryption {
-          type enumeration {
-            enum "0";
-            enum "5";
-            enum "9";
-          }
-        }
-        leaf secret {
-          type string;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / card
-    /////////////////////////////////////////////////////////
-    container card {
-      description
-        "Configure T1/E1 SPA";
-      // @mount Cisco-IOS-XE-card
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / controller
-    /////////////////////////////////////////////////////////
-    container controller { 
-      description
-        "Configure controller";
-      // @mount Cisco-IOS-XE-controller
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / aqm-register-fnf
-    /////////////////////////////////////////////////////////
-    leaf aqm-register-fnf {
-      description
-        "Export audio/video stats to flow record";
-      type empty;
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / vrf
-    /////////////////////////////////////////////////////////
-    // Note: /vrf must be before /ip and /ipv6 and /interface
-    uses config-vrf-definition-grouping;
-
-
-    /////////////////////////////////////////////////////////
-    // native / rmon
-    /////////////////////////////////////////////////////////
-    container rmon { 
-      description
-        "Remote Monitoring";
-      list alarm {
-        description
-          "Configure an RMON alarm";
-        key "number";
-        leaf number {
-          type uint16;
-        }
-        leaf mib-object {
-          type string;
-        }
-        leaf sample-interval {
-          type uint32;
-        }
-        leaf test-mode {
-          type enumeration {
-            enum "absolute";
-            enum "delta";
-          }
-        }
-        leaf rising-threshold {
-          description
-            "Configure the rising threshold";
-          type int32;
-        }
-        leaf rising-event {
-          type uint16;
-        }
-        leaf falling-threshold {
-          description
-            "Configure the falling threshold";
-          type int32;
-        }
-        leaf falling-event {
-          type uint16;
-        }
-        leaf owner {
-          description
-            "Specify an owner for the alarm";
-          type string;
-        }
-      }
-      list event {
-        description
-          "Configure an RMON event";
-        key "number";
-        leaf number {
-          type uint16;
-        }
-        container log {
-          description
-            "Generate RMON log when the event fires";
-          presence "true";
-          leaf trap {
-            description
-              "Generate SNMP trap when the event fires";
-            type string;
-          }
-          leaf description {
-            description
-              "Specify a description of the event";
-            type string;
-          }
-          leaf owner {
-            description
-              "Specify an owner for the event";
-            type string;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / sampler
-    /////////////////////////////////////////////////////////
-    list sampler { 
-      description
-        "Define a Sampler";
-      key "name";
-      leaf name {
-        type string;
-      }
-      // @mount Cisco-IOS-XE-flow
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / flow
-    /////////////////////////////////////////////////////////
-    container flow { 
-      description
-        "Global Flow configuration subcommands";
-      // @mount Cisco-IOS-XE-flow
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / ip
-    /////////////////////////////////////////////////////////
-    uses config-ip-grouping;
-
-
-    /////////////////////////////////////////////////////////
-    // native / mka
-    /////////////////////////////////////////////////////////
-    container mka { 
-      description "MACsec Key Agreement (MKA) configuration";
-      //@mount Cisco-IOS-XE-mka
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / macro
-    /////////////////////////////////////////////////////////
-    container macro { 
-      description
-        "Macro configuration";
-      container global {
-        description
-          "Enter global macro configuration";
-        leaf description {
-          description
-            "Macro description of this device";
-          type string;
-        }
-      }
-      container auto {
-        description "Macro autoexecution settings";
-        //@mount Cisco-IOS-XE-switch.yang
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / ipv6
-    /////////////////////////////////////////////////////////
-    uses config-ipv6-grouping;
-
-    /////////////////////////////////////////////////////////
-    // native / vlan
-    // Note: /vlan must be before /interface
-    /////////////////////////////////////////////////////////
-    container vlan { 
-      description
-        "Global vlan configuration";
-      // @mount Cisco-IOS-XE-vlan
-    }
-
-     /////////////////////////////////////////////////////////
-     // native / mvrp
-     /////////////////////////////////////////////////////////
-     container mvrp { 
-       description
-         "Global MVRP";
-       //@mount Cisco-IOS-XE-mvrp
-     }   
- 
-     /////////////////////////////////////////////////////////
-     // native / avb 
-     /////////////////////////////////////////////////////////
-     container avb { 
-       description
-         "Global AVB";
-          presence "true";
-       //@mount Cisco-IOS-XE-avb
-     }   
- 
-     /////////////////////////////////////////////////////////
-     // native / ptp 
-     /////////////////////////////////////////////////////////
-     container ptp { 
-       description
-         "Global PTP";
-       //@mount Cisco-IOS-XE-ptp
-     }   
-
-    /////////////////////////////////////////////////////////
-    // native / cdp
-    /////////////////////////////////////////////////////////
-    container cdp { 
-      description
-        "Global CDP configuration subcommands";
-      // @mount Cisco-IOS-XE-cdp
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / avc
-    /////////////////////////////////////////////////////////
-    container avc {
-      description "Application visibility and control";
-      // @mount Cisco-IOS-XE-nbar
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / policy *
-    // Note: /policy must be before /interface
-    /////////////////////////////////////////////////////////
-    container policy {
-      // Note: A top level container has been added for class map
-      // and policy map. Mandatory leaf in list class-map has to reside
-      // in a container to be compiled in the augmented file. All test
-      // cases related to class-map have to be updated
-
-      // @mount Cisco-IOS-XE-policy
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / interface
-    /////////////////////////////////////////////////////////
-    uses config-interface-grouping;
-
-    /////////////////////////////////////////////////////////
-    // native / route-map *
-    /////////////////////////////////////////////////////////
-    list route-map {
-      description
-        "Route map tag";
-      key "name";
-      leaf name {
-        description
-          "WORD;;Route map tag";
-        type string;
-      }
-      // @mount Cisco-IOS-XE-route-map
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / route-tag *
-    /////////////////////////////////////////////////////////
-    container route-tag { 
-      // @mount Cisco-IOS-XE-eigrp
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / authentication *
-    /////////////////////////////////////////////////////////
-    // @mount Cisco-IOS-XE-sanet
-
-    /////////////////////////////////////////////////////////
-    // native / table-map
-    /////////////////////////////////////////////////////////
-    // Note: Must come before policer aggregate
-    list table-map { 
-      description
-        "Configure Table Map";
-      key "name";
-      leaf name {
-        type string;
-      }
-      // @mount Cisco-IOS-XE-qos
-    } //table-map
-
-    /////////////////////////////////////////////////////////
-    // native / sdm
-    /////////////////////////////////////////////////////////
-    container sdm {
-      description
-        "Switch database management";
-      //@mount Cisco-IOS-XE-switch
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / mls
-    /////////////////////////////////////////////////////////
-    // Note: must come before class-map and policy-map.
-    container mls { 
-      description
-        "mls global commands";
-      // @mount Cisco-IOS-XE-mls
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / object-group
-    /////////////////////////////////////////////////////////
-    container object-group { 
-      description
-        "Configure Object group";
-      // @mount Cisco-IOS-XE-object-group
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / policer
-    /////////////////////////////////////////////////////////
-    // Note: must come before class-map and policy-map.
-    // TBD : removed for now since there is no use cases
-    // @mount Cisco-IOS-XE-policer
-
-    list pseudowire-class { 
-      description
-        "Pseudowire-class configuration";
-      key "name";
-      leaf name {
-        type string;
-      }
-      // @mount Cisco-IOS-XE-pseudowire-class
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / control-plane *
-    /////////////////////////////////////////////////////////
-    container control-plane {
-      description
-        "Configure control plane services";
-      presence "true";
-    }
- 
-    /////////////////////////////////////////////////////////
-    // native / control-plane *
-    /////////////////////////////////////////////////////////
-    container control-plane-host {
-      container control-plane {
-        description
-          "Configure control plane services";
-
-        container host {
-          presence "true";
-          list management-interface {
-            description "Configure interface for receiving network management traffic";
-            key "interface-name";
-            leaf interface-name {
-              type string;
-            }
-            container allow {
-              description "Allowed network management protocols on selected interface";
-              leaf beep {
-                description "Beep Protocol";
-                type empty;
-              }
-              leaf ftp {
-                description "File Transfer Protocol";
-                type empty;
-              }
-              leaf http {
-                description "HTTP Protocol";
-                type empty;
-              }
-              leaf https {
-                description "HTTPS Protocol";
-                type empty;
-              }
-              leaf snmp {
-                description "Simple Network Management Protocol";
-                type empty;
-              }
-              leaf ssh {
-                description "Secure Shell Protocol";
-                type empty;
-              }
-              leaf telnet {
-                description "Telnet Protocol";
-                type empty;
-              }
-              leaf tftp {
-                description "Trivial File Transfer Protocol";
-                type empty;
-              }
-              leaf tl1 {
-                description "Transaction Language Session Protocol";
-                type empty;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / config-register *
-    /////////////////////////////////////////////////////////
-    leaf config-register { 
-      description "Define the configuration register";
-      type string {
-        pattern "[0-9xXa-fA-F].*";
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / clock *
-    /////////////////////////////////////////////////////////
-    container clock { 
-      description
-        "Configure time-of-day clock";
-      container calendar-valid {
-        description
-          "Calendar time is authoritative";
-        presence "true";
-      }
-      container summer-time {
-        description
-          "Configure summer (daylight savings) time";
-        leaf zone {
-          type string;
-        }
-        choice summer-choice {
-          case date-case {
-            leaf date {
-              description
-                "Configure absolute summer time";
-              type empty;
-            }
-            leaf start-day {
-              type uint8 {
-                range "1..31";
-              }
-            }
-            leaf start-month {
-              type ios-types:month-type;
-            }
-            leaf start-year {
-              type uint32 {
-                range "1993..2035";
-              }
-            }
-            leaf start-time {
-              type ios-types:hhmm-type;
-            }
-            leaf date-end-day {
-              type uint8 {
-                range "1..31";
-              }
-            }
-            leaf date-end-month {
-              type ios-types:month-type;
-            }
-            leaf date-end-year {
-              type uint32 {
-                range "1993..2035";
-              }
-            }
-            leaf date-end-time {
-              type ios-types:hhmm-type;
-            }
-            leaf offset {
-              type uint16 {
-                range "1..1440";
-              }
-            }
-          }
-          case recurring-case {
-            leaf recurring {
-              description
-                "Configure recurring summer time";
-              type empty;
-            }
-            leaf recurring-start {
-              type union {
-                type uint8 {
-                  range "1..4";
-                }
-                type enumeration {
-                  enum "first";
-                  enum "last";
-                }
-              }
-            }
-            leaf recurring-start-day {
-              type ios-types:weekday-type;
-            }
-            leaf recurring-start-month {
-              type ios-types:month-type;
-            }
-            leaf recurring-start-time {
-              type ios-types:hhmm-type;
-            }
-            leaf recurring-end {
-              type union {
-                type uint8 {
-                  range "1..4";
-                }
-                type enumeration {
-                  enum "first";
-                  enum "last";
-                }
-              }
-            }
-            leaf recurring-end-day {
-              type ios-types:weekday-type;
-            }
-            leaf recurring-end-month {
-              type ios-types:month-type;
-            }
-            leaf recurring-end-time {
-              type ios-types:hhmm-type;
-            }
-            leaf recurring-offset {
-              type uint16 {
-                range "1..1440";
-              }
-            }
-          }
-        }
-      }
-      container timezone {
-        description
-          "Configure time zone";
-        leaf zone {
-          type string;
-        }
-        leaf offset {
-          type enumeration {
-            enum "+";
-            enum "-";
-          }
-        }
-        leaf hours {
-          type int8 {
-            range "-23..23";
-          }
-        }
-        leaf minutes {
-          type int8 {
-            range "0..59";
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / hw-switch *
-    /////////////////////////////////////////////////////////
-    // @mount Cisco-IOS-XE-switch
-
-    /////////////////////////////////////////////////////////
-    // native / logging *
-    /////////////////////////////////////////////////////////
-    uses config-logging-grouping; 
-
-    /////////////////////////////////////////////////////////
-    // native / aaa
-    /////////////////////////////////////////////////////////
-    container aaa { 
-      description
-        "Authentication, Authorization and Accounting.";
-      // @mount Cisco-IOS-XE-aaa
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / privilege
-    /////////////////////////////////////////////////////////
-    uses config-privilege-grouping;
-
-    /////////////////////////////////////////////////////////
-    // native / login *
-    /////////////////////////////////////////////////////////
-    container login { 
-      description
-        "Enable secure login checking";
-      leaf delay {
-        description
-          "Set delay between successive fail login";
-        type uint8 {
-          range "1..10";
-        }
-      }
-      container on-failure {
-        description
-          "Set options for failed login attempt";
-        presence "true";
-        container log {
-          description
-            "Generate syslogs on failure logins";
-          presence "true";
-          leaf every {
-            description
-              "Periodicity for logs generated";
-            type uint16 {
-              range "1..65535";
-            }
-          }
-        }
-      }
-      container on-success {
-        description
-          "Set options for successful login attempt";
-        presence "true";
-        container log {
-          description
-            "Generate syslogs on successful logins";
-          presence "true";
-          leaf every {
-            description
-              "Periodicity for logs generated";
-            type uint16 {
-              range "1..65535";
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / multilink *
-    /////////////////////////////////////////////////////////
-    container multilink {
-      description
-        "PPP multilink global configuration";
-      //@mount Cisco-IOS-XE-ppp
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / mac-address-table *
-    /////////////////////////////////////////////////////////
-    // TODO remove candidate
-    container mac-address-table { 
-      description
-        "Configure the MAC address table";
-      container evc-xconnect {
-        description
-          "All ethernet virtual connections xconnect";
-        leaf l2pt-forward-all {
-          description
-            "Layer 2 Protocol Forward All";
-          type empty;
-        }
-      }
-      container limit {
-        description
-          "Enter parameters for mac limit feature";
-        list bdomain {
-          description
-            "bdomain number for  mac limit feature";
-          key "number";
-          leaf number {
-            type uint16 {
-              range "1..4095";
-            }
-          }
-          leaf action {
-            description
-              "Enter action";
-            type enumeration {
-              enum "warning";
-              enum "limit";
-              enum "shutdown";
-            }
-          }
-          leaf maximum {
-            description
-              "Enter max allowed entries";
-            type uint32 {
-              range "0..16000";
-            }
-          }
-        }
-      }
-      container learning {
-        description
-          "Enable a MAC table learning feature";
-        list vlan {
-          description
-            "Layer 2 table learning per VLAN";
-          key "id";
-          leaf id {
-            type uint16 {
-              range "1..4094";
-            }
-          }
-          leaf module {
-            description
-              "Layer 2 table learning per VLAN per module";
-            type uint8 {
-              range "1..9";
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / redundancy *
-    /////////////////////////////////////////////////////////
-    container redundancy { 
-      description
-        "Enter redundancy mode";
-      presence true;
-      // redundancy maintenance-mode
-      leaf maintenance-mode {
-        description
-          "Enable/Disable maintenance mode ";
-        type empty;
-      }
-      // redundancy main-cpu
-      container main-cpu {
-        description
-          "Enter main-cpu mode";
-        presence true;
-        container auto-sync {
-          leaf running-config {
-            type empty;
-          }
-          leaf config-register {
-            type empty;
-          }
-          leaf bootvar {
-            type empty;
-          }
-          leaf standard {
-            type empty;
-          }
-        }
-        container standby {
-           description
-             "Standby";
-           container console {
-              description
-                "Console";
-              leaf enable {
-                 description
-                   "Enable";
-                 type empty;
-              }
-           }
-           container initialization {
-              description
-                "Initialization";
-              container delay {
-                 description
-                   "Delay";
-                 leaf second {
-                    description
-                      "Delay value in seconds";
-                    type uint16 {
-                        range "30..1800";
-                    }
-                 }
-                 leaf boot-only {
-                    description
-                      "Delay effective only on system boot";
-                    type empty;
-                 }
-              }
-           }
-        }
-      }
-       // redundancy mode
-      leaf mode {
-        description
-          "redundancy mode for this chassis";
-        type enumeration {
-          enum "rpr";
-          enum "rpr-plus";
-          enum "sso";
-          enum "none";
-        }
-      }
-      container policy {
-         description
-           "redundancy policy enforcement";
-         container config-sync {
-            description
-              "config sync parameters";
-            container bulk {
-               description
-                 "bulk configuration mode";
-               container prc {
-                  description
-                    "prc policy enforcement";
-                  leaf reload {
-                     description
-                       "reload standby";
-                     type boolean;
-                  }
-               }
-            }
-            container lbl {
-               description
-                 "line-by-line configuration mode";
-               container prc {
-                  description
-                    "prc policy enforcement";
-                  leaf reload {
-                     description
-                       "reload standby";
-                     type boolean;
-                  }
-               }
-            }
-         }
-      }
-      container timer {
-         description
-           "Select a timer to configure";
-         leaf rpso {
-            description
-              "Delay value in seconds";
-            type uint16 {
-               range "120..1200";
-            }
-         }
-      }
-      container interchassis {
-        description
-          "Enter interchassis mode";
-        list group {
-          description
-            "Enter the redundancy group number";
-          key "group-number";
-          leaf group-number {
-            type uint64 {
-              range "1..4294967295";
-            }
-          }
-          container monitor {
-            description
-              "define the peer monitoring method";
-            leaf peer {
-              description
-                "the peer method";
-              type empty;
-            }
-            leaf bfd {
-              description
-                "set peer monitoring method to bfd";
-              type empty;
-            }
-          }
-          container member {
-            description
-              "specify a redundancy group member";
-            leaf ip {
-              description
-                "specify the redundancy group member using an ip address";
-              type inet:ipv4-address;
-            }
-          }
-          container backbone {
-            description
-              "specify a redundancy group member";
-            container interface {
-              uses ios-ifc:interface-grouping;
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / scheduler *
-    /////////////////////////////////////////////////////////
-    container scheduler { 
-      description
-        "Scheduler parameters";
-      container runtime {
-        description "Process runtime controls";
-        leaf netinput {
-          description "Process-switching run time (in milliseconds)";
-          type uint16 {
-            range "100..40000";
-          }
-        }
-      }
-      container allocate {
-        description
-          "Guarantee CPU time for processes";
-        leaf interrupt-time {
-          type uint16 {
-            range "400..60000";
-          }
-        }
-        leaf process-time {
-          type uint16 {
-            range "100..4000";
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / epm *
-    /////////////////////////////////////////////////////////
-    container epm { 
-      description "EPM Global Configuration Commands";
-      leaf logging {
-        description "Enable EPM logging";
-        type empty;
-        }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / spanning-tree *
-    /////////////////////////////////////////////////////////
-    container spanning-tree { 
-      description
-        "Spanning Tree Subsystem";
-      // @mount Cisco-IOS-XE-spanning-tree
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / subscriber *
-    /////////////////////////////////////////////////////////
-    container subscriber { 
-      description
-        "Subscriber configuration";
-      leaf templating {
-        description
-          "Configure subscriber templating";
-        type empty;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / track *
-    /////////////////////////////////////////////////////////
-    container track { 
-      description
-        "Object tracking configuration commands";
-      // @mount Cisco-IOS-XE-track
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / dot1x
-    /////////////////////////////////////////////////////////
-    container dot1x { 
-      description
-        "IEEE 802.1X Global Configuration Commands";
-      // @mount Cisco-IOS-XE-dot1x
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / mab
-    /////////////////////////////////////////////////////////
-    container mab { 
-      description
-        "mab Configuration Commands";
-      container logging {
-        description
-          "Set logging parameters";
-        leaf verbose {
-          description
-            "Show verbose messages in system logs";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / fallback
-    /////////////////////////////////////////////////////////
-    container fallback { 
-      description "Fallback configuration commands";
-      // @mount Cisco-IOS-XE-dot1x
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / parameter-map *
-    /////////////////////////////////////////////////////////
-    container parameter-map { 
-      //Note: put the top level nodes in the base file. Nodes in
-      //augmented file will show up in the submode (config-profile)#
-      description
-        "parameter map";
-      container type {
-        description
-          "parameter map type";
-        // Each parameter-map type should augment from this point
-        // @mount Cisco-IOS-XE-policy
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / ppp *
-    /////////////////////////////////////////////////////////
-    container ppp { 
-      description
-        "PPP global configuration";
-      // @mount Cisco-IOS-XE-ppp
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / mac *
-    /////////////////////////////////////////////////////////
-    container mac { 
-      description
-        "Global MAC configuration subcommands";
-      container address-table {
-        description
-          "Configure the MAC address table";
-        container aging-time {
-          description
-            "Set MAC address table entry maximum age";
-          leaf val {
-            type uint32 {
-              range "0 | 10..1000000";
-            }
-          }
-          leaf routed-mac {
-            description
-              "Set RM Aging interval";
-            type empty;
-          }
-          leaf vlan {
-            description
-              "VLAN Keyword";
-            type uint16 {
-              range "1..4094";
-            }
-          }
-        }
-        leaf control-packet-learn {
-          description
-            "Enable/Disable learning from Control Packets";
-          type empty;
-        }
-        container learning {
-          description
-            "Enable MAC table learning feature";
-          leaf vlan {
-            description
-              "<1-4094>;;VLAN id to enable MAC Address learning";
-            type uint16 {
-              range "1..4094";
-            }
-          }
-        }
-        container notification {
-          description
-            "Enable/Disable MAC Notification on the switch";
-          container change {
-            description
-              "Enable/Disable MAC Notification feature on the switch";
-            presence "true";
-            leaf history-size {
-              description
-                "Number of entries in history table (0-500)";
-              type uint16 {
-                range "0..500";
-              }
-            }
-            leaf interval {
-              description
-                "Notification interval in seconds (0-2147483647)";
-              type uint32 {
-                range "0..2147483647";
-              }
-            }
-          }
-          leaf mac-move {
-            description
-              "Enable Mac Move Notification";
-            type empty;
-          }
-          container threshold {
-            description
-              "Configure L2 Table monitoring";
-            presence "true";
-            leaf interval {
-              description
-                "<120-1000000> Interval time in seconds";
-              type uint32 {
-                range "120..1000000";
-              }
-            }
-            container limit {
-              description
-                "Limit percentage";
-              leaf percentage {
-                description
-                  "Percentage (0-100)";
-                type uint8 {
-                  range "0..100";
-                }
-              }
-              leaf interval {
-                description
-                  "<120-1000000> Interval time in seconds";
-                type uint32 {
-                  range "120..1000000";
-                }
-              }
-            }
-          }
-        }
-        container static {
-          description
-            "Static MAC entry";
-          leaf mac-address {
-            description
-              "xxxx.xxxx.xxxx 48 bit mac address";
-            type ios-types:cisco-mac-address-type;
-          }
-          leaf vlan {
-            description
-              "<1-4094> VLAN id of mac address table (1-4094)";
-            type uint16 {
-              range "1..4094";
-            }
-          }
-          leaf drop {
-            description
-              "drop frames";
-            type empty;
-          }
-          leaf interface {
-            description
-              "Output interface exact long name";
-            type string;
-          }
-        }
-      }
-      // @mount Cisco-IOS-XE-acl for access-list
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / tacacs
-    /////////////////////////////////////////////////////////
-    container tacacs { 
-      description
-        "TACACS server configuration command";
-      // @mount Cisco-IOS-XE-tacacs
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / tacacs-server
-    /////////////////////////////////////////////////////////
-    container tacacs-server { 
-      description
-        "Modify TACACS query parameters";
-      // @mount Cisco-IOS-XE-tacacs-server
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / software 
-    /////////////////////////////////////////////////////////
-    container software { 
-      description
-        "Configure software installation parameters";
-      container auto-upgrade {
-        description
-          "Configure software auto upgrade parameters";
-        leaf enable {
-          description
-            "Enable the auto upgrade installation feature";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / upgrade
-    /////////////////////////////////////////////////////////
-    container upgrade { 
-      description
-        "Global upgrade configuration subcommands";
-      container fpd {
-        description
-          "Configure field programmable devices upgrade options";
-        leaf auto {
-          description
-            "Auto upgrade all FPD images";
-          type empty;
-        }
-        leaf path {
-          description
-            "Set path to locate the FPD image package file for auto upgrade";
-          type string;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / vtp
-    /////////////////////////////////////////////////////////
-    container vtp { 
-      description
-        "Configure global VTP state";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / xconnect
-    /////////////////////////////////////////////////////////
-    container xconnect { 
-      // @mount Cisco-IOS-XE-l2vpn
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / fabric *
-    /////////////////////////////////////////////////////////
-    //TODO: Should fabric be moved out of the main model?
-    // Remove candidate
-    container fabric {
-      description
-        "Catalyst 6000 crossbar fabric configuration commands";
-      container switching-mode {
-        description
-          "Switching mode settings";
-        container allow {
-          description
-            "Allow settings";
-          choice allow-choice {
-            leaf bus-mode {
-              description
-                "Allow switching in bus mode for modules";
-              type empty;
-            }
-            container truncated {
-              description
-                "Truncated switching mode";
-              presence "true";
-              leaf threshold {
-                description
-                  "Number of SFM-capable modules for truncated switching mode. Switch applies the threshold only when the mode is disallowed. Switch ignores the threshold when the truncated mode is allowed";
-                type uint8 {
-                  range "1..9";
-                }
-              }
-            }
-          }
-        }
-        container force {
-          description
-            "Force modules to different switching modes";
-          leaf bus-mode {
-            description
-              "Switching mode of service modules will be forced to bus-mode by powercycling it.";
-            type empty;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / port-channel *
-    /////////////////////////////////////////////////////////
-    container port-channel {
-      description
-        "EtherChannel configuration";
-      //@mount Cisco-IOS-XE-ethernet
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / key *
-    /////////////////////////////////////////////////////////
-    container key { 
-      description
-        "Key management";
-      //@mount Cisco-IOS-XE-crypto
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / l2
-    /////////////////////////////////////////////////////////
-    container l2 { 
-      description
-        "Layer 2 configuration";
-      leaf router-id {
-        description
-          "Configure a layer 2 identifier";
-        type inet:ipv4-address;
-      }
-      //@mount Cisco-IOS-XE-l2vpn
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / system
-    /////////////////////////////////////////////////////////
-    container system {
-      description
-        "Set the system configuration";
-      //@mount Cisco-IOS-XE-system
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / errdisable
-    /////////////////////////////////////////////////////////
-    container errdisable { 
-      description
-        "Error disable";
-      // errdisable detect
-      container detect {
-        description
-          "Error disable detection";
-        container cause {
-          description
-            "Enable error disable detection for application";
-          leaf all {
-            description
-              "Enable error detection on all cases";
-            type empty;
-          }
-          leaf arp-inspection {
-            description
-              "Enable error detection for arp inspection";
-            type empty;
-          }
-          leaf bpduguard {
-            description
-              "Enable error detection on bpdu-guard";
-            type empty;
-          }
-          leaf dhcp-rate-limit {
-            description
-              "Enable error detection on dhcp-rate-limit";
-            type empty;
-          }
-          leaf dtp-flap {
-            description
-              "Enable error detection on dtp-flapping";
-            type empty;
-          }
-          leaf gbic-invalid {
-            description
-              "Enable error detection on gbic-invalid";
-            type empty;
-          }
-          leaf inline-power {
-            description
-              "Enable error detection for inline-power";
-            type empty;
-          }
-          leaf l2ptguard {
-            description
-              "Enable timer to recover from l2protocol-tunnel error disable state";
-            type empty;
-          }
-          leaf link-flap {
-            description
-              "Enable error detection on linkstate-flapping";
-            type empty;
-          }
-          leaf loopback {
-            description
-              "Enable error detection on loopback";
-            type empty;
-          }
-          leaf mlacp-minlink {
-            type empty;
-          }
-          leaf pagp-flap {
-            description
-              "Enable error detection on pagp-flapping";
-            type empty;
-          }
-          leaf pppoe-ia-rate-limit {
-            description
-              "Enable error detection on PPPoE IA rate-limit";
-            type empty;
-          }
-          container security-violation {
-            description "Enable error detection on 802.1x-guard";
-            container shutdown {
-              description "Specify error disable shutdown mode for 802.1x-guard";
-              leaf vlan {
-                description "Shutdown vlan on 802.1x-guard violation";
-                type empty;
-              }
-            }
-          }
-          leaf sfp-config-mismatch {
-            description
-              "Enable error detection on SFP config mismatch";
-            type empty;
-          }
-          leaf small-frame {
-            description
-              "Enable error detection on small_frame";
-            type empty;
-          }
-        }
-      }
-      // errdisable flap-setting
-      container flap-setting {
-        description
-          "Error disable flap detection setting";
-        container cause {
-          description
-            "Set error disable flap parameters for application";
-          container dtp-flap {
-            description
-              "Set the variables related to detection of dtp flaps";
-            leaf max-flaps {
-              description
-                "maximum flaps allowed before setting to errdisable";
-              type uint8 {
-                range "1..100";
-              }
-            }
-            leaf time {
-              description
-                "time period the flaps are counted";
-              type uint8 {
-                range "1..120";
-              }
-            }
-          }
-          container link-flap {
-            description
-              "Set the variables related to detection of link flaps";
-            leaf max-flaps {
-              description
-                "maximum flaps allowed before setting to errdisable";
-              type uint8 {
-                range "1..100";
-              }
-            }
-            leaf time {
-              description
-                "time period the flaps are counted";
-              type uint8 {
-                range "1..120";
-              }
-            }
-          }
-          container pagp-flap {
-            description
-              "Set the variables related to detection of pagp flaps";
-            leaf max-flaps {
-              description
-                "maximum flaps allowed before setting to errdisable";
-              type uint8 {
-                range "1..100";
-              }
-            }
-            leaf time {
-              description
-                "time period the flaps are counted";
-              type uint8 {
-                range "1..120";
-              }
-            }
-          }
-        }
-      }
-      // errdisable recovery
-      container recovery {
-        description
-          "Error disable recovery";
-        // errdisable recovery cause
-        container cause {
-          description
-            "Enable error disable recovery for application";
-          leaf all {
-            description
-              "Enable timer to recover from all error causes";
-            type empty;
-          }
-          leaf arp-inspection {
-            description
-              "Enable timer to recover from arp inspection error disable state";
-            type empty;
-          }
-          leaf bpduguard {
-            description
-              "Enable timer to recover from BPDU Guard error";
-            type empty;
-          }
-          leaf channel-misconfig {
-            description
-              "(STP)  Enable timer to recover from channel misconfig error";
-            type empty;
-          }
-          leaf dhcp-rate-limit {
-            description
-              "Enable timer to recover from dhcp-rate-limit error";
-            type empty;
-          }
-          leaf dtp-flap {
-            description
-              "Enable timer to recover from dtp-flap error";
-            type empty;
-          }
-          leaf gbic-invalid {
-            description
-              "Enable timer to recover from invalid GBIC error";
-            type empty;
-          }
-          leaf inline-power {
-            description
-              "Enable timer to recover from inline-power error";
-            type empty;
-          }
-          leaf l2ptguard {
-            description
-              "Enable timer to recover from l2protocol-tunnel error disable state";
-            type empty;
-          }
-          leaf link-flap {
-            description
-              "Enable timer to recover from link-flap error";
-            type empty;
-          }
-          leaf link-monitor-failure {
-            type empty;
-          }
-          leaf loopback {
-            description
-              "Enable timer to recover from loopback error";
-            type empty;
-          }
-          leaf mac-limit {
-            description
-              "Enable timer to recover from mac limit disable state";
-            type empty;
-          }
-          leaf mlacp-minlink {
-            type empty;
-          }
-          container oam-remote-failure {
-            presence "true";
-            leaf critical-event {
-              type empty;
-            }
-            leaf dying-gasp {
-              type empty;
-            }
-            leaf link-fault {
-              type empty;
-            }
-          }
-          leaf pagp-flap {
-            description
-              "Enable timer to recover from pagp-flap error";
-            type empty;
-          }
-          leaf port-mode-failure {
-            description
-              "Enable timer to recover from port mode change failure";
-            type empty;
-          }
-          leaf pppoe-ia-rate-limit {
-            description
-              "Enable timer to recover from PPPoE IA rate-limit error";
-            type empty;
-          }
-          leaf psp {
-            type empty;
-          }
-          leaf psecure-violation {
-            description
-              "Enable timer to recover from psecure violation error";
-            type empty;
-          }
-          leaf security-violation {
-            description
-              "Enable timer to recover from 802.1x violation error";
-            type empty;
-          }
-          leaf sfp-config-mismatch {
-            description
-              "Enable timer to recover from SFP config mismatch error";
-            type empty;
-          }
-          leaf small-frame {
-            description
-              "Enable timer to recover from small frame error";
-            type empty;
-          }
-          leaf storm-control {
-            description
-              "Enable timer to recover from storm-control error";
-            type empty;
-          }
-          leaf udld {
-            description
-              "Enable timer to recover from udld error";
-            type empty;
-          }
-          leaf unicast-flood {
-            type empty;
-          }
-          leaf vmps {
-            description
-              "Enable timer to recover from vmps shutdown error";
-            type empty;
-          }
-        }
-        leaf interval {
-          description
-            "Error disable recovery timer value";
-          type uint32 {
-            range "30..86400";
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / identity
-    /////////////////////////////////////////////////////////
-    container identity { 
-      description "Identity Configuration Commands";
-      list policy {
-        description
-          "Create an Identity policy";
-        key "name";
-        leaf name {
-          description "Specify a policy name";
-          type string;
-        }
-        container no {
-          description
-            "Negate a command or set its defaults";
-          uses identity-policy-grouping;
-        }
-        uses identity-policy-grouping;
-      }
-      container profile {
-        description "Create an Identity profile";
-        leaf dot1x {
-          description "Service type for 802.1x";
-          type empty;
-        }
-        leaf default {
-          description "Service type default";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / monitor
-    /////////////////////////////////////////////////////////
-    grouping monitor-event-trace-enable-disable-grouping {
-      leaf enable {
-        type empty;
-      }
-      leaf disable {
-        type empty;
-      }
-    }
-
-    container monitor { 
-      description
-        "Monitoring different system events";
-      container event-trace {
-        description
-          "Tracing of system events";
-        container timestamps {
-          presence "true"; 
-          description
-           "Format of event trace timestamps";
-          leaf uptime {
-            description
-              "Timestamp with system uptime";
-            type empty;
-          }			
-        }
-        container atom {
-          description
-            "AToM traces";
-          container error {
-            description
-              "This buffer stores only error logs by default.";
-            uses monitor-event-trace-enable-disable-grouping;
-            leaf-list include {
-              description
-                "Include a subset of debug types";
-              type monitor-event-type;
-            }
-          }
-          container event {
-            description
-              "This buffer stores all logs by default.";
-            uses monitor-event-trace-enable-disable-grouping;
-            leaf size {
-               type uint32;
-            }
-            leaf-list exclude {
-              description
-                "Include a subset of debug types";
-              type monitor-event-type;
-            }
-          }
-          container major {
-            description
-              "This buffer stores only major logs and error logs by default.";
-            uses monitor-event-trace-enable-disable-grouping;
-            leaf-list include {
-              description
-                "Include a subset of debug types";
-              type monitor-event-type;
-            }
-          }
-        }
-        leaf sequence-number {
-          description
-           "Display event trace entries with sequence number";
-          type empty;
-        }
-      }
-      // monitor session *
-      list session {
-        description
-          "Configure a SPAN session";
-        key "id";
-        leaf id {
-          type uint8 {
-            range "1..66";
-          }
-        }
-        // monitor session * destination
-        container destination {
-          description
-            "SPAN destination interface or VLAN";
-          list interface {
-            description
-              "SPAN destination interface";
-            key "name";
-            leaf name {
-              description
-                "Interface Name";
-              type string;
-            }
-            leaf encapsulation {
-              description
-                "Set encapsulation for destination interface";
-              type enumeration {
-                enum "dot1q";
-                enum "isl";
-                enum "replicate";
-              }
-            }
-            leaf ingress {
-              description
-                "Enable ingress traffic forwarding";
-              type empty;
-            }
-            leaf ingress-encap {
-              when "../ingress" {
-              }
-              type enumeration {
-                enum "dot1q";
-                enum "isl";
-                enum "untagged";
-              }
-            }
-            leaf vlan {
-              description
-                "Set default VLAN for untagged ingress traffic";
-              when "../ingress" {
-              }
-              type uint16 {
-                range "1..4094";
-              }
-            }
-	        }
-          //  remote     SPAN destination Remote
-          container remote {
-            description "SPAN destination Remote";
-            leaf vlan {
-              description "Remote SPAN destination RSPAN VLAN";
-              type uint16 {
-                range "1006..4094";
-              }
-            }
-          }
-        }
-        //  filter       SPAN filter VLAN
-        // monitor session * filter       SPAN filter VLAN
-        container filter {
-          description
-            "SPAN filter VLAN";
-          container packet-type {
-            leaf status {
-              type enumeration {
-                enum "good";
-                enum "bad";
-              }
-            }
-            leaf direction {
-              type enumeration {
-                enum "rx";
-                enum "tx";
-              }
-            }
-          }
-          container ip {
-            description "Specify IP Access control rules";
-            container access-group {
-              description "Specify access control group";
-              leaf acl-name {
-                description "Access-list name";
-                type string;
-              }
-            }
-          }
-        }
-        // monitor session * source
-        container source {
-          description
-            "SPAN source interface, VLAN ";
-          list interface {
-            description
-              "SPAN source interface";
-            key "name";
-            leaf name {
-              description
-                "Interface Name";
-              type string;
-            }
-            leaf direction {
-              type enumeration {
-                enum "both";
-                enum "rx";
-                enum "tx";
-              }
-            }
-          }
-          container vlan {
-            description
-              "SPAN source VLAN";
-            leaf vlan {
-              type uint16 {
-                range "1..4094";
-              }
-            }
-            // ,     Specify another range of VLANs
-            // -     Specify a range of VLANs
-            leaf direction {
-              type enumeration {
-                enum "both";
-                enum "rx";
-                enum "tx";
-              }
-            }
-          }
-          //  remote     SPAN source Remote
-          container remote {
-            description
-              "SPAN source Remote";
-            leaf vlan {
-              description
-                "Remote SPAN source RSPAN VLAN <1-1001>|<1006-4094>";
-              type uint16 {
-                range "1..1001 | 1006..4094";
-              }
-            }
-          } // remote
-        }
-        container type {
-          description
-            "Type of monitor session";
-          container erspan-source {
-            description
-              "Encapsulated RSPAN Source Session";				
-            presence "true";
-            leaf description {
-              description
-                "Description for this session";
-              type string;
-            }
-            container source {
-              description
-                "SPAN source interface, VLAN ";
-              list interface {
-                description
-                  "SPAN source interface";
-                key "name";
-                leaf name {
-                  description
-                    "Interface Name";
-                  type string;
-                }
-                leaf direction {
-                  type enumeration {
-                    enum "both";
-                    enum "rx";
-                    enum "tx";
-                  }
-                }
-              }
-              list vlan {
-                description
-                  "SPAN source VLAN";
-                key "vlan1";
-                leaf vlan1 {
-                  type uint16 {
-                    range "1..4094";
-                  }
-                }
-                leaf direction {
-                  type enumeration {
-                    enum "both";
-                    enum "rx";
-                    enum "tx";
-                  }
-                }
-              }
-            }
-            container filter {
-              description
-                "SPAN filter VLAN";
-              list vlan {
-                key "vlan1";
-                leaf vlan1 {
-                  type uint16 {
-                    range "1..4094";
-                  }
-                }
-              }
-              container ip {
-                description "Specify IP Access control rules";
-                container access-group {
-                  description "Specify access control group";
-                  leaf acl-name {
-                    description "Access-list name";
-                    type string;
-                  }
-                }
-              }
-              leaf sgt {
-                description "SPAN source SGT";
-                type uint16 {
-                  range "0..65535";
-                }
-              }
-            }
-            leaf header-type {
-                description
-                  "ERSPAN header-type for encapsulation. Default is type 2";
-                type uint8 {
-                  range "2..3";
-                }
-            }
-            leaf shutdown {
-              description
-                "Take the Service Instance out of Service";
-              type empty;
-            }
-            container destination {
-              description
-                "Specify Destination and their properties";				  
-              presence "true";
-              container ip {
-                description
-                  "IP Properties";
-                leaf address {
-                  description
-                    "Enter IP Address";
-                  type inet:ipv4-address;
-                }				  
-                leaf ttl {
-                  description
-                    "IP TTL";
-                  type uint16 {
-                    range "2..255";
-                  }
-                }
-              }  				
-              leaf erspan-id {
-                description
-                  "Enter ERSPAN Identifier";
-                type uint16 {
-                  range "1..1023";
-                }
-              }  				
-              container origin {
-                description
-                  "Origin IP Properties";
-                container ip {
-                  description
-                    "origin IP Properties";
-                  leaf address {
-                    description
-                      "Enter IP Address";
-                    type inet:ipv4-address;
-                  }
-                }
-              }
-            }
-          }
-          container erspan-destination {
-            description
-              "Encapsulated RSPAN Destination Session";				
-            presence "true";
-            leaf description {
-              description
-                "Properties for this session";
-              type string;
-            }
-            container destination {
-              description
-                "SPAN destination interface, VLAN ";
-              list interface {
-                description
-                  "SPAN destination interface";
-                key "name";
-                leaf name {
-                  description
-                    "Interface Name";
-                  type string;
-                }
-              }
-              leaf vlan {
-                description
-                  "Remote SPAN destination RSPAN VLAN <1-1001>|<1006-4094>";
-                type uint16 {
-                  range "1..1001 | 1006..4094";
-                }
-              }
-            }
-            leaf shutdown {
-              description
-                "Shutdown this session";
-              type empty;
-            }
-            container source {
-              description
-                "Specify Source and their properties";				  
-              presence "true";
-              container ip {
-                description
-                  "IP Address";
-                leaf address {
-                  description
-                    "Enter IP Address";
-                  type inet:ipv4-address;
-                }				  
-              }
-              leaf vrf {
-                description
-                  "Enter VRF number";
-                type string;
-              }
-              leaf erspan-id {
-                description
-                  "Enter ERSPAN Identifier";
-                type uint16 {
-                  range "1..1023";
-                }
-              }  				
-            }
-          }//erspan
-
-          container local {
-            description
-              "Local SPAN Session";
-            presence "true";
-            leaf description {
-              description
-                "Description for this session";
-              type string;
-            }
-            container source {
-              description
-                "SPAN source Interface/VLAN/CPU";
-              list interface {
-                description
-                  "SPAN source interface";
-                key "name";
-                leaf name {
-                  description
-                    "Interface Name";
-                  type string;
-                }
-                leaf direction {
-                  type enumeration {
-                    enum "both";
-                    enum "rx";
-                    enum "tx";
-                  }
-                }
-              }//list interface
-
-              list vlan {
-                description
-                  "SPAN source VLAN";
-                key "vlan1";
-                leaf vlan1 {
-                  type uint16 {
-                    range "1..4094";
-                  }
-                }
-                leaf direction {
-                  type enumeration {
-                    enum "both";
-                    enum "rx";
-                    enum "tx";
-                  }
-                }
-              }//list vlan
-            }//source
-
-            // monitor session * destination
-            container destination {
-              description
-                "SPAN destination interface or VLAN";
-              list interface {
-                description
-                  "SPAN destination interface";
-                key "name";
-                leaf name {
-                  description
-                    "Interface Name";
-                  type string;
-                }
-              }//interface
-            }//destination
-
-            container filter {
-              description
-                "SPAN filter VLAN";
-              list vlan {
-                key "vlan1";
-                leaf vlan1 {
-                  type uint16 {
-                    range "1..4094";
-                  }
-                }
-              }
-            }//filter
-            leaf shutdown {
-              description
-                "Take the Service Instance out of Service";
-              type empty;
-            }
-          }//local
-
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / tftp-server
-    /////////////////////////////////////////////////////////
-    list tftp-server { 
-      description
-        "Provide TFTP service for netload requests";
-      key "name";
-      leaf name {
-        type string;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / radius-server
-    /////////////////////////////////////////////////////////
-    container radius-server { 
-      description
-        "Modify RADIUS query parameters";
-      // @mount Cisco-IOS-XE-radius-server
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / radius
-    /////////////////////////////////////////////////////////
-    container radius { 
-      description
-        "RADIUS server configuration command";
-      // @mount Cisco-IOS-XE-radius
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / zone
-    /////////////////////////////////////////////////////////
-    container zone { 
-      description
-        "FW with zoning";
-      // @mount Cisco-IOS-XE-zone
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / zone-pair
-    /////////////////////////////////////////////////////////
-    container zone-pair { 
-      description
-        "Zone pair command";
-       // @mount Cisco-IOS-XE-zone
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / alarm-contact *
-    /////////////////////////////////////////////////////////
-    list alarm-contact {
-      key "name";
-      leaf name {
-        type uint8 {
-          range "1..4";
-        }
-      }
-      leaf description {
-        type string {
-          length "1..80";
-        }
-      }
-      leaf severity {
-        type enumeration {
-          enum "critical";
-          enum "major";
-          enum "minor";
-        }
-      }
-      leaf trigger {
-        type enumeration {
-          enum "open";
-          enum "closed";
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / ethenet *
-    /////////////////////////////////////////////////////////
-    container ethernet { 
-      description
-        "Ethernet configuration";
-      // @mount Cisco-IOS-XE-ethernet
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / bridge-domain
-    /////////////////////////////////////////////////////////
-    container bridge-domain { 
-      description
-        "Bridge-domain global configuration commands";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / crypto
-    /////////////////////////////////////////////////////////
-    container crypto { 
-      description
-        "Encryption module";
-      // @mount Cisco-IOS-XE-crypto
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / cts
-    /////////////////////////////////////////////////////////
-    container cts { 
-      description
-        "Configures Cisco TrustSec";
-      // @mount Cisco-IOS-XE-cts
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / bfd-template
-    /////////////////////////////////////////////////////////
-    container bfd-template {
-      description
-        "BFD-template";
-      // @mount Cisco-IOS-XE-bfd-template
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / pfr
-    /////////////////////////////////////////////////////////
-    container pfr { 
-      description
-        "Performance Routing configuration submodes";
-      // @mount Cisco-IOS-XE-pfr
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / pfr-map
-    /////////////////////////////////////////////////////////
-    list pfr-map { 
-      description
-        "Create pfr-map and enter pfr-map command mode";
-      key "pfr-tg";
-      leaf pfr-tg {
-        description
-          "pfr-map tag";
-        type string;
-      }
-      // @mount Cisco-IOS-XE-pfr-map
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / facility-alarm *
-    /////////////////////////////////////////////////////////
-    container facility-alarm { 
-      description
-        "Configure facility alarms";
-      leaf severity {
-        type enumeration {
-          enum "critical";
-        }
-      }
-      leaf exceed-action {
-        description
-          "Behavior on critical threshold exceed";
-        type enumeration {
-          enum "shutdown";
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / setup *
-    /////////////////////////////////////////////////////////
-    container setup {
-      description
-        "Configure setup options";
-      //@mount Cisco-IOS-XE-switch
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / tod-clock *
-    /////////////////////////////////////////////////////////
-    container tod-clock { 
-      if-feature ios-features:tod-clock;
-      description
-        "Tod clock config commands";
-      container input-source {
-        description
-          "Synchronization Input Source";
-        leaf priority {
-          type uint8 {
-            range "1..250";
-          }
-        }
-        container ptp {
-          leaf domain {
-            type uint8;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / network-clock *
-    /////////////////////////////////////////////////////////
-    container network-clock { 
-      description
-        "Network clock config commands";
-      container synchronization {
-        description
-          "Network clock synchronization selection process";
-        leaf automatic {
-          description
-            "ITU-T G.781/Telcordia standard based";
-          type empty;
-        }
-        leaf mode {
-          description
-            "synchronization networking mode";
-          type enumeration {
-            enum "QL-enabled";
-          }
-        }
-      }
-      container wait-to-restore {
-        description
-          "Wait-to-Restore timer";
-        leaf time {
-          description
-            "Wait-to-Restore time";
-          type uint32 {
-            range "0..86400";
-          }
-        }
-        leaf global {
-          description
-            "Global";
-          type empty;
-        }
-      }
-      container input-source {
-        description
-          "Synchronization Input Source";
-        leaf priority {
-          type uint8 {
-            range "1..250";
-          }
-        }
-        container interface {
-          uses ios-ifc:interface-grouping;
-        }
-        container ptp {
-          leaf domain {
-            type uint8;
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / l2vpn *
-    /////////////////////////////////////////////////////////
-    container l2vpn { 
-      description
-        "Layer2 VPN commands";
-      // @mount Cisco-IOS-XE-l2vpn
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / l2vpn-config *
-    /////////////////////////////////////////////////////////
-    container l2vpn-config { 
-      // @mount Cisco-IOS-XE-l2vpn
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / l3vpn *
-    /////////////////////////////////////////////////////////
-    container l3vpn {
-      description
-        "l3vpn encapsulation ip commands";
-      // @mount Cisco-IOS-XE-l3vpn
-    }
-
-
-    /////////////////////////////////////////////////////////
-    // native / mpls
-    /////////////////////////////////////////////////////////
-    container mpls { 
-      description
-        "Configure MPLS parameters";
-      // @mount Cisco-IOS-XE-mpls
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / router
-    /////////////////////////////////////////////////////////
-    container router { //68643
-      // @mount Cisco-IOS-XE-bgp
-
-      // @mount Cisco-IOS-XE-ospfv3
-
-      // @mount Cisco-IOS-XE-ospf
-
-      // @mount Cisco-IOS-XE-isis
-
-      // @mount Cisco-IOS-XE-rip
-
-      // @mount Cisco-IOS-XE-lisp
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / service-chain *
-    /////////////////////////////////////////////////////////
-    container service-chain { 
-      description
-        "Service Chain mode";
-      // @mount Cisco-IOS-XE-service-chain
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / performance / monitor (ezPM)
-    /////////////////////////////////////////////////////////
-    container performance { 
-      description
-        "Global Performance monitor configuration";
-      //@mount Cisco-IOS-XE-ezpm
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / otv *
-    /////////////////////////////////////////////////////////
-    container otv { 
-      description
-        "Configure OTV information";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / remote-management *
-    /////////////////////////////////////////////////////////
-    container remote-management {
-      description
-        "Enable the remote managment";
-      leaf dmi {
-        description
-          "data-model-interface";
-        type empty;
-      }
-      leaf restful-api {
-        description
-          "RESTful API";
-        type boolean;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / virtual-service
-    /////////////////////////////////////////////////////////
-    list virtual-service {
-      description
-        "Configure virtual service";
-      key "name";
-      leaf name {
-        type string {
-          length "1..63";
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / snmp
-    /////////////////////////////////////////////////////////
-    container snmp { 
-      description
-        "Modify SNMP interface parameters";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / snmp-server
-    /////////////////////////////////////////////////////////
-    container snmp-server { 
-      description
-        "Modify SNMP engine parameters";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / segment-routing *
-    /////////////////////////////////////////////////////////
-    container segment-routing { 
-      description
-        "Enter Segment Routing Mode";
-      // @mount Cisco-IOS-XE-segment-routing
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / license
-    /////////////////////////////////////////////////////////
-    uses config-license-grouping;
-    
-    /////////////////////////////////////////////////////////
-    // native / disable-eadi
-    /////////////////////////////////////////////////////////
-    leaf disable-eadi { 
-      type empty;
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / memory-size
-    /////////////////////////////////////////////////////////
-    container memory-size { 
-      if-feature ios-features:mem-size;
-      description
-        "Adjust memory size by percentage";
-      leaf iomem {
-        description
-          "I/O memory";
-        type uint8 {
-          range "5..25" {
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / transceiver
-    /////////////////////////////////////////////////////////
-    //TODO remove candidate
-    container transceiver { 
-      if-feature ios-features:transceiver;
-      description
-        "Select from transceiver configuration commands";
-      container type {
-        description
-          "type keyword";
-        container all {
-          container monitoring {
-            description
-              "Enable/disable monitoring";
-            presence "true";
-            leaf interval {
-              description
-                "Set interval for monitoring";
-              type uint16 {
-                range "300..3600";
-              }
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / service-insertion *
-    /////////////////////////////////////////////////////////
-    container service-insertion { 
-      description
-        "Service Insertion mode";
-      // @mount Cisco-IOS-XE-service-insertion
-    }
-    
-    /////////////////////////////////////////////////////////
-    // native / udld
-    /////////////////////////////////////////////////////////
-    container udld { 
-      description
-        "Configure global UDLD setting";
-      // @mount Cisco-IOS-XE-udld
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / qos
-    /////////////////////////////////////////////////////////
-    container qos { 
-      description
-        "Global QoS configuration commands";
-      // @mount Cisco-IOS-XE-qos
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / time-range
-    /////////////////////////////////////////////////////////
-    list time-range { 
-      description
-        "Define time range entries";
-      key "word";
-      leaf word {
-        type string;
-      }
-      container absolute {
-        description
-          "absolute time and date";
-        container start {
-          description
-            "starting time and date";
-          leaf start-time{
-            description
-              "Starting time";
-            type string;
-          }
-          leaf day-of-month{
-            description
-              "<1-31>  Day of the month";
-            type uint8;
-          }
-          leaf month {
-            description
-              "Month of the year [eg: Jan for January, Jun for June]";
-            type string;
-          }
-          leaf year {
-            description
-              "Year";
-            type uint16 {
-              range "1993..2035";
-            }
-          }
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / device-tracking
-    /////////////////////////////////////////////////////////
-    container device-tracking {
-      description
-        "Device tracking configuration commands";
-      // @mount Cisco-IOS-XE-device-tracking
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / fhrp
-    /////////////////////////////////////////////////////////
-    container fhrp { 
-      description
-        "Configure First Hop Redundancy Protocols";
-      container version {
-        description
-          "Configure which FHRP version is allowed to run";
-        leaf vrrp {
-          description
-            "Configure Virtual Router Rendundancy Protocol";
-          type enumeration {
-            enum "v2";
-            enum "v3";
-          }
-	  default "v2";
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / metadata
-    /////////////////////////////////////////////////////////
-    container metadata { 
-      description
-        "Metadata Application";
-      container flow {
-        description
-          "Enable Metadata Flow Handling";
-        presence true;
-        leaf transmit {
-          description
-            "Enable Metadata Flow Transmit ";
-          type empty;
-        }
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / profile
-    /////////////////////////////////////////////////////////
-    // TODO remove candidate
-    container profile { 
-      description
-        "MSP Profile";
-      leaf flow {
-        description
-          "MSP Profile Flow";
-        type empty;
-      }
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / alias
-    /////////////////////////////////////////////////////////
-    container alias { 
-      description
-        "Create command alias";
-      container exec {
-        description
-          "Exec mode";
-        leaf alias-name {
-          type string;
-        }
-        leaf new-alias-name {
-          type string;
-        }
-      }
-    }
-    /////////////////////////////////////////////////////////
-    // native / line *
-    /////////////////////////////////////////////////////////
-    uses config-line-grouping; 
-
-    /////////////////////////////////////////////////////////
-    // native / ntp *
-    /////////////////////////////////////////////////////////
-    container ntp { 
-      description
-        "Configure NTP";
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / wsma *
-    /////////////////////////////////////////////////////////
-    container wsma { 
-      description
-        "Configure Web Services Management Agents";
-      // @mount Cisco-IOS-XE-wsma
-    }
-
-    /////////////////////////////////////////////////////////
-    // native / event
-    /////////////////////////////////////////////////////////
-    container event { 
-      description
-        "Event related configuration commands";
-      // @mount Cisco-IOS-XE-event
-    }
-    
-    container template {
-      description "template";
-      // @mount Cisco-IOS-XE-template
-    }
-
-    grouping service-timestamp-show-timezone-and-year {				
-      leaf show-timezone {
-        description
-          "Add time zone information to timestamp";
-        type empty;
-      }
-      leaf year {
-        description
-          "Include year in timestamp";
-        type empty;
-      }
-    }
-    grouping service-timestamp-msec-and-year {
-      leaf msec {
-        description
-          "Include milliseconds in timestamp";
-        type empty;
-      }
-      leaf year {
-        description
-          "Include year in timestamp";
-        type empty;
-      }
-    }
-    grouping service-timestamp-msec-and-show-timezone {				
-      leaf msec {
-        description
-          "Include milliseconds in timestamp";
-        type empty;
-      }
-      leaf show-timezone {
-        description
-          "Add time zone information to timestamp";
-        type empty;
-      }
-    }
-    grouping service-timestamp-local-time-and-year {				
-      leaf localtime {
-        description
-          "Use local time zone for timestamps";
-        type empty;
-      }
-      leaf year {
-        description
-          "Include year in timestamp";
-        type empty;
-      }
-    }
-    grouping service-timestamp-local-time-and-show-timezone {				
-      leaf localtime {
-        description
-          "Use local time zone for timestamps";
-        type empty;
-      }
-      leaf show-timezone {
-        description
-          "Add time zone information to timestamp";
-        type empty;
-      }
-    }
-    grouping service-timestamp-local-time-and-msec {				
-      leaf localtime {
-        description
-          "Use local time zone for timestamps";
-        type empty;
-      }
-      leaf msec {
-        description
-          "Include milliseconds in timestamp";
-        type empty;
-      }
-    }
-    grouping process-rising-grouping {
-      container rising {
-        description "rising threshold";
-        list cpu-range {
-          key "cpu-range";
-          leaf cpu-range {
-            type uint8 {
-              range "1..100";
-            }
-          }
-          container interval {
-            description "observation interval";
-            list cpu-range {
-              key "cpu-range";
-              leaf cpu-range {
-                type uint32 {
-                  range "5..86400";
-                }
-              }
-              container falling {
-                description "falling threshold";
-                list cpu-range {
-                  key "cpu-range";
-                  leaf cpu-range {
-                    type uint8 {
-                      range "1..100";
-                    }
-                  }
-                  leaf interval {
-                    description "observation interval";
-                    type uint32 {
-                      range "5..86400";
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    container process {
-      description "Configure process";
-      container cpu {
-        description "Configure cpu parameters";
-        container threshold {
-          description "cpu threshold parameters";
-          container type {
-            description "cpu threshold type";
-            container interrupt {
-              description "interrupt level utilization";
-              uses process-rising-grouping;
-            }
-            container process {
-              description "process level utilization";
-              uses process-rising-grouping;
-            }
-            container total {
-              description "total cpu utilization";
-              uses process-rising-grouping;
-            }
-          }
-        }
-      }
-    }
-    ///=================================
-    /// exception
-    ///=================================
-    container exception {
-      description "help";
-      container crashinfo {
-        description "Crashinfo collection";
-        presence true;
-        leaf buffersize {
-          description "buffer size in Kbytes 256K or less (default is 32K)";
-          type uint16 {
-            range "32..256";
-          }
-        }
-      }
-    }
-    /////////////////////////////////////////////////////////
-    // native / iox *
-    /////////////////////////////////////////////////////////
-    container iox {
-      description
-        "Configure IOx services";
-      presence true;
-    }
-  } // native
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-parser.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-parser.yang
deleted file mode 100644
index 6d4b0a186..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-parser.yang
+++ /dev/null
@@ -1,226 +0,0 @@
-submodule Cisco-IOS-XE-parser {
-  belongs-to Cisco-IOS-XE-native {
-    prefix ios;
-  }
-
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Parser Yang model.
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-03-01 {
-    description
-      "Add Parser view secret extensions";
-  }
-  revision 2018-01-16 {
-    description
-      "Add privilege modes";
-  }
-  revision 2017-11-29 {
-    description
-      "Add parser view";
-  }
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-  
-  grouping all-command-gouping {
-    list command-list {
-      key "command";
-      leaf command {
-        description
-          "Keywords of the command";
-        type string;
-      }
-      leaf all {
-        description
-          "wild card support";
-        type empty;
-      }
-    }
-  }
-
-  grouping config-exec-options-grouping {
-    container exclude {
-      description
-        "Exclude the command from the view";
-      uses all-command-gouping;
-    }
-    container include {
-      description
-        "Add command to the view";
-      uses all-command-gouping;
-    }
-    container include-exclusive {
-      description
-        "Include in this view but exclude from others";
-      uses all-command-gouping;
-    }
-  }
-
-  grouping parser-view-common-options-grouping {
-    // default   Set a command to its defaults
-    // password  Set a password associated with CLI views
-    container secret {
-      description
-        "Set a secret for the current view";
-      leaf type {
-        // Note: on the router, "show running" always shows secret type "5"
-        // even "0" or no type is specified. This CLI Side effect is handled
-        // through Intelligent sync.
-        type enumeration {
-          enum "0";
-          enum "5";
-        }
-      }
-      leaf secret {
-        type string;
-      }
-    }
-  }
-  grouping config-parser-grouping {
-    container parser { //40048
-      description
-        "Configure parser";
-      container config {
-        description
-          "Configure config generation";
-        leaf cache {
-          description
-            "Cache the configuration";
-          type enumeration {
-            enum "interface";
-          }
-        }
-        leaf partition {
-          description
-            "Enable configuration Partitioning";
-          type empty;
-        }
-      }
-      container view {
-        description
-          "View Commands";
-        list view-name-list {
-          key name;
-          leaf name {
-            description
-              "View Name";
-            type string;
-          }
-          leaf inclusive {
-            description
-              "SuperView Commands";
-            type empty;
-          }
-          uses parser-view-common-options-grouping;
-          container commands {
-            description
-              "Configure commands for a view";
-            container exec {
-              description
-                "Exec mode";
-              uses config-exec-options-grouping;
-            }
-            container configure {
-              description
-                "Global configuration mode";
-              uses config-exec-options-grouping;
-            }
-          }
-        }
-        list view-name-superview-list {
-          key name;
-          leaf name {
-            description
-              "View Name";
-            type string;
-          }
-          leaf superview {
-            description
-              "SuperView Commands";
-            type empty;
-          }
-          uses parser-view-common-options-grouping;
-          list view {
-            description
-              "View Name";
-            key view-name;
-            leaf view-name {
-              type leafref {
-                path "../../../view-name-list/name";
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  grouping privilege-mode-common {
-    // privilege <mode> level
-    list level {
-      description
-        "Set privilege level of command";
-      key "privilege";
-      leaf privilege {
-        type uint8;
-      }
-      list command-list {
-        key "command";
-        leaf command {
-	  description
-	    "There are side effects";
-          type string;
-        }
-      }
-    }
-    list reset {
-      key "command";
-      leaf command {
-        type string;
-      }
-    }
-  }
-
-  grouping config-privilege-grouping {
-    container privilege { //55368
-      description
-        "Command privilege parameters";
-      list mode {
-        key name;
-        leaf name {
-          type enumeration {
-            enum "configure";
-            enum "exec";
-            enum "interface";
-            enum "router";
-          }
-        }
-        container all {
-          uses privilege-mode-common;
-        }
-        uses privilege-mode-common;
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-types.yang b/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-types.yang
deleted file mode 100644
index 4ced594c5..000000000
--- a/profiles/bundles/yang/cisco-ios-xe/Cisco-IOS-XE-types.yang
+++ /dev/null
@@ -1,710 +0,0 @@
-module Cisco-IOS-XE-types {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XE-types";
-  prefix ios-types;
-
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-
-     Tel: +1 1800 553-NETS
-
-     E-mail: cs-yang@cisco.com";
-
-  description
-    "Cisco XE Native Common Type Definitions
-     Copyright (c) 2016-2018 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  // =========================================================================
-  // REVISION
-  // =========================================================================
-  revision 2018-05-22 {
-     description
-       "Change range-string pattern to single quotes";
-  }
-  revision 2017-11-27 {
-     description
-       "Added Change 25GE name";
-  }
-
-  revision 2017-10-15 {
-    description
-      "This revision has changes for new 2gig interface addition";
-  }
-
-  revision 2017-10-05 {
-    description
-      "Add a new type range-string";
-  }
-
-  revision 2017-08-16 {
-    description
-      "This revision has changes for new 5gig and 25gig interfaces addition";
-  }
-
-  revision 2017-06-09 {
-    description
-      "Add a new type ipv4-address-slash-prefix-len";
-  }
-
-  revision 2017-06-05 {
-    description
-      "Update the ipv4 cisco-route-distinguisher type 1 pattern to
-       conform to YANG 1.1";
-    reference
-      "RFC 7950: The YANG 1.1 Data Modeling Language";
-  }
-
-  revision 2017-04-05 {
-    description
-      "Add value statements to udp and tcp ace port number enumerations";
-  }
-
-  revision 2017-02-07 {
-    description
-      "Initial revision";
-  }
-
-  // =========================================================================
-  // TYPEDEF
-  // =========================================================================
-  typedef access-list-type {
-    type union {
-      type uint16 {
-        range "1..199";
-      }
-      type uint16 {
-        range "1300..2699";
-      }
-    }
-  }
-
-  typedef access-list-standard-id-type {
-    type union {
-      type default-access-list-standard-id-type;
-      type string;
-    }
-  }
-
-  typedef access-list-in-out-type {
-    type enumeration {
-      enum "in";
-      enum "out";
-    }
-  }
-
-  typedef acl-udp-port-type {
-    type union {
-      type uint16;
-      type enumeration {
-        enum "biff" {value 512;}
-        enum "bootpc" {value 68;}
-        enum "bootps" {value 67;}
-        enum "discard" {value 9;}
-        enum "dnsix" {value 195;}
-        enum "domain" {value 53;}
-        enum "echo" {value 7;}
-        enum "isakmp" {value 500;}
-        enum "mobile-ip" {value 434;}
-        enum "nameserver" {value 42;}
-        enum "netbios-dgm" {value 138;}
-        enum "netbios-ns" {value 137;}
-        enum "netbios-ss" {value 139;}
-        enum "non500-isakmp" {value 4500;}
-        enum "ntp" {value 123;}
-        enum "pim-auto-rp" {value 496;}
-        enum "rip" {value 520;}
-        enum "ripv6" {value 521;}
-        enum "snmp" {value 161;}
-        enum "snmptrap" {value 162;}
-        enum "sunrpc" {value 111;}
-        enum "syslog" {value 514;}
-        enum "tacacs" {value 49;}
-        enum "talk" {value 517;}
-        enum "tftp" {value 69;}
-        enum "time" {value 37;}
-        enum "who" {value 513;}
-        enum "xdmcp" {value 177;}
-      }
-    }
-  }
-
-  typedef acl-tcp-port-type {
-    type union {
-      type uint16;
-      type enumeration {
-        enum "bgp" {value 179;}
-        enum "chargen" {value 19;}
-        enum "cmd"{value 514;}
-        enum "daytime" {value 13;}
-        enum "discard" {value 9;}
-        enum "domain" {value 53;}
-        enum "echo" {value 7;}
-        enum "exec" {value 512;}
-        enum "finger" {value 79;}
-        enum "ftp" {value 21;}
-        enum "ftp-data" {value 20;}
-        enum "gopher" {value 70;}
-        enum "hostname" {value 101;}
-        enum "ident" {value 113;}
-        enum "irc" {value 194;}
-        enum "klogin" {value 543;}
-        enum "kshell" {value 544;}
-        enum "login" {value 513;}
-        enum "lpd" {value 515;}
-        enum "msrpc" {value 135;}
-        enum "nntp" {value 119;}
-        enum "pim-auto-rp" {value 496;}
-        enum "pop2" {value 109;}
-        enum "pop3" {value 110;}
-        enum "smtp" {value 25;}
-        enum "sunrpc" {value 111;}
-        enum "tacacs" {value 49;}
-        enum "talk" {value 517;}
-        enum "telnet" {value 23;}
-        enum "time" {value 37;}
-        enum "uucp" {value 540;}
-        enum "whois" {value 43;}
-        enum "www" {value 80;}
-      }
-    }
-  }
-
-  typedef default-access-list-standard-id-type {
-    type union {
-      type uint8 {
-        range "1..99";
-      }
-      type uint16 {
-        range "1300..1999";
-      }
-    }
-  }
-
-  typedef redist-ospf-external-type {
-    type enumeration {
-      enum "1";
-      enum "2";
-    }
-  }
-
-  typedef bgp-as-number-type {
-    type union {
-      type uint32 {
-        range "1..4294967295";
-      }
-      type string;
-    }
-  }
-
-  typedef cos_value-type {
-    type union {
-      type uint8 {
-        range "0..7";
-      }
-      type enumeration {
-        enum "cos";
-        enum "dscp";
-        enum "exp";
-        enum "precedence";
-      }
-    }
-  }
-
-  typedef dscp-type {
-    type union {
-      type uint8 {
-        range "0..63";
-      }
-      type enumeration {
-        enum "af11" {
-          value 10;
-        }
-        enum "af12" {
-          value 12;
-        }
-        enum "af13" {
-          value 14;
-        }
-        enum "af21" {
-          value 18;
-        }
-        enum "af22" {
-          value 20;
-        }
-        enum "af23" {
-          value 22;
-        }
-        enum "af31" {
-          value 26;
-        }
-        enum "af32" {
-          value 28;
-        }
-        enum "af33" {
-          value 30;
-        }
-        enum "af41" {
-          value 34;
-        }
-        enum "af42" {
-          value 36;
-        }
-        enum "af43" {
-          value 38;
-        }
-        enum "cs1" {
-          value 8;
-        }
-        enum "cs2" {
-          value 16;
-        }
-        enum "cs3" {
-          value 24;
-        }
-        enum "cs4" {
-          value 32;
-        }
-        enum "cs5" {
-          value 40;
-        }
-        enum "cs6" {
-          value 48;
-        }
-        enum "cs7" {
-          value 56;
-        }
-        enum "default" {
-          value 0;
-        }
-        enum "dscp";
-        enum "ef" {
-          value 46;
-        }
-        enum "precedence";
-      }
-    }
-  }
-
-  typedef exp-acl-type {
-    type union {
-      type uint16 {
-        range "1..199 | 1300..2699";
-      }
-      type string {
-        pattern "[a-zA-Z].*";
-      }
-    }
-  }
-
-  typedef exp_value-type {
-    type union {
-      type uint8 {
-        range "0..7";
-      }
-      type enumeration {
-        enum "cos";
-        enum "dscp";
-        enum "exp";
-        enum "precedence";
-      }
-    }
-  }
-
-
-  // Extended access list type
-  typedef ext-acl-type {
-    type union {
-      type uint16 {
-        range "100..199";
-      }
-      type uint16 {
-        range "2000..2699";
-      }
-      type string {
-        pattern "[a-zA-Z].*";
-      }
-    }
-  }
-
-  // Hour&minute type
-  typedef hhmm-type {
-    type string {
-      pattern "([0-1]?[0-9]|2[0-4]):([0-5][0-9])(:[0-5][0-9])?";
-    }
-  }
-
-  // Hour&minute&seconds type
-  typedef hhmmss-type {
-    type string {
-      pattern "([0-1]?[0-9]|2[0-4]):([0-5][0-9]):([0-5][0-9])";
-    }
-  }
-
-  typedef asn-ip-type {
-    type string {
-      pattern "(([0-9]+\\.[0-9]+)|([0-9]+)|((([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))):[0-9]+";
-    }
-  }
-
-  typedef host-type {
-    type union {
-      type inet:ip-address;
-      type inet:domain-name;
-    }
-  }
-
-  typedef interface-type {
-    type enumeration {
-      enum 'BDI';
-      enum 'FastEthernet';
-      enum 'GigabitEthernet';
-      enum 'Loopback';
-      enum 'Port-channel';
-      enum 'Serial';
-      enum 'TenGigabitEthernet';
-      enum 'Vlan';
-      enum 'FiveGigabitEthernet';
-      enum 'TwentyFiveGigE';
-      enum 'TwoGigabitEthernet';
-    }
-  }
-
-  typedef interface-name {
-    type union {
-      type uint16;
-      type uint32;
-      type string;
-    }
-  }
-
-  typedef ip-host {
-    type union {
-      type inet:ip-address;
-      type inet:domain-name;
-    }
-  }
-
-  typedef ipv4-host {
-    type union {
-      type inet:ipv4-address;
-      type inet:domain-name;
-    }
-    description
-      "The host type represents either an IPv4 address or a DNS
-       domain name.";
-  }
-
-  typedef ipv6-host {
-    type union {
-      type inet:ipv6-address;
-      type inet:domain-name;
-    }
-    description
-      "The host type represents either an IPv6 address or a DNS
-       domain name.";
-  }
-
-  typedef mobility-type {
-    type union {
-      type uint8;
-      type enumeration {
-          enum "bind-acknowledgement";
-          enum "bind-error";
-          enum "bind-refresh";
-          enum "bind-update";
-          enum "cot";
-          enum "coti";
-          enum "hot";
-          enum "hoti";
-      }
-    }
-  }
-
-  typedef prec_value-type {
-    type union {
-      type uint8 {
-        range "0..7";
-      }
-      type enumeration {
-        enum "cos";
-        enum "dscp";
-        enum "exp";
-        enum "precedence";
-      }
-    }
-  }
-
-  typedef precedence-type {
-    type union {
-      type uint8 {
-        range "0..7";
-      }
-      type enumeration {
-        enum "critical";
-        enum "flash";
-        enum "flash-override";
-        enum "immediate";
-        enum "internet" {
-        }
-        enum "network";
-        enum "priority" {
-        }
-        enum "routine";
-      }
-    }
-  }
-
-  typedef std-acl-type {
-    type union {
-      type uint16 {
-        range "1..99";
-      }
-      type uint16 {
-        range "1300..1999";
-      }
-      type string {
-        pattern "[a-zA-Z].*";
-      }
-    }
-  }
-
-  typedef percentage {
-    type uint8 {
-      range "0..100";
-    }
-  }
-
-  typedef limit-dc-non-dc-type {
-    type union {
-      type uint32 {
-        range "1 .. 255";
-      }
-      type enumeration {
-        enum "disable";
-      }
-    }
-  }
-
-  typedef ospf-area-type {
-    type union {
-      type uint32 {
-        range "0 .. 4294967295";
-      }
-      type inet:ipv4-address;
-    }
-  }
-
-  typedef ospf-metric-type {
-    type uint32 {
-      range "1 .. 2";
-    }
-  }
-
-  typedef qos_value-type {
-    type union {
-      type uint8 {
-        range "0..99";
-      }
-      type enumeration {
-        enum "cos";
-        enum "dscp";
-        enum "exp";
-        enum "precedence";
-      }
-    }
-  }
-
-  typedef weekday-type {
-    type enumeration {
-      enum "Mon";
-      enum "Tue";
-      enum "Wed";
-      enum "Thu";
-      enum "Fri";
-      enum "Sat";
-      enum "Sun";
-    }
-  }
-
-  typedef bgp-distribute-list-type {
-    type union {
-      type uint16 {
-        range "100..199";
-      }
-      type uint16 {
-        range "2000..2699";
-      }
-      type string {
-        pattern "[a-zA-Z].*";
-      }
-    }
-  }
-
-  typedef bgp-distribute-list-type2 {
-    type union {
-      type uint16 {
-        range "1..199";
-      }
-      type uint16 {
-        range "1300..2699";
-      }
-      type string {
-        pattern "[a-zA-Z].*";
-      }
-    }
-  }
-
-  typedef bgp_ipv4_af_type {
-    type enumeration {
-      enum "unicast" {
-      }
-      enum "multicast" {
-      }
-      enum "mdt";
-      enum "tunnel";
-      enum "labeled-unicast";
-      enum "flowspec";
-      enum "mvpn";
-    }
-  }
-
-  typedef bgp_ipv6_af_type {
-    type enumeration {
-      enum "unicast" {
-      }
-      enum "multicast" {
-      }
-      enum "mdt";
-      enum "flowspec";
-      enum "mvpn";
-    }
-  }
-
-  typedef storm-control-threshold-type {
-    type string {
-      pattern "[0-9]+.?[0-9]*[k|m|g]?";
-    }
-  }
-
-  typedef community-number-type {
-    type union {
-      type uint32 {
-        range "1..4294967295";
-      }
-      type string {
-        pattern "(\\d+:\\d+)";
-      }
-    }
-  }
-
-  typedef community-well-known-type {
-    type enumeration {
-      enum "gshut";
-      enum "internet" {
-      }
-      enum "local-AS";
-      enum "no-advertise";
-      enum "no-export";
-    }
-  }
-
-  typedef community-well-known-add-type {
-    type enumeration {
-      enum "gshut";
-      enum "internet" {
-      }
-      enum "local-AS";
-      enum "no-advertise";
-      enum "no-export";
-      enum "additive";
-    }
-  }
-
-  typedef cisco-mac-address-type {
-    type string {
-      pattern "[0-9a-fA-F]+\\.[0-9a-fA-F]+\\.[0-9a-fA-F]+";
-    }
-  }
-
-  typedef month-type {
-    type enumeration {
-      enum "Jan";
-      enum "Feb";
-      enum "Mar";
-      enum "Apr";
-      enum "May";
-      enum "Jun";
-      enum "Jul";
-      enum "Aug";
-      enum "Sep";
-      enum "Oct";
-      enum "Nov";
-      enum "Dec";
-    }
-  }
-
-  typedef ipv6-prefix {
-    type string {
-      pattern "((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))";
-      pattern "(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(/.+)";
-    }
-  }
-
-  typedef cisco-route-distinguisher {
-    type union {
-      // type 0: <2-byte administrator>:<4-byte assigned number>
-      type string {
-        pattern "(65[0-5][0-3][0-5]|[1-5][1-5][0-9][0-9][0-9]|"
-                + "[1-9]?[1-9]?[0-9][0-9]|[0-9]):"
-                + "(4[0-2][0-9][0-4][0-9][0-6][0-7][0-2][0-9][0-5]|"
-                + "[0-3][0-9]{9}|[1-9][0-9]{1,8}|[0-9])";
-      }
-      // type 1: <ip-address>:<2-byte assigned number>
-      type string {
-        pattern
-          "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}"
-          +  "([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]):"
-          +  "(65[0-5][0-3][0-5]|[1-5][1-5][0-9][0-9][0-9]|"
-          +  "[1-9]?[1-9]?[0-9][0-9]|[0-9])";
-      }
-      // type 2: <4-byte as-number>:<2-byte assigned number>
-      type string {
-        pattern
-          "(4[0-2][0-9][0-4][0-9][0-6][0-7][0-2][0-9][0-5]|"
-          + "[0-3][0-9]{9}|[1-9][0-9]{1,8}|[1-9]):"
-          + "(65[0-5][0-3][0-5]|[1-5]{2}[0-9]{3}|"
-          + "[1-9]{0,2}[0-9][0-9]|[0-9])";
-      }
-    }
-  }
-    
-  // Comma-separated numbers with ranges  
-  typedef range-string {
-    type string {
-      pattern
-        '((\d+(-\d+)?)(,(\d+(-\d+)?))*)';
-    }
-  }
-
-  typedef ipv4-address-slash-prefix-len {
-     type string {
-       pattern
-          '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-        +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-        + '/(([0-9])|([1-2][0-9])|(3[0-2]))';
-     }
-  }
-
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ifmgr-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ifmgr-cfg.yang
deleted file mode 100644
index bd1fc8a8a..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ifmgr-cfg.yang
+++ /dev/null
@@ -1,331 +0,0 @@
-module Cisco-IOS-XR-ifmgr-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-ifmgr-cfg";
-  prefix ifmgr-cfg;
-
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR ifmgr package configuration.
-     
-     This module contains definitions
-     for the following management objects:
-       global-interface-configuration: Global scoped configuration
-         for interfaces
-       interface-configurations: Configuration for all interfaces
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2015-07-30 {
-    description
-      "Descriptions updated.";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Interface-mode-enum {
-    type enumeration {
-      enum "default" {
-        value 0;
-        description
-          "Default Interface Mode";
-      }
-      enum "point-to-point" {
-        value 1;
-        description
-          "Point-to-Point Interface Mode";
-      }
-      enum "multipoint" {
-        value 2;
-        description
-          "Multipoint Interface Mode";
-      }
-      enum "l2-transport" {
-        value 3;
-        description
-          "L2 Transport Interface Mode";
-      }
-    }
-    description
-      "Interface mode enum";
-  }
-
-  typedef Interface-active {
-    type string {
-      pattern "(act)|(pre)";
-    }
-    description
-      "act:The interface is active, pre:Preconfiguration";
-  }
-
-  typedef Secondary-admin-state-enum {
-    type enumeration {
-      enum "normal" {
-        value 0;
-        description
-          "Normal Mode";
-      }
-      enum "maintenance" {
-        value 1;
-        description
-          "Maintenance Mode";
-      }
-    }
-    description
-      "Secondary admin state enum";
-  }
-
-  typedef Link-status-enum {
-    type enumeration {
-      enum "default" {
-        value 0;
-        description
-          "Display link status messages for physical links";
-      }
-      enum "disable" {
-        value 1;
-        description
-          "Disable link status messages";
-      }
-      enum "software-interfaces" {
-        value 2;
-        description
-          "Display link status messages for all interfaces";
-      }
-    }
-    description
-      "Link status enum";
-  }
-
-  container global-interface-configuration {
-    description
-      "Global scoped configuration for interfaces";
-    leaf link-status {
-      type Link-status-enum;
-      default "default";
-      description
-        "Enable or disable link-status messages";
-    }
-  }
-  container interface-configurations {
-    description
-      "Configuration for all interfaces";
-    list interface-configuration {
-      key "active interface-name";
-      description
-        "The configuration for an interface";
-      container dampening {
-        description
-          "Whether this interface's state changes are
-           dampened or not";
-        leaf args {
-          type enumeration {
-            enum "default-values" {
-              value 0;
-              description
-                "Default values";
-            }
-            enum "specify-half-life" {
-              value 1;
-              description
-                "Half Life Specified";
-            }
-            enum "specify-all" {
-              value 4;
-              description
-                "All Arguments except Restart Penalty
-                 Specified";
-            }
-            enum "specify-rp" {
-              value 5;
-              description
-                "All Arguments Specified";
-            }
-          }
-          description
-            "Dampening Arguments";
-        }
-        leaf half-life {
-          when "../args = 'specify-half-life' or ../args = 'specify-all' or ../args = 'specify-rp'" {
-            description
-              "../Args = SpecifyHalfLife or ../Args =
-               SpecifyAll or ../Args = SpecifyRP";
-          }
-          type uint32 {
-            range "1..45";
-          }
-          units "minute";
-          description
-            "Decay half life (in minutes)";
-        }
-        leaf reuse-threshold {
-          when "../args = 'specify-all' or ../args = 'specify-rp'" {
-            description
-              "../Args = SpecifyAll or ../Args = SpecifyRP";
-          }
-          type uint32 {
-            range "1..20000";
-          }
-          description
-            "Reuse threshold";
-        }
-        leaf suppress-threshold {
-          when "../args = 'specify-all' or ../args = 'specify-rp'" {
-            description
-              "../Args = SpecifyAll or ../Args = SpecifyRP";
-          }
-          type uint32 {
-            range "1..20000";
-          }
-          description
-            "Suppress threshold";
-        }
-        leaf suppress-time {
-          when "../args = 'specify-all' or ../args = 'specify-rp'" {
-            description
-              "../Args = SpecifyAll or ../Args = SpecifyRP";
-          }
-          type uint32 {
-            range "1..255";
-          }
-          units "minute";
-          description
-            "Max suppress time (in minutes)";
-        }
-        leaf restart-penalty {
-          when "../args = 'specify-rp'" {
-            description
-              "../Args = SpecifyRP";
-          }
-          type uint32 {
-            range "0..20000";
-          }
-          description
-            "Restart penalty";
-        }
-      }
-      container mtus {
-        description
-          "The MTU configuration for the interface";
-        list mtu {
-          key "owner";
-          description
-            "The MTU for the interface";
-          leaf owner {
-            type xr:Cisco-ios-xr-string;
-            description
-              "The Owner of the interface - eg. for
-               'LoopbackX' main interface this is 'loopback'";
-          }
-          leaf mtu {
-            type uint32 {
-              range "64..65535";
-            }
-            mandatory true;
-            description
-              "The MTU value";
-          }
-        }
-      }
-      container encapsulation {
-        description
-          "The encapsulation on the interface";
-        leaf encapsulation {
-          type string;
-          description
-            "The encapsulation - e.g. hdlc, ppp";
-        }
-        leaf capsulation-options {
-          type uint32;
-          description
-            "The options for this capsulation, usually '0'";
-        }
-      }
-      leaf shutdown {
-        type empty;
-        description
-          "The existence of this configuration indicates
-           the interface is shut down";
-      }
-      leaf interface-virtual {
-        type empty;
-        description
-          "The mode in which an interface is running. The
-           existence of this object causes the creation of
-           the software virtual/subinterface.";
-      }
-      leaf secondary-admin-state {
-        type Secondary-admin-state-enum;
-        description
-          "The secondary admin state of the interface";
-      }
-      leaf interface-mode-non-physical {
-        type Interface-mode-enum;
-        default "default";
-        description
-          "The mode in which an interface is running. The
-           existence of this object causes the creation of
-           the software subinterface.";
-      }
-      leaf bandwidth {
-        type uint32 {
-          range "0..4294967295";
-        }
-        units "kbit/s";
-        description
-          "The bandwidth of the interface in kbps";
-      }
-      leaf link-status {
-        type empty;
-        description
-          "Enable interface and line-protocol state change
-           alarms";
-      }
-      leaf description {
-        type string;
-        description
-          "The description of this interface";
-      }
-      leaf active {
-        type Interface-active;
-        description
-          "Whether the interface is active or
-           preconfigured";
-      }
-      leaf interface-name {
-        type xr:Interface-name;
-        description
-          "The name of the interface";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-iarm-datatypes.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-iarm-datatypes.yang
deleted file mode 100644
index 3b3f0fd7d..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-iarm-datatypes.yang
+++ /dev/null
@@ -1,45 +0,0 @@
-module Cisco-IOS-XR-ip-iarm-datatypes {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-ip-iarm-datatypes";
-  prefix ip-iarm-datatypes;
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of generally useful
-     derived YANG data types.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Ipv6arm-prefix-length {
-    type uint32 {
-      range "0..128";
-    }
-    description
-      "Ipv6arm prefix length";
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-pfilter-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-pfilter-cfg.yang
deleted file mode 100644
index d4fb406f0..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ip-pfilter-cfg.yang
+++ /dev/null
@@ -1,349 +0,0 @@
-module Cisco-IOS-XR-ip-pfilter-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-ip-pfilter-cfg";
-  prefix ip-pfilter-cfg;
-
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR ip-pfilter package configuration.
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg
-     module with configuration data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.1";
-  }
-  revision 2017-09-30 {
-    description
-      "Ensure propagation of MDA mandatory state to YANG model.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ipv6-packet-filter {
-      description
-        "IPv6 Packet Filtering configuration for the
-         interface";
-      container inbound {
-        description
-          "IPv6 Packet filter to be applied to inbound
-           packets";
-        leaf common-acl-name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv6
-             Packet Filter Name to be applied to Inbound
-             packets, ACL providing HW optimization when
-             applied on multiple interfaces. NOTE: This
-             parameter is mandatory if 'Name' is not
-             specified.";
-        }
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv6
-             Packet Filter Name to be applied to Inbound
-             NOTE: This parameter is mandatory if
-             'CommonACLName' is not specified.";
-        }
-        leaf interface-statistics {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in hardware per interface.The default
-             is not to count them. NOTE:
-             InterfaceStatistics is allowed only if Name is
-             specified.";
-        }
-        leaf compression-level {
-          type uint32 {
-            range "0..3";
-          }
-          description
-            "The level of compression applied to the ACL on
-             this interface. The range is 0 to 3 with
-             default being no compression (0).";
-        }
-        leaf-list acl-name-array {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          max-elements "5";
-          description
-            "Array of IPv6 Packet Filter Names to be
-             applied to Inbound packets";
-        }
-        leaf-list is-common-array {
-          type boolean;
-          max-elements "5";
-          description
-            "Array of CommonACL flags for each ACL. TRUE
-             indicates HW optimization on multiple
-             interfaces is provided";
-        }
-      }
-      container outbound {
-        description
-          "IPv6 Packet filter to be applied to outbound
-           packets";
-        leaf do-not-use {
-          type string {
-            length "1..64";
-          }
-          description
-            "Reserved.  Error if specified.";
-        }
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv6
-             Packet Filter Name to be applied to Outbound
-             packets.";
-        }
-        leaf interface-statistics {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in hardware per interface.The default
-             is not to count them.";
-        }
-        leaf compression-level {
-          type uint32 {
-            range "0..3";
-          }
-          description
-            "The level of compression applied to the ACL on
-             this interface. The range is 0 to 3 with
-             default being no compression (0).";
-        }
-        leaf-list acl-name-array {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          max-elements "5";
-          description
-            "Array of IPv6 Packet Filter Names to be
-             applied to Inbound packets";
-        }
-        leaf-list is-common-array {
-          type boolean;
-          max-elements "5";
-          description
-            "Array of CommonACL flags for each ACL. TRUE
-             indicates HW optimization on multiple
-             interfaces is provided";
-        }
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container es-packet-filter {
-      description
-        "ES Packet Filtering configuration for the
-         interface";
-      leaf outbound {
-        type xr:Cisco-ios-xr-string {
-          length "1..64";
-        }
-        description
-          "Name of filter to be applied to outbound
-           packets";
-      }
-      leaf inbound {
-        type xr:Cisco-ios-xr-string {
-          length "1..64";
-        }
-        description
-          "Name of filter to be applied to inbound packets";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ipv4-packet-filter {
-      description
-        "IPv4 Packet Filtering configuration for the
-         interface";
-      container outbound {
-        description
-          "IPv4 Packet filter to be applied to outbound
-           packets";
-        leaf do-not-use {
-          type string {
-            length "1..64";
-          }
-          description
-            "Reserved.  Error if specified.";
-        }
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv4
-             Packet Filter Name to be applied to Outbound
-             packets NOTE: This parameter is mandatory if
-             'CommonACLName' is not specified.";
-        }
-        leaf hardware-count {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in the hardware.  The default is not
-             to count them.";
-        }
-        leaf interface-statistics {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in hardware per interface.The default
-             is not to count them.";
-        }
-        leaf compression-level {
-          type uint32 {
-            range "0..3";
-          }
-          description
-            "The level of compression applied to the ACL on
-             this interface. The range is 0 to 3 with
-             default being no compression (0).";
-        }
-        leaf-list acl-name-array {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          max-elements "5";
-          description
-            "Array of IPv4 Packet Filter Names to be
-             applied to Outbound packets";
-        }
-        leaf-list is-common-array {
-          type boolean;
-          max-elements "5";
-          description
-            "Array of CommonACL flags for each ACL. TRUE
-             indicates HW optimization on multiple
-             interfaces is provided";
-        }
-      }
-      container inbound {
-        description
-          "IPv4 Packet filter to be applied to inbound
-           packets";
-        leaf common-acl-name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv4
-             Packet Filter Name to be applied to Inbound
-             packets, ACL providing HW optimization when
-             applied on multiple interfaces. NOTE: This
-             parameter is mandatory if 'Name' is not
-             specified.";
-        }
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Reserved for backward compatibility. IPv4
-             Packet Filter Name to be applied to Inbound
-             packets NOTE: This parameter is mandatory if
-             'CommonACLName' is not specified.";
-        }
-        leaf hardware-count {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in the hardware.  The default is not
-             to count them. NOTE: HardwareCount is allowed
-             only if Name is specified.";
-        }
-        leaf interface-statistics {
-          type empty;
-          description
-            "True if packets hitting the ACL should be
-             counted in hardware per interface.The default
-             is not to count them. NOTE:
-             InterfaceStatistics is allowed only if Name is
-             specified.";
-        }
-        leaf compression-level {
-          type uint32 {
-            range "0..3";
-          }
-          description
-            "The level of compression applied to the ACL on
-             this interface. The range is 0 to 3 with
-             default being no compression (0).";
-        }
-        leaf-list acl-name-array {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          max-elements "5";
-          description
-            "Array of IPv4 Packet Filter Names to be
-             applied to Inbound packets";
-        }
-        leaf-list is-common-array {
-          type boolean;
-          max-elements "5";
-          description
-            "Array of CommonACL flags for each ACL. TRUE
-             indicates HW optimization on multiple
-             interfaces is provided";
-        }
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv4-io-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv4-io-cfg.yang
deleted file mode 100644
index 50d0299e1..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv4-io-cfg.yang
+++ /dev/null
@@ -1,402 +0,0 @@
-module Cisco-IOS-XR-ipv4-io-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-ipv4-io-cfg";
-  prefix ipv4-io-cfg;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR ipv4-io package configuration.
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg
-     module with configuration data.
-     
-     Copyright (c) 2013-2020 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2020-02-18 {
-    description
-      "Added new leaf icmp-unreach-disable.";
-    semver:module-version "1.1.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2018-01-11 {
-    description
-      "DHCP IPv4 client to support options in cli.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-07-30 {
-    description
-      "Descriptions updated.";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Ipv4-reachable {
-    type enumeration {
-      enum "any" {
-        value 0;
-        description
-          "Source is reachable via any interface";
-      }
-      enum "received" {
-        value 1;
-        description
-          "Source is reachable via interface on which
-           packet was received";
-      }
-    }
-    description
-      "Ipv4 reachable";
-  }
-
-  typedef Ipv4-self-ping {
-    type enumeration {
-      enum "disabled" {
-        value 0;
-        description
-          "Doesn't allow router to ping itself";
-      }
-      enum "enabled" {
-        value 1;
-        description
-          "Allow router to ping itself";
-      }
-    }
-    description
-      "Ipv4 self ping";
-  }
-
-  typedef Ipv4-default-ping {
-    type enumeration {
-      enum "disabled" {
-        value 0;
-        description
-          "Default route is not allowed to match when
-           checking source address";
-      }
-      enum "enabled" {
-        value 1;
-        description
-          "Allow default route to match when checking
-           source address";
-      }
-    }
-    description
-      "Ipv4 default ping";
-  }
-
-  typedef Ipv4-interface-qppb {
-    type enumeration {
-      enum "ip-precedence" {
-        value 1;
-        description
-          "Enable IP precedence based QPPB";
-      }
-      enum "qos-group" {
-        value 2;
-        description
-          "Enable QoS-group based QPPB";
-      }
-      enum "both" {
-        value 3;
-        description
-          "Enable both IP precedence and QoS-group based
-           QPPB";
-      }
-    }
-    description
-      "Ipv4 interface qppb";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ipv4-network {
-      description
-        "Interface IPv4 Network configuration data";
-      container bgp-pa {
-        description
-          "Interface ipv4 bgp configuration";
-        container input {
-          description
-            "Input";
-          leaf source-accounting {
-            type boolean;
-            description
-              "BGP PA configuration on source";
-          }
-          leaf destination-accounting {
-            type boolean;
-            description
-              "BGP PA configuration on destination";
-          }
-        }
-        container output {
-          description
-            "Output";
-          leaf source-accounting {
-            type boolean;
-            description
-              "BGP PA configuration on source";
-          }
-          leaf destination-accounting {
-            type boolean;
-            description
-              "BGP PA configuration on destination";
-          }
-        }
-      }
-      container verify {
-        description
-          "Enable Verify handling for this interface";
-        leaf reachable {
-          type Ipv4-reachable;
-          description
-            "Source is reachable via any interface or
-             interface on which packet was received";
-        }
-        leaf self-ping {
-          type Ipv4-self-ping;
-          description
-            "Allow router to ping itself (opens
-             vulnerability in verification)";
-        }
-        leaf default-ping {
-          type Ipv4-default-ping;
-          description
-            "Allow default route to match when checking
-             source address";
-        }
-      }
-      container bgp {
-        description
-          "Interface ipv4 bgp configuration";
-        container qppb {
-          description
-            "Interface ipv4 bgp policy propagation
-             configuration";
-          container input {
-            description
-              "Input";
-            leaf source {
-              type Ipv4-interface-qppb;
-              description
-                "QPPB configuration on source";
-            }
-            leaf destination {
-              type Ipv4-interface-qppb;
-              description
-                "QPPB configuration on destination";
-            }
-          }
-        }
-        container flow-tag {
-          description
-            "Interface ipv4 bgp policy propagation flow tag
-             configuration";
-          container flow-tag-input {
-            description
-              "Input";
-            leaf source {
-              type boolean;
-              description
-                "FlowTag configuration on source";
-            }
-            leaf destination {
-              type boolean;
-              description
-                "FlowTag configuration on destination";
-            }
-          }
-        }
-      }
-      container addresses {
-        description
-          "Set the IP address of an interface";
-        container secondaries {
-          description
-            "Specify a secondary address";
-          list secondary {
-            key "address";
-            description
-              "IP address and Mask";
-            leaf address {
-              type inet:ipv4-address-no-zone;
-              description
-                "Secondary IP address";
-            }
-            leaf netmask {
-              type inet:ipv4-address-no-zone;
-              mandatory true;
-              description
-                "Netmask";
-            }
-            leaf route-tag {
-              type uint32 {
-                range "1..4294967295";
-              }
-              description
-                "RouteTag";
-            }
-          }
-        }
-        container primary {
-          presence "Indicates a primary node is configured.";
-          description
-            "IP address and Mask";
-          leaf address {
-            type inet:ipv4-address-no-zone;
-            mandatory true;
-            description
-              "IP address";
-          }
-          leaf netmask {
-            type inet:ipv4-address-no-zone;
-            mandatory true;
-            description
-              "Netmask";
-          }
-          leaf route-tag {
-            type uint32 {
-              range "1..4294967295";
-            }
-            description
-              "RouteTag";
-          }
-        }
-        leaf unnumbered {
-          type xr:Interface-name;
-          description
-            "Enable IP processing without an explicit
-             address";
-        }
-        leaf dhcp {
-          type empty;
-          description
-            "IPv4 address and Mask negotiated via DHCP";
-        }
-      }
-      container helper-addresses {
-        description
-          "The set of IP destination addresses for UDP
-           broadcasts";
-        list helper-address {
-          key "address vrf-name";
-          description
-            "An IP destination addresses for UDP broadcasts";
-          leaf address {
-            type inet:ipv4-address-no-zone;
-            description
-              "IP destination address";
-          }
-          leaf vrf-name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "VRF name";
-          }
-        }
-      }
-      leaf forwarding-enable {
-        type empty;
-        description
-          "IPv4 forwarding to get enabled on an interface";
-      }
-      leaf icmp-unreach-disable {
-        type empty;
-        description
-          "Disable ICMP unreachable for Nullx interface";
-      }
-      leaf icmp-mask-reply {
-        type empty;
-        description
-          "The flag for enabling sending of ICMP mask
-           reply messages";
-      }
-      leaf tcp-mss-adjust-enable {
-        type empty;
-        description
-          "Enable TCP MSS Adjust on an interface";
-      }
-      leaf ttl-propagate-disable {
-        type empty;
-        description
-          "Disable TTL propagate on an interface";
-      }
-      leaf point-to-point {
-        type empty;
-        description
-          "Enable point-to-point handling for this
-           interface.";
-      }
-      leaf mtu {
-        type uint32 {
-          range "68..65535";
-        }
-        description
-          "The IP Maximum Transmission Unit";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ipv4-network-forwarding {
-      description
-        "Interface IPv4 Network configuration data also
-         used for forwarding";
-      leaf directed-broadcast {
-        type empty;
-        description
-          "Enable forwarding of directed broadcast";
-      }
-      leaf unreachables {
-        type empty;
-        description
-          "Disable sending ICMP unreachables";
-      }
-      leaf redirects {
-        type empty;
-        description
-          "Enable sending ICMP Redirect messages";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv6-ma-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv6-ma-cfg.yang
deleted file mode 100644
index 1de39d15a..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-ipv6-ma-cfg.yang
+++ /dev/null
@@ -1,432 +0,0 @@
-module Cisco-IOS-XR-ipv6-ma-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-ipv6-ma-cfg";
-  prefix ipv6-ma-cfg;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ip-iarm-datatypes {
-    prefix dt1;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR ipv6-ma package configuration.
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg
-     module with configuration data.
-     
-     Copyright (c) 2013-2020 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2020-02-18 {
-    description
-      "Added new leaf icmp-unreach-disable.";
-    semver:module-version "2.1.0";
-  }
-  revision 2019-10-31 {
-    description
-      "Added mandatory nodes.";
-    semver:module-version "2.0.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2017-03-03 {
-    description
-      "Descriptions updated.";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Ipv6-self-ping {
-    type enumeration {
-      enum "disabled" {
-        value 0;
-        description
-          "Doesn't allow router to ping itself";
-      }
-      enum "enabled" {
-        value 1;
-        description
-          "Allow router to ping itself";
-      }
-    }
-    description
-      "Ipv6 self ping";
-  }
-
-  typedef Ipv6-reachable {
-    type enumeration {
-      enum "any" {
-        value 0;
-        description
-          "Source is reachable via any interface";
-      }
-      enum "received" {
-        value 1;
-        description
-          "Source is reachable via interface on which
-           packet was received";
-      }
-    }
-    description
-      "Ipv6 reachable";
-  }
-
-  typedef Ipv6-default-ping {
-    type enumeration {
-      enum "disabled" {
-        value 0;
-        description
-          "Default route is not allowed to match when
-           checking source address";
-      }
-      enum "enabled" {
-        value 1;
-        description
-          "Allow default route to match when checking
-           source address";
-      }
-    }
-    description
-      "Ipv6 default ping";
-  }
-
-  typedef Ipv6-qppb {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No QPPB configuration";
-      }
-      enum "ip-precedence" {
-        value 1;
-        description
-          "Enable ip-precedence based QPPB";
-      }
-      enum "qos-group" {
-        value 2;
-        description
-          "Enable qos-group based QPPB";
-      }
-      enum "both" {
-        value 3;
-        description
-          "Enable both ip-precedence and qos-group based
-           QPPB";
-      }
-    }
-    description
-      "Ipv6 qppb";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ipv6-network {
-      description
-        "Interface IPv6 Network configuration data";
-      container bgp-qos-policy-propagation {
-        presence "Indicates a bgp-qos-policy-propagation node is configured.";
-        description
-          "Configure BGP QoS policy propagation";
-        leaf source {
-          type Ipv6-qppb;
-          mandatory true;
-          description
-            "QPPB configuration on source";
-        }
-        leaf destination {
-          type Ipv6-qppb;
-          mandatory true;
-          description
-            "QPPB configuration on destination";
-        }
-      }
-      container bgp-policy-accountings {
-        description
-          "IPv6 BGP Policy Accounting";
-        list bgp-policy-accounting {
-          key "direction";
-          description
-            "Accounting input or output";
-          leaf direction {
-            type xr:Cisco-ios-xr-string;
-            description
-              "Accouting on input or output";
-          }
-          leaf destination-accounting {
-            type boolean;
-            mandatory true;
-            description
-              "Accounting on Destination IP Address";
-          }
-          leaf source-accounting {
-            type boolean;
-            mandatory true;
-            description
-              "Accounting on Source IP Address";
-          }
-        }
-      }
-      container verify {
-        presence "Indicates a verify node is configured.";
-        description
-          "IPv6 Verify Unicast Souce Reachable";
-        leaf reachable {
-          type Ipv6-reachable;
-          mandatory true;
-          description
-            "Source Reachable Interface";
-        }
-        leaf self-ping {
-          type Ipv6-self-ping;
-          mandatory true;
-          description
-            "Allow Self Ping";
-        }
-        leaf default-ping {
-          type Ipv6-default-ping;
-          mandatory true;
-          description
-            "Allow Default Route";
-        }
-      }
-      container addresses {
-        description
-          "Set the IPv6 address of an interface";
-        container segment-routings {
-          description
-            "Segment Routing Table";
-          list segment-routing {
-            key "address";
-            description
-              "Segment Routing Submode ";
-            container ipv6-prefix-sid {
-              presence "Indicates a ipv6-prefix-sid node is configured.";
-              description
-                "Prefix-Sid for Segment Routing";
-              leaf prefix-length {
-                type dt1:Ipv6arm-prefix-length;
-                mandatory true;
-                description
-                  "Prefix Length";
-              }
-              leaf zone {
-                type string;
-                description
-                  "IPv6 address zone";
-              }
-              leaf route-tag {
-                type uint32 {
-                  range "1..4294967295";
-                }
-                description
-                  "RouteTag";
-              }
-            }
-            leaf enable {
-              type empty;
-              description
-                "Segment Routing Submode";
-            }
-            leaf address {
-              type inet:ip-address-no-zone;
-              description
-                "IPv6 address";
-            }
-          }
-        }
-        container link-local-address {
-          presence "Indicates a link-local-address node is configured.";
-          description
-            "Link local IPv6 address";
-          leaf address {
-            type inet:ip-address-no-zone;
-            mandatory true;
-            description
-              "IPv6 address";
-          }
-          leaf zone {
-            type string;
-            mandatory true;
-            description
-              "IPv6 address zone";
-          }
-          leaf route-tag {
-            type uint32 {
-              range "1..4294967295";
-            }
-            description
-              "RouteTag";
-          }
-        }
-        container eui64-addresses {
-          description
-            "EUI-64 IPv6 address Table";
-          list eui64-address {
-            key "address";
-            description
-              "EUI-64 IPv6 address";
-            leaf address {
-              type inet:ip-address-no-zone;
-              description
-                "IPv6 address";
-            }
-            leaf prefix-length {
-              type dt1:Ipv6arm-prefix-length;
-              mandatory true;
-              description
-                "Prefix Length";
-            }
-            leaf zone {
-              type string;
-              mandatory true;
-              description
-                "IPv6 address zone";
-            }
-            leaf route-tag {
-              type uint32 {
-                range "1..4294967295";
-              }
-              description
-                "RouteTag";
-            }
-          }
-        }
-        container regular-addresses {
-          description
-            "Regular IPv6 address Table";
-          list regular-address {
-            key "address";
-            description
-              "Regular IPv6 address";
-            leaf address {
-              type inet:ip-address-no-zone;
-              description
-                "IPv6 address";
-            }
-            leaf prefix-length {
-              type dt1:Ipv6arm-prefix-length;
-              mandatory true;
-              description
-                "Prefix Length";
-            }
-            leaf zone {
-              type string;
-              mandatory true;
-              description
-                "IPv6 address zone";
-            }
-            leaf route-tag {
-              type uint32 {
-                range "1..4294967295";
-              }
-              description
-                "RouteTag";
-            }
-          }
-        }
-        container auto-configuration {
-          description
-            "Auto IPv6 Interface Configuration";
-          leaf enable {
-            type empty;
-            description
-              "The flag to enable auto ipv6 interface
-               configuration";
-          }
-          leaf auto-config-slaac {
-            type empty;
-            description
-              "Enable slaac on Mgmt interface";
-          }
-        }
-      }
-      container bgp-flow-tag-policy-table {
-        description
-          "Interface ipv6 bgp policy propagation flowtag
-           configuration";
-        container bgp-flow-tag-policy {
-          description
-            "Input";
-          leaf source {
-            type boolean;
-            description
-              "Flow Tag configuration on source";
-          }
-          leaf destination {
-            type boolean;
-            description
-              "Flow Tag configuration on destination";
-          }
-        }
-      }
-      leaf mtu {
-        type uint32 {
-          range "1280..65535";
-        }
-        description
-          "MTU Setting of Interface";
-      }
-      leaf unnumbered {
-        type xr:Interface-name;
-        description
-          "Enable IPv6 processing without an explicit
-           address";
-      }
-      leaf ttl-propagate-disable {
-        type empty;
-        description
-          "Disabled TTL propagate on an interface";
-      }
-      leaf tcp-mss-adjust-enable {
-        type empty;
-        description
-          "Enable TCP MSS adjust on an interface";
-      }
-      leaf icmp-unreach-disable {
-        type empty;
-        description
-          "Disable ICMP unreachable for Nullx interface";
-      }
-      leaf unreachables {
-        type empty;
-        description
-          "Override Sending of ICMP Unreachable Messages";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-cfg.yang
deleted file mode 100644
index 01e14420b..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-cfg.yang
+++ /dev/null
@@ -1,845 +0,0 @@
-module Cisco-IOS-XR-l2-eth-infra-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-l2-eth-infra-cfg";
-  prefix l2-eth-infra-cfg;
-
-  import ietf-yang-types {
-    prefix yang;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-l2-eth-infra-datatypes {
-    prefix dt1;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-  import Cisco-IOS-XR-l2vpn-cfg {
-    prefix a2;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR l2-eth-infra package configuration.
-     
-     This module contains definitions
-     for the following management objects:
-       ethernet-features: Ethernet Features Configuration
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg,
-       Cisco-IOS-XR-l2vpn-cfg
-     modules with configuration data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2018-06-15 {
-    description
-      "Allow min..max in range when min == max.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef L2-protocol-name {
-    type enumeration {
-      enum "cdp" {
-        value 0;
-        description
-          "CDP";
-      }
-      enum "stp" {
-        value 1;
-        description
-          "STP";
-      }
-      enum "vtp" {
-        value 2;
-        description
-          "VTP";
-      }
-      enum "pvst" {
-        value 3;
-        description
-          "PVST+";
-      }
-      enum "cpsv" {
-        value 4;
-        description
-          "CDP, PVST+, STP, and VTP";
-      }
-    }
-    description
-      "L2 protocol name";
-  }
-
-  typedef L2-protocol-mode {
-    type enumeration {
-      enum "forward" {
-        value 0;
-        description
-          "Forward packets transparently";
-      }
-      enum "drop" {
-        value 1;
-        description
-          "Drop the protocol's packets";
-      }
-      enum "tunnel" {
-        value 2;
-        description
-          "Tunnel ingress frames, untunnel egress frames";
-      }
-      enum "reverse-tunnel" {
-        value 3;
-        description
-          "Tunnel egress frames, untunnel ingress frames";
-      }
-    }
-    description
-      "L2 protocol mode";
-  }
-
-  typedef Egress-filtering {
-    type enumeration {
-      enum "egress-filtering-type-strict" {
-        value 1;
-        description
-          "Strict Egress Filtering";
-      }
-      enum "egress-filtering-type-disable" {
-        value 2;
-        description
-          "Egress Filtering Disabled";
-      }
-      enum "egress-filtering-type-default" {
-        value 3;
-        description
-          "Default Egress Filtering Behavior";
-      }
-    }
-    description
-      "Egress filtering";
-  }
-
-  typedef Filtering {
-    type enumeration {
-      enum "filtering-type-dot1q" {
-        value 0;
-        description
-          "C-Vlan ingress frame filtering (Table 8-1 of
-           802.1ad standard)";
-      }
-      enum "filtering-type-dot1ad" {
-        value 1;
-        description
-          "S-Vlan ingress frame filtering (Table 8-2 of
-           802.1ad standard)";
-      }
-    }
-    description
-      "Filtering";
-  }
-
-  typedef L2-protocol-mpls-exp-bits-value {
-    type uint32 {
-      range "0..7";
-    }
-    description
-      "L2 protocol mpls exp bits value";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    leaf user-network-interface {
-      type string {
-        length "1..64";
-      }
-      description
-        "User-Network Interface ID";
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container vlan-sub-configuration {
-      description
-        "IEEE 802.1Q VLAN subinterface configuration";
-      container vlan-identifier {
-        presence "Indicates a vlan-identifier node is configured.";
-        description
-          "The VLAN tag stack associated with this
-           sub-interface.";
-        leaf vlan-type {
-          type dt1:Vlan;
-          mandatory true;
-          description
-            "Whether this sub-interface is dot1ad or dot1Q";
-        }
-        leaf first-tag {
-          type dt1:Vlan-tag;
-          mandatory true;
-          description
-            "First (outermost) VLAN tag value";
-        }
-        leaf second-tag {
-          type dt1:Vlan-tag-or-null;
-          description
-            "Second VLAN tag value. The any value may only
-             be used for Layer 2 subinterfaces";
-        }
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ethernet-service {
-      description
-        "Ethernet service configuration";
-      container local-traffic-default-encapsulation {
-        presence "Indicates a local-traffic-default-encapsulation node is configured.";
-        description
-          "The default encapsulation to be used for
-           locally-sourced packets";
-        leaf outer-tag-type {
-          type dt1:Vlan;
-          mandatory true;
-          description
-            "Type of outer tag";
-        }
-        leaf outer-vlan-id {
-          type dt1:Vlan-tag;
-          mandatory true;
-          description
-            "VLAN id for outer tag";
-        }
-        leaf inner-vlan-id {
-          type dt1:Vlan-tag;
-          description
-            "Optional VLAN Id for inner Dot1Q tag";
-        }
-      }
-      container encapsulation {
-        presence "Indicates a encapsulation node is configured.";
-        description
-          "The encapsulation of this Ethernet service";
-        leaf outer-tag-type {
-          type dt1:Match;
-          mandatory true;
-          description
-            "Whether to match all unmatched packets,
-             untagged packets or tagged packets, and if
-             matching tagged packets, the outer tag type to
-             match";
-        }
-        leaf outer-range1-low {
-          type dt1:Vlan-tag-or-any;
-          description
-            "Low value of first range for outer tag match";
-        }
-        leaf outer-range1-high {
-          type dt1:Vlan-tag-or-native;
-          description
-            "High value of first range for outer tag match";
-        }
-        leaf inner-tag-type {
-          type dt1:Match;
-          description
-            "Type of tag for inner match (if present)";
-        }
-        leaf inner-range1-low {
-          type dt1:Vlan-tag-or-any;
-          description
-            "Low value of first range for inner tag match";
-        }
-        leaf inner-range1-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of first range for inner tag match";
-        }
-        leaf additional-range1-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of first additional range for tag
-             match";
-        }
-        leaf additional-range1-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of first additional range for tag
-             match";
-        }
-        leaf additional-range2-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of second additional range for tag
-             match";
-        }
-        leaf additional-range2-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of second additional range for tag
-             match";
-        }
-        leaf additional-range3-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of third additional range for tag
-             match";
-        }
-        leaf additional-range3-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of third additional range for tag
-             match";
-        }
-        leaf additional-range4-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of forth additional range for tag
-             match";
-        }
-        leaf additional-range4-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of forth additional range for tag
-             match";
-        }
-        leaf additional-range5-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of fifth additional range for tag
-             match";
-        }
-        leaf additional-range5-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of fifth additional range for tag
-             match";
-        }
-        leaf additional-range6-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of sixth additional range for tag
-             match";
-        }
-        leaf additional-range6-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of sixth additional range for tag
-             match";
-        }
-        leaf additional-range7-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of seventh additional range for tag
-             match";
-        }
-        leaf additional-range7-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of seventh additional range for tag
-             match";
-        }
-        leaf additional-range8-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of eighth additional range for tag
-             match";
-        }
-        leaf additional-range8-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of eighth additional range for tag
-             match";
-        }
-        leaf outer-class-of-service {
-          type dt1:Class-of-service;
-          description
-            "Value to match against Class Of Service bits
-             for outer tag";
-        }
-        leaf inner-class-of-service {
-          type dt1:Class-of-service;
-          description
-            "Value to match against Class Of Service bits
-             for inner tag";
-        }
-        leaf payload-ethertype-match {
-          type dt1:Ethertype-match;
-          description
-            "Which payload ethertype values to match";
-        }
-        leaf ingress-source-mac {
-          type yang:mac-address;
-          description
-            "Source MAC address to match on ingress";
-        }
-        leaf ingress-destination-mac {
-          type yang:mac-address;
-          description
-            "Destination MAC address to match on egress";
-        }
-        leaf exact {
-          type empty;
-          description
-            "Only match packets with no more tags than
-             explicitly matched";
-        }
-      }
-      container rewrite {
-        presence "Indicates a rewrite node is configured.";
-        description
-          "The rewrite operation for the Ethernet service";
-        leaf rewrite-type {
-          type dt1:Rewrite;
-          mandatory true;
-          description
-            "The type of rewrite to perform";
-        }
-        leaf outer-tag-type {
-          type dt1:Match;
-          description
-            "Type of outermost tag to be pushed";
-        }
-        leaf outer-tag-value {
-          type dt1:Vlan-tag;
-          description
-            "VLAN Id of outermost tag to be pushed";
-        }
-        leaf inner-tag-type {
-          type dt1:Match;
-          description
-            "Type of innermost tag to be pushed";
-        }
-        leaf inner-tag-value {
-          type dt1:Vlan-tag;
-          description
-            "VLAN Id of innermost tag to be pushed";
-        }
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ethernet-bng {
-      description
-        "Ethernet Infra BNG specific configuration";
-      container ambiguous-encapsulation {
-        presence "Indicates a ambiguous-encapsulation node is configured.";
-        description
-          "L3 Ambiguous encapsulation";
-        leaf outer-tag-type {
-          type dt1:Match;
-          mandatory true;
-          description
-            "Whether to match all unmatched packets,
-             untagged packets or tagged packets, and if
-             matching tagged packets, the outer tag type to
-             match";
-        }
-        leaf outer-range1-low {
-          type dt1:Vlan-tag-or-any;
-          description
-            "Low value of first range for outer tag match";
-        }
-        leaf outer-range1-high {
-          type dt1:Vlan-tag-or-native;
-          description
-            "High value of first range for outer tag match";
-        }
-        leaf inner-tag-type {
-          type dt1:Match;
-          description
-            "Type of tag for inner match (if present)";
-        }
-        leaf inner-range1-low {
-          type dt1:Vlan-tag-or-any;
-          description
-            "Low value of first range for inner tag match";
-        }
-        leaf inner-range1-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of first range for inner tag match";
-        }
-        leaf additional-range1-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of first additional range for tag
-             match";
-        }
-        leaf additional-range1-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of first additional range for tag
-             match";
-        }
-        leaf additional-range2-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of second additional range for tag
-             match";
-        }
-        leaf additional-range2-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of second additional range for tag
-             match";
-        }
-        leaf additional-range3-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of third additional range for tag
-             match";
-        }
-        leaf additional-range3-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of third additional range for tag
-             match";
-        }
-        leaf additional-range4-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of forth additional range for tag
-             match";
-        }
-        leaf additional-range4-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of forth additional range for tag
-             match";
-        }
-        leaf additional-range5-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of fifth additional range for tag
-             match";
-        }
-        leaf additional-range5-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of fifth additional range for tag
-             match";
-        }
-        leaf additional-range6-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of sixth additional range for tag
-             match";
-        }
-        leaf additional-range6-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of sixth additional range for tag
-             match";
-        }
-        leaf additional-range7-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of seventh additional range for tag
-             match";
-        }
-        leaf additional-range7-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of seventh additional range for tag
-             match";
-        }
-        leaf additional-range8-low {
-          type dt1:Vlan-tag-or-cvp;
-          description
-            "Low value of eighth additional range for tag
-             match";
-        }
-        leaf additional-range8-high {
-          type dt1:Vlan-tag;
-          description
-            "High value of eighth additional range for tag
-             match";
-        }
-        leaf outer-class-of-service {
-          type dt1:Class-of-service;
-          description
-            "Value to match against Class Of Service bits
-             for outer tag";
-        }
-        leaf inner-class-of-service {
-          type dt1:Class-of-service;
-          description
-            "Value to match against Class Of Service bits
-             for inner tag";
-        }
-        leaf payload-ethertype-match {
-          type dt1:Ethertype-match;
-          description
-            "Which payload ethertype values to match";
-        }
-        leaf ingress-source-mac {
-          type yang:mac-address;
-          description
-            "Source MAC address to match on ingress";
-        }
-        leaf ingress-destination-mac {
-          type yang:mac-address;
-          description
-            "Destination MAC address to match on egress";
-        }
-        leaf exact {
-          type empty;
-          description
-            "Only match packets with no more tags than
-             explicitly matched";
-        }
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container mac-accounting {
-      description
-        "MAC Accounting Configuration";
-      leaf ingress {
-        type empty;
-        description
-          "Per MAC address accounting statistics";
-      }
-      leaf egress {
-        type empty;
-        description
-          "Per MAC address accounting statistics";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container ethernet-features {
-      description
-        "Ethernet Features Configuration";
-      leaf filtering {
-        type Filtering;
-        description
-          "Ingress Ethernet frame filtering";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container carrier-delay {
-      description
-        "Set the carrier transition delay on an interface
-         in msecs";
-      leaf carrier-delay-up {
-        type uint32 {
-          range "1..65535";
-        }
-        description
-          "Carrier Delay (up) in msecs";
-      }
-      leaf carrier-delay-down {
-        type uint32 {
-          range "0";
-        }
-        description
-          "Carrier Delay down in msecs, must be set to 0";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container vlan-trunk-configuration {
-      description
-        "IEEE 802.1Q VLAN trunk interface configuration";
-      container native-vlan-identifier {
-        presence "Indicates a native-vlan-identifier node is configured.";
-        description
-          "The Native VLAN identifier associated with this
-           trunk interface";
-        leaf vlan-type {
-          type dt1:Vlan;
-          mandatory true;
-          description
-            "Whether this interface is dot1ad or dot1Q";
-        }
-        leaf vlan-identifier {
-          type dt1:Vlan-tag;
-          mandatory true;
-          description
-            "VLAN identifier";
-        }
-      }
-      container vlan-switched {
-        description
-          "VLAN Switch interface configuration";
-        leaf mode {
-          type dt1:Vs-mode;
-          description
-            "VLAN Switch mode";
-        }
-        leaf access-vlan {
-          when "../mode = 'access'" {
-            description
-              "../Mode = Access";
-          }
-          type dt1:Vlan-tag;
-          description
-            "Access VLAN Id";
-        }
-        leaf trunk-tag-type {
-          when "../mode = 'trunk'" {
-            description
-              "../Mode = Trunk";
-          }
-          type dt1:Vlan;
-          description
-            "Whether to match dot1ad or dot1Q packets";
-        }
-        leaf trunk-vla-ns {
-          when "../mode = 'trunk'" {
-            description
-              "../Mode = Trunk";
-          }
-          type string;
-          description
-            "Comma-separated, increasing sequence of VLAN
-             Ids or VLAN ranges";
-        }
-      }
-      leaf tunneling-ethertype {
-        type enumeration {
-          enum "0x9100" {
-            value 37120;
-            description
-              "0x9100";
-          }
-          enum "0x9200" {
-            value 37376;
-            description
-              "0x9200";
-          }
-        }
-        description
-          "The outer ethertype used in Q-in-Q frames. The
-           default value is 0x8100";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration/a2:l2-transport" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-l2vpn-cfg'";
-    container l2-protocols {
-      description
-        "Interface specific Layer 2 protocol handling";
-      list l2-protocol {
-        key "l2-protocol-name";
-        description
-          "Handling of a specific Layer 2 protocol";
-        leaf l2-protocol-name {
-          type L2-protocol-name;
-          description
-            "Protocol name";
-        }
-        leaf mode {
-          type L2-protocol-mode;
-          mandatory true;
-          description
-            "How to handle the protocol's packets";
-        }
-        leaf mpls-exp-bits-value {
-          type L2-protocol-mpls-exp-bits-value;
-          description
-            "The value to set the MPLS Exp bits to within
-             the PW.This value may be specified if the mode
-             is forward or tunnel and must not be specified
-             if the mode is drop";
-        }
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration/a2:l2-transport" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-l2vpn-cfg'";
-    leaf propagate-remote-status {
-      type empty;
-      description
-        "Enable propagation of the remote
-         attachment-circuit link state to the
-         localattachment-circuit link state";
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration/a2:l2-transport" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-l2vpn-cfg'";
-    container l2-ethernet-features {
-      description
-        "L2 Ethernet Features Configuration";
-      leaf egress-filtering {
-        type Egress-filtering;
-        default "egress-filtering-type-default";
-        description
-          "Egress Ethernet filtering";
-      }
-      leaf source-bypass-egress-filtering {
-        type empty;
-        description
-          "Mark all ingress packets to bypass any egress
-           VLAN filter";
-      }
-    }
-  }
-  container ethernet-features {
-    description
-      "Ethernet Features Configuration";
-    container egress-filtering {
-      description
-        "Egress Filtering Configuration";
-      leaf egress-filtering-default-on {
-        type empty;
-        description
-          "Whether Egress Filtering is on by default";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-datatypes.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-datatypes.yang
deleted file mode 100644
index 533c8e561..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2-eth-infra-datatypes.yang
+++ /dev/null
@@ -1,258 +0,0 @@
-module Cisco-IOS-XR-l2-eth-infra-datatypes {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-l2-eth-infra-datatypes";
-  prefix l2-eth-infra-datatypes;
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of generally useful
-     derived YANG data types.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef Vs-mode {
-    type enumeration {
-      enum "trunk" {
-        value 1;
-        description
-          "VLAN-Switched trunk mode";
-      }
-      enum "access" {
-        value 2;
-        description
-          "VLAN-Switched access mode";
-      }
-    }
-    description
-      "Vs mode";
-  }
-
-  typedef Vlan-tag-or-cvp {
-    type union {
-      type enumeration {
-        enum "native-with-cvlan-preservation" {
-          value 65534;
-          description
-            "This is the Native VLAN and C-VLAN
-             preservation is enabled";
-        }
-      }
-      type uint32 {
-        range "1..65534";
-      }
-    }
-    description
-      "Vlan tag or cvp";
-  }
-
-  typedef Class-of-service {
-    type uint32 {
-      range "0..7";
-    }
-    description
-      "Class of service";
-  }
-
-  typedef Vlan {
-    type enumeration {
-      enum "vlan-type-dot1ad" {
-        value 1;
-        description
-          "An 802.1ad VLAN";
-      }
-      enum "vlan-type-dot1q" {
-        value 2;
-        description
-          "An 802.1q VLAN";
-      }
-    }
-    description
-      "Vlan";
-  }
-
-  typedef Vlan-tag-or-native {
-    type union {
-      type enumeration {
-        enum "native" {
-          value 65535;
-          description
-            "This is the Native VLAN";
-        }
-        enum "native-with-cvlan-preservation" {
-          value 65534;
-          description
-            "This is the Native VLAN and C-VLAN
-             preservation is enabled";
-        }
-      }
-      type uint32 {
-        range "1..65535";
-      }
-    }
-    description
-      "Vlan tag or native";
-  }
-
-  typedef Vlan-tag-or-null {
-    type union {
-      type enumeration {
-        enum "any" {
-          value 0;
-          description
-            "Match any inner VLAN tag value";
-        }
-      }
-      type uint32 {
-        range "0..4094";
-      }
-    }
-    description
-      "Vlan tag or null";
-  }
-
-  typedef Rewrite {
-    type enumeration {
-      enum "pop1" {
-        value 1;
-        description
-          "Pop 1 tag";
-      }
-      enum "pop2" {
-        value 2;
-        description
-          "Pop 2 tags";
-      }
-      enum "push1" {
-        value 3;
-        description
-          "Push 1 tag";
-      }
-      enum "push2" {
-        value 4;
-        description
-          "Push 2 tags";
-      }
-      enum "translate1to1" {
-        value 5;
-        description
-          "Translate 1-to-1";
-      }
-      enum "translate1to2" {
-        value 6;
-        description
-          "Translate 1-to-2";
-      }
-      enum "translate2to1" {
-        value 7;
-        description
-          "Translate 2-to-1";
-      }
-      enum "translate2to2" {
-        value 8;
-        description
-          "Translate 2-to-2";
-      }
-    }
-    description
-      "Rewrite";
-  }
-
-  typedef Match {
-    type enumeration {
-      enum "match-default" {
-        value 1;
-        description
-          "All otherwise unmatched packets";
-      }
-      enum "match-untagged" {
-        value 2;
-        description
-          "Untagged packets";
-      }
-      enum "match-dot1q" {
-        value 3;
-        description
-          "Match Dot1Q tags";
-      }
-      enum "match-dot1ad" {
-        value 4;
-        description
-          "Match Dot1ad tags";
-      }
-      enum "match-dot1q-priority" {
-        value 5;
-        description
-          "Match Dot1Q priority-tagged packets";
-      }
-      enum "match-dot1ad-priority" {
-        value 6;
-        description
-          "Match Dot1ad priority-tagged packets";
-      }
-    }
-    description
-      "Match";
-  }
-
-  typedef Ethertype-match {
-    type enumeration {
-      enum "ppp-over-ethernet" {
-        value 34915;
-        description
-          "PPP over Ethernet";
-      }
-    }
-    description
-      "Ethertype match";
-  }
-
-  typedef Vlan-tag {
-    type uint32 {
-      range "1..4094";
-    }
-    description
-      "Vlan tag";
-  }
-
-  typedef Vlan-tag-or-any {
-    type union {
-      type enumeration {
-        enum "any" {
-          value 4096;
-          description
-            "Match any VLAN tag value";
-        }
-      }
-      type uint32 {
-        range "1..4096";
-      }
-    }
-    description
-      "Vlan tag or any";
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2vpn-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2vpn-cfg.yang
deleted file mode 100644
index 4cde24412..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-l2vpn-cfg.yang
+++ /dev/null
@@ -1,6117 +0,0 @@
-module Cisco-IOS-XR-l2vpn-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-l2vpn-cfg";
-  prefix l2vpn-cfg;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import ietf-yang-types {
-    prefix yang;
-  }
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-  import Cisco-IOS-XR-snmp-agent-cfg {
-    prefix a2;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR l2vpn package configuration.
-     
-     This module contains definitions
-     for the following management objects:
-       l2vpn: L2VPN configuration
-       generic-interface-lists: Generic Interface List configuration
-       evpn: EVPN configuration
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg,
-       Cisco-IOS-XR-snmp-agent-cfg
-     modules with configuration data.
-     
-     Copyright (c) 2013-2020 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2020-08-08 {
-    description
-      "Added support for ignore-mtu-mismatch and transmit-mtu-zero CLI globally under evpn submode.";
-    semver:module-version "2.1.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "2.0.0";
-  }
-  revision 2018-06-15 {
-    description
-      "Allow min..max in range when min == max.";
-  }
-  revision 2017-06-26 {
-    description
-      "Change identifiers to be more readable.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef Evpn-encapsulation {
-    type enumeration {
-      enum "evpn-encapsulationvxlan" {
-        value 8;
-        description
-          "VXLAN Encapsulation";
-      }
-      enum "evpn-encapsulation-mpls" {
-        value 10;
-        description
-          "MPLS Encapsulation";
-      }
-      enum "evpn-encapsulation-route-sync" {
-        value 254;
-        description
-          "Route Sync Encapsulation";
-      }
-    }
-    description
-      "Evpn encapsulation";
-  }
-
-  typedef Interworking {
-    type enumeration {
-      enum "ethernet" {
-        value 1;
-        description
-          "Ethernet interworking";
-      }
-      enum "ipv4" {
-        value 3;
-        description
-          "IPv4 interworking";
-      }
-    }
-    description
-      "Interworking";
-  }
-
-  typedef L2vpn-capability-mode {
-    type enumeration {
-      enum "high-mode" {
-        value 1;
-        description
-          "Compute global capability as the highest node
-           capability";
-      }
-      enum "single-mode" {
-        value 2;
-        description
-          "Disable global capability re-computation";
-      }
-    }
-    description
-      "L2vpn capability mode";
-  }
-
-  typedef Evpn-side {
-    type enumeration {
-      enum "evpn-side-regular" {
-        value 1;
-        description
-          "EVPN Instance side defined as regular";
-      }
-      enum "evpn-side-stitching" {
-        value 2;
-        description
-          "EVPN Instance side defined as stitching";
-      }
-    }
-    description
-      "Evpn side";
-  }
-
-  typedef Vpls-id-addr-index {
-    type uint32 {
-      range "0..32767";
-    }
-    description
-      "Vpls id addr index";
-  }
-
-  typedef Evpn-core-group-id-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Evpn core group id range";
-  }
-
-  typedef Tag-rewrite-range {
-    type uint32 {
-      range "1..4094";
-    }
-    description
-      "Tag rewrite range";
-  }
-
-  typedef Pseudowire-evpnacid-range {
-    type uint32 {
-      range "1..16777215";
-    }
-    description
-      "Pseudowire evpnacid range";
-  }
-
-  typedef Evpnvpnid-range {
-    type uint32 {
-      range "1..65534";
-    }
-    description
-      "Evpnvpnid range";
-  }
-
-  typedef Pseudowire-label-range {
-    type uint32 {
-      range "16..1048575";
-    }
-    description
-      "Pseudowire label range";
-  }
-
-  typedef Bridge-domain-transport-mode {
-    type enumeration {
-      enum "vlan-passthrough" {
-        value 3;
-        description
-          "Vlan tagged passthrough mode";
-      }
-    }
-    description
-      "Bridge domain transport mode";
-  }
-
-  typedef Preferred-path {
-    type enumeration {
-      enum "te-tunnel" {
-        value 2;
-        description
-          "TE Tunnel";
-      }
-      enum "ip-tunnel" {
-        value 3;
-        description
-          "IP Tunnel";
-      }
-      enum "tp-tunnel" {
-        value 4;
-        description
-          "TP Tunnel";
-      }
-      enum "sr-te-policy" {
-        value 5;
-        description
-          "SR TE Policy";
-      }
-      enum "named-te-tunnel" {
-        value 8;
-        description
-          "Named TE Tunnel";
-      }
-    }
-    description
-      "Preferred path";
-  }
-
-  typedef Rd-addr-index {
-    type uint32 {
-      range "0..65535";
-    }
-    description
-      "Rd addr index";
-  }
-
-  typedef Vccv-verification {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No connectivity verification over VCCV";
-      }
-      enum "lsp-ping" {
-        value 2;
-        description
-          "LSP Ping over VCCV";
-      }
-    }
-    description
-      "Vccv verification";
-  }
-
-  typedef L2vpn-mtu-range {
-    type uint32 {
-      range "64..65535";
-    }
-    description
-      "L2vpn mtu range";
-  }
-
-  typedef Mac-secure-shutdown-recovery-time-range {
-    type uint32 {
-      range "10..3600";
-    }
-    description
-      "Mac secure shutdown recovery time range";
-  }
-
-  typedef Mac-withdraw-behavior {
-    type enumeration {
-      enum "legacy" {
-        value 1;
-        description
-          "MAC Withdrawal sent on state-down (legacy)";
-      }
-      enum "optimized" {
-        value 2;
-        description
-          "Optimized MAC Withdrawal";
-      }
-    }
-    description
-      "Mac withdraw behavior";
-  }
-
-  typedef Port-down-flush {
-    type enumeration {
-      enum "port-down-flush" {
-        value 0;
-        description
-          "MAC Port Down Flush";
-      }
-      enum "enable-port-down-flush" {
-        value 1;
-        description
-          "Enable Port Down Flush";
-      }
-      enum "disable-port-down-flush" {
-        value 2;
-        description
-          "Disable Port Down Flush";
-      }
-    }
-    description
-      "Port down flush";
-  }
-
-  typedef Storm-control-pps-range {
-    type uint32 {
-      range "1..160000";
-    }
-    description
-      "Storm control pps range";
-  }
-
-  typedef Type-of-service-mode {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "Do not reflect the type of service";
-      }
-      enum "reflect" {
-        value 1;
-        description
-          "Reflect the type of service";
-      }
-    }
-    description
-      "Type of service mode";
-  }
-
-  typedef L2vpn-vs-vlan-tag {
-    type uint32 {
-      range "1..4094";
-    }
-    description
-      "L2vpn vs vlan tag";
-  }
-
-  typedef Pseudowire-tag-range {
-    type uint32 {
-      range "1..4094";
-    }
-    description
-      "Pseudowire tag range";
-  }
-
-  typedef Interface-access-signal-mode {
-    type enumeration {
-      enum "bundle-down" {
-        value 2;
-        description
-          "BundleDown";
-      }
-    }
-    description
-      "Interface access signal mode";
-  }
-
-  typedef Multicast-p2mp-signaling {
-    type string {
-      pattern "(BGP)";
-    }
-    description
-      "BGP:BGP Signaling";
-  }
-
-  typedef Cedge-range {
-    type uint32 {
-      range "11..100";
-    }
-    description
-      "Cedge range";
-  }
-
-  typedef Ethernet-segment-load-balance {
-    type enumeration {
-      enum "single-active" {
-        value 1;
-        description
-          "Single Active";
-      }
-      enum "port-active" {
-        value 2;
-        description
-          "Port Active";
-      }
-      enum "single-flow-active" {
-        value 3;
-        description
-          "Single Flow Active";
-      }
-    }
-    description
-      "Ethernet segment load balance";
-  }
-
-  typedef Mpls-signaling-protocol {
-    type enumeration {
-      enum "none" {
-        value 1;
-        description
-          "No signaling";
-      }
-      enum "ldp" {
-        value 4;
-        description
-          "LDP";
-      }
-    }
-    description
-      "Mpls signaling protocol";
-  }
-
-  typedef Erpaps {
-    type enumeration {
-      enum "interface" {
-        value 1;
-        description
-          "ERP APS type interface";
-      }
-      enum "bridge-domain" {
-        value 2;
-        description
-          "ERP APS type bridge domain";
-      }
-      enum "xconnect" {
-        value 3;
-        description
-          "ERP APS type xconnect";
-      }
-      enum "none" {
-        value 4;
-        description
-          "ERP APS type none";
-      }
-    }
-    description
-      "Erpaps";
-  }
-
-  typedef Mac-secure-action {
-    type enumeration {
-      enum "restrict" {
-        value 1;
-        description
-          "MAC Secure Action Restrict";
-      }
-      enum "none" {
-        value 2;
-        description
-          "No Action";
-      }
-      enum "shutdown" {
-        value 3;
-        description
-          "MAC Secure Action Shutdown";
-      }
-    }
-    description
-      "Mac secure action";
-  }
-
-  typedef Erp-port {
-    type enumeration {
-      enum "none" {
-        value 1;
-        description
-          "ERP port type none";
-      }
-      enum "virtual" {
-        value 2;
-        description
-          "ERP port type virtual";
-      }
-      enum "interface" {
-        value 3;
-        description
-          "ERP port type interface";
-      }
-    }
-    description
-      "Erp port";
-  }
-
-  typedef Resync-threshold-range {
-    type uint32 {
-      range "5..65535";
-    }
-    description
-      "Resync threshold range";
-  }
-
-  typedef Bgp-route-target-role {
-    type enumeration {
-      enum "both" {
-        value 0;
-        description
-          "Both Import and export roles";
-      }
-      enum "import" {
-        value 1;
-        description
-          "Import role";
-      }
-      enum "export" {
-        value 2;
-        description
-          "Export role";
-      }
-    }
-    description
-      "Bgp route target role";
-  }
-
-  typedef Backup-disable {
-    type enumeration {
-      enum "never" {
-        value 0;
-        description
-          "Never";
-      }
-      enum "delay" {
-        value 1;
-        description
-          "Delay seconds";
-      }
-    }
-    description
-      "Backup disable";
-  }
-
-  typedef Time-to-live-range {
-    type uint32 {
-      range "1..255";
-    }
-    description
-      "Time to live range";
-  }
-
-  typedef Multicast-p2mp-transport {
-    type string {
-      pattern "(RSVP_TE)";
-    }
-    description
-      "RSVP_TE:RSVP-TE Transport";
-  }
-
-  typedef Transport-mode {
-    type enumeration {
-      enum "ethernet" {
-        value 1;
-        description
-          "Ethernet port mode";
-      }
-      enum "vlan" {
-        value 2;
-        description
-          "Vlan tagged mode";
-      }
-      enum "vlan-passthrough" {
-        value 3;
-        description
-          "Vlan tagged passthrough mode";
-      }
-    }
-    description
-      "Transport mode";
-  }
-
-  typedef Flow-label-tlv-code {
-    type enumeration {
-      enum "17" {
-        value 4;
-        description
-          "Set Flow Label Legacy TLV code (DEPRECATED)";
-      }
-      enum "disable" {
-        value 8;
-        description
-          "Disable Sending Flow Label Legacy TLV";
-      }
-    }
-    description
-      "Flow label tlv code";
-  }
-
-  typedef Bgp-route-target {
-    type enumeration {
-      enum "no-stitching" {
-        value 0;
-        description
-          "RT is default type";
-      }
-      enum "stitching" {
-        value 1;
-        description
-          "RT is for stitching (Golf-L2) (DEPRECATED)";
-      }
-    }
-    description
-      "Bgp route target";
-  }
-
-  typedef Pseudowire-acid-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Pseudowire acid range";
-  }
-
-  typedef Pseudowire-id-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Pseudowire id range";
-  }
-
-  typedef Interface-profile {
-    type enumeration {
-      enum "snoop" {
-        value 1;
-        description
-          "Set the snooping";
-      }
-      enum "dhcp-protocol" {
-        value 2;
-        description
-          "disable DHCP protocol";
-      }
-    }
-    description
-      "Interface profile";
-  }
-
-  typedef Ethernet-segment-identifier {
-    type enumeration {
-      enum "type0" {
-        value 0;
-        description
-          "ESI type 0";
-      }
-      enum "legacy" {
-        value 128;
-        description
-          "Legacy ESI type";
-      }
-      enum "override" {
-        value 129;
-        description
-          "Override ESI type";
-      }
-    }
-    description
-      "Ethernet segment identifier";
-  }
-
-  typedef Rpl-role {
-    type enumeration {
-      enum "owner" {
-        value 1;
-        description
-          "ERP RPL owner";
-      }
-      enum "neighbor" {
-        value 2;
-        description
-          "ERP RPL neighbor";
-      }
-      enum "next-neighbor" {
-        value 3;
-        description
-          "ERP RPL next neighbor";
-      }
-    }
-    description
-      "Rpl role";
-  }
-
-  typedef Pw-switching-point-tlv {
-    type enumeration {
-      enum "hide" {
-        value 2;
-        description
-          "Hide TLV";
-      }
-    }
-    description
-      "Pw switching point tlv";
-  }
-
-  typedef Erpaps-level-range {
-    type uint32 {
-      range "0..7";
-    }
-    description
-      "Erpaps level range";
-  }
-
-  typedef Evpn-esi-type-range {
-    type uint32 {
-      range "1";
-    }
-    description
-      "Evpn esi type range";
-  }
-
-  typedef Storm-control {
-    type enumeration {
-      enum "unicast" {
-        value 1;
-        description
-          "Unknown-unicast Storm Control";
-      }
-      enum "multicast" {
-        value 2;
-        description
-          "Multicast Storm Control";
-      }
-      enum "broadcast" {
-        value 4;
-        description
-          "Broadcast Storm Control";
-      }
-    }
-    description
-      "Storm control";
-  }
-
-  typedef L2tp-session-id-range {
-    type uint32 {
-      range "1..65535";
-    }
-    description
-      "L2tp session id range";
-  }
-
-  typedef Ethernet-segment-service-carving {
-    type enumeration {
-      enum "mod-n" {
-        value 0;
-        description
-          "MOD N";
-      }
-      enum "manual" {
-        value 1;
-        description
-          "Manual";
-      }
-      enum "hrw" {
-        value 2;
-        description
-          "HRW";
-      }
-    }
-    description
-      "Ethernet segment service carving";
-  }
-
-  typedef Mac-learn {
-    type enumeration {
-      enum "default-learning" {
-        value 0;
-        description
-          "Mac Learning";
-      }
-      enum "enable-learning" {
-        value 1;
-        description
-          "Enable Learning";
-      }
-      enum "disable-learning" {
-        value 2;
-        description
-          "Disable Learning";
-      }
-    }
-    description
-      "Mac learn";
-  }
-
-  typedef L2tpv3-sequencing {
-    type enumeration {
-      enum "off" {
-        value 0;
-        description
-          "Sequencing is off";
-      }
-      enum "both" {
-        value 4;
-        description
-          "Sequencing on both transmit and receive side";
-      }
-    }
-    description
-      "L2tpv3 sequencing";
-  }
-
-  typedef Veid-range {
-    type uint32 {
-      range "1..16384";
-    }
-    description
-      "Veid range";
-  }
-
-  typedef Load-balance {
-    type enumeration {
-      enum "source-dest-mac" {
-        value 1;
-        description
-          "Source and Destination MAC hashing";
-      }
-      enum "source-dest-ip" {
-        value 2;
-        description
-          "Source and Destination IP hashing";
-      }
-      enum "pseudowire-label" {
-        value 4;
-        description
-          "PW Label hashing";
-      }
-    }
-    description
-      "Load balance";
-  }
-
-  typedef L2tp-signaling-protocol {
-    type enumeration {
-      enum "none" {
-        value 1;
-        description
-          "No signaling";
-      }
-      enum "l2tpv3" {
-        value 2;
-        description
-          "L2TPv3";
-      }
-    }
-    description
-      "L2tp signaling protocol";
-  }
-
-  typedef Bdmac-learn {
-    type enumeration {
-      enum "disable-learning" {
-        value 2;
-        description
-          "Disable Learning";
-      }
-    }
-    description
-      "Bdmac learn";
-  }
-
-  typedef L2mc-src-traffic-enabled {
-    type enumeration {
-      enum "l2mc-none" {
-        value 0;
-        description
-          "NONE";
-      }
-      enum "l2mc-ipv4" {
-        value 1;
-        description
-          "Multicast Source - IPv4";
-      }
-      enum "l2mc-ipv6" {
-        value 2;
-        description
-          "Multicast Source - IPv6";
-      }
-      enum "l2mc-ipv4-ipv6" {
-        value 3;
-        description
-          "Multicast Source - IPv4 IPv6";
-      }
-    }
-    description
-      "L2mc src traffic enabled";
-  }
-
-  typedef L2vpn-verification {
-    type enumeration {
-      enum "enable" {
-        value 1;
-        description
-          "enable verification";
-      }
-      enum "disable" {
-        value 2;
-        description
-          "disable verification";
-      }
-    }
-    description
-      "L2vpn verification";
-  }
-
-  typedef Max-path-mtu-range {
-    type uint32 {
-      range "68..65535";
-    }
-    description
-      "Max path mtu range";
-  }
-
-  typedef Interface-traffic-flood {
-    type enumeration {
-      enum "traffic-flooding" {
-        value 0;
-        description
-          "Traffic flooding";
-      }
-      enum "enable-flooding" {
-        value 1;
-        description
-          "Enable Flooding";
-      }
-      enum "disable-flooding" {
-        value 2;
-        description
-          "Disable flooding";
-      }
-    }
-    description
-      "Interface traffic flood";
-  }
-
-  typedef Pbbvid-range {
-    type uint32 {
-      range "1..4094";
-    }
-    description
-      "Pbbvid range";
-  }
-
-  typedef L2tp-cookie-value-range {
-    type uint32 {
-      range "0..4294967295";
-    }
-    description
-      "L2tp cookie value range";
-  }
-
-  typedef L2-encapsulation {
-    type enumeration {
-      enum "vlan" {
-        value 4;
-        description
-          "Vlan tagged mode";
-      }
-      enum "ethernet" {
-        value 5;
-        description
-          "Ethernet port mode";
-      }
-    }
-    description
-      "L2 encapsulation";
-  }
-
-  typedef L2vpn-logging {
-    type enumeration {
-      enum "enable" {
-        value 1;
-        description
-          "enable logging";
-      }
-      enum "disable" {
-        value 2;
-        description
-          "disable logging";
-      }
-    }
-    description
-      "L2vpn logging";
-  }
-
-  typedef Mac-aging-range {
-    type uint32 {
-      range "300..30000";
-    }
-    description
-      "Mac aging range";
-  }
-
-  typedef Vpls-id-as-index {
-    type uint32 {
-      range "0..4294967295";
-    }
-    description
-      "Vpls id as index";
-  }
-
-  typedef Pseudowire-gbl-id-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Pseudowire gbl id range";
-  }
-
-  typedef Rdas-index {
-    type uint32 {
-      range "0..4294967295";
-    }
-    description
-      "Rdas index";
-  }
-
-  typedef Mac-flush-mode {
-    type enumeration {
-      enum "mvrp" {
-        value 1;
-        description
-          "MVRP MAC Flushing";
-      }
-    }
-    description
-      "Mac flush mode";
-  }
-
-  typedef L2tp-cookie-size {
-    type enumeration {
-      enum "zero" {
-        value 0;
-        description
-          "Cookie size is zero bytes";
-      }
-      enum "four" {
-        value 4;
-        description
-          "Cookie size is four bytes";
-      }
-      enum "eight" {
-        value 8;
-        description
-          "Cookie size is eight bytes";
-      }
-    }
-    description
-      "L2tp cookie size";
-  }
-
-  typedef Mpls-sequencing {
-    type enumeration {
-      enum "off" {
-        value 0;
-        description
-          "Sequencing is off";
-      }
-      enum "transmit" {
-        value 1;
-        description
-          "Sequencing on transmit side";
-      }
-      enum "receive" {
-        value 2;
-        description
-          "Sequencing on receive side";
-      }
-      enum "both" {
-        value 4;
-        description
-          "Sequencing on both transmit and receive side";
-      }
-    }
-    description
-      "Mpls sequencing";
-  }
-
-  typedef Erp-instance-range {
-    type uint32 {
-      range "1..2";
-    }
-    description
-      "Erp instance range";
-  }
-
-  typedef Pw-redundancy-initial-delay-range {
-    type uint32 {
-      range "0..120";
-    }
-    description
-      "Pw redundancy initial delay range";
-  }
-
-  typedef Vpls-id-as-range {
-    type uint32 {
-      range "1..65535";
-    }
-    description
-      "Vpls id as range";
-  }
-
-  typedef Rdas-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Rdas range";
-  }
-
-  typedef Ethernet-segment-service-carving-mcast {
-    type enumeration {
-      enum "disabled" {
-        value 0;
-        description
-          "Disabled";
-      }
-      enum "hrw-s-g" {
-        value 1;
-        description
-          "HRW S G";
-      }
-      enum "hrw-g" {
-        value 2;
-        description
-          "HRW G";
-      }
-    }
-    description
-      "Ethernet segment service carving mcast";
-  }
-
-  typedef Bridge-bd-mtu-range {
-    type uint32 {
-      range "46..65535";
-    }
-    description
-      "Bridge bd mtu range";
-  }
-
-  typedef Backup-disable-delay-range {
-    type uint32 {
-      range "0..180";
-    }
-    description
-      "Backup disable delay range";
-  }
-
-  typedef Storm-control-kbps-range {
-    type uint32 {
-      range "64..1280000";
-    }
-    description
-      "Storm control kbps range";
-  }
-
-  typedef Mac-limit-action {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No action";
-      }
-      enum "flood" {
-        value 1;
-        description
-          "Flood Mac Limit Action";
-      }
-      enum "no-flood" {
-        value 2;
-        description
-          "NoFlood Mac Limit Action";
-      }
-      enum "shutdown" {
-        value 3;
-        description
-          "Shutdown Mac Limit Action";
-      }
-    }
-    description
-      "Mac limit action";
-  }
-
-  typedef Erp-port1 {
-    type enumeration {
-      enum "port0" {
-        value 0;
-        description
-          "ERP main port 0";
-      }
-      enum "port1" {
-        value 1;
-        description
-          "ERP main port 1";
-      }
-    }
-    description
-      "Erp port1";
-  }
-
-  typedef Mac-notification {
-    type enumeration {
-      enum "no-notif" {
-        value 0;
-        description
-          "No_Notification Trap";
-      }
-      enum "syslog" {
-        value 1;
-        description
-          "syslog message";
-      }
-      enum "trap" {
-        value 2;
-        description
-          "Snmp Trap";
-      }
-      enum "syslog-snmp" {
-        value 3;
-        description
-          "Syslog_snmp Trap";
-      }
-    }
-    description
-      "Mac notification";
-  }
-
-  typedef Control-word {
-    type enumeration {
-      enum "enable" {
-        value 1;
-        description
-          "Enable control word";
-      }
-      enum "disable" {
-        value 2;
-        description
-          "Disable control word";
-      }
-    }
-    description
-      "Control word";
-  }
-
-  typedef Preferred-nexthop-mode {
-    type enumeration {
-      enum "preferred-nexthop-lowest-ip" {
-        value 1;
-        description
-          "Lowest IP Preferred";
-      }
-      enum "preferred-nexthop-highest-ip" {
-        value 2;
-        description
-          "Highest IP Preferred";
-      }
-    }
-    description
-      "Preferred nexthop mode";
-  }
-
-  typedef Bgp-route-distinguisher {
-    type enumeration {
-      enum "auto" {
-        value 1;
-        description
-          "RD automatically assigned";
-      }
-      enum "two-byte-as" {
-        value 2;
-        description
-          "RD in 2 byte AS:nn format";
-      }
-      enum "four-byte-as" {
-        value 3;
-        description
-          "RD in 4 byte AS:nn format";
-      }
-      enum "ipv4-address" {
-        value 4;
-        description
-          "RD in IpV4address";
-      }
-    }
-    description
-      "Bgp route distinguisher";
-  }
-
-  typedef Bgp-route-target-format {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No route target";
-      }
-      enum "two-byte-as" {
-        value 1;
-        description
-          "2 Byte AS:nn format";
-      }
-      enum "four-byte-as" {
-        value 2;
-        description
-          "4 byte AS:nn format";
-      }
-      enum "ipv4-address" {
-        value 3;
-        description
-          "IP:nn format";
-      }
-      enum "es-import" {
-        value 1538;
-        description
-          "a.a.i format";
-      }
-    }
-    description
-      "Bgp route target format";
-  }
-
-  typedef Evpn-group-id-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Evpn group id range";
-  }
-
-  typedef Mac-limit-threshold-range {
-    type uint32 {
-      range "1..100";
-    }
-    description
-      "Mac limit threshold range";
-  }
-
-  typedef Vedge-range {
-    type uint32 {
-      range "11..100";
-    }
-    description
-      "Vedge range";
-  }
-
-  typedef Vpnid-range {
-    type uint32 {
-      range "1..4294967295";
-    }
-    description
-      "Vpnid range";
-  }
-
-  typedef Ldp-vpls-id {
-    type enumeration {
-      enum "two-byte-as" {
-        value 10;
-        description
-          "VPLS-ID in 2 byte AS:nn format";
-      }
-      enum "ipv4-address" {
-        value 266;
-        description
-          "VPLS-ID in IPv4 IP:nn format";
-      }
-    }
-    description
-      "Ldp vpls id";
-  }
-
-  typedef Ce-id-range {
-    type uint32 {
-      range "1..16384";
-    }
-    description
-      "Ce id range";
-  }
-
-  typedef Mac-aging {
-    type enumeration {
-      enum "absolute" {
-        value 1;
-        description
-          "Absolute aging type";
-      }
-      enum "inactivity" {
-        value 2;
-        description
-          "Inactivity aging type";
-      }
-    }
-    description
-      "Mac aging";
-  }
-
-  typedef Mac-limit-range {
-    type uint32 {
-      range "0..4294967295";
-    }
-    description
-      "Mac limit range";
-  }
-
-  typedef Pbbisid-range {
-    type uint32 {
-      range "256..16777214";
-    }
-    description
-      "Pbbisid range";
-  }
-
-  typedef Type-of-service-range {
-    type uint32 {
-      range "0..255";
-    }
-    description
-      "Type of service range";
-  }
-
-  typedef Flow-label-load-balance {
-    type enumeration {
-      enum "off" {
-        value 0;
-        description
-          "Flow Label load balance is off";
-      }
-      enum "receive" {
-        value 1;
-        description
-          "Delete Flow Label on receive side";
-      }
-      enum "transmit" {
-        value 2;
-        description
-          "Insert Flow Label on transmit side";
-      }
-      enum "both" {
-        value 3;
-        description
-          "Insert/Delete Flow Label on transmit/receive
-           side";
-      }
-    }
-    description
-      "Flow label load balance";
-  }
-
-  grouping EVI-ADVERTISE-MAC-DEPRECATED {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evi-advertise-mac-deprecated {
-      type empty;
-      description
-        "DEPRECATED: Advertise local MAC-only and BVI MAC
-         routes";
-    }
-  }
-
-  grouping TABLE-POLICY {
-    description
-      "Common node of evpn-evi-bgp-auto-discovery,
-       evpn-instance-bgp-auto-discovery";
-    leaf table-policy {
-      type string;
-      description
-        "Table Policy for installation of forwarding data
-         to L2FIB";
-    }
-  }
-
-  grouping STORM-CONTROL-UNIT {
-    description
-      "Common node of bd-storm-control,
-       bdac-storm-control-type, bdpw-storm-control-type";
-    container storm-control-unit {
-      must "kbits-per-sec or pkts-per-sec";
-      description
-        "Specify units for Storm Control Configuration";
-      leaf kbits-per-sec {
-        type Storm-control-kbps-range;
-        units "kbit/s";
-        description
-          "Kilobits Per Second, PktsPerSec and KbitsPerSec
-           cannot be configured together";
-      }
-      leaf pkts-per-sec {
-        type Storm-control-pps-range;
-        units "packet/s";
-        description
-          "Packets Per Second, PktsPerSec and KbitsPerSec
-           cannot be configured together";
-      }
-    }
-  }
-
-  grouping EVI-MCAST-SOURCE-CONNECTED {
-    description
-      "Common node of evi-multicast,
-       evpn-instance-multicast";
-    leaf evi-mcast-source-connected {
-      type empty;
-      description
-        "Enable Multicast source connectivity";
-    }
-  }
-
-  grouping EVI-ECMP-DISABLE {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evi-ecmp-disable {
-      type empty;
-      description
-        "Disable ECMP on the EVI";
-    }
-  }
-
-  grouping MANUAL-SERVICE-CARVING {
-    description
-      "Common node of ethernet-segment,
-       evpn-virtual-ethernet-segment";
-    container manual-service-carving {
-      description
-        "Enter Manual service carving configuration
-         submode";
-      container service-list {
-        description
-          "Manual service carving primary,secondary lists";
-        leaf primary {
-          type string {
-            length "1..150";
-          }
-          description
-            "Primary services list";
-        }
-        leaf secondary {
-          type string {
-            length "1..150";
-          }
-          description
-            "Secondary services list";
-        }
-      }
-      leaf enable {
-        type empty;
-        description
-          "Enable Manual service carving";
-      }
-    }
-  }
-
-  grouping SERVICE-CARVING-MCAST-TYPE {
-    description
-      "Common node of ethernet-segment,
-       evpn-virtual-ethernet-segment";
-    leaf service-carving-mcast-type {
-      type Ethernet-segment-service-carving-mcast;
-      description
-        "Ethernet-Segment Service Carving multicast mode";
-    }
-  }
-
-  grouping ACTION {
-    description
-      "Common node of mac-secure, pbb-edge-mac-secure,
-       interface-mac-secure, pseudowire-mac-secure";
-    leaf action {
-      type Mac-secure-action;
-      description
-        "MAC secure enforcement action";
-    }
-  }
-
-  grouping EVPN-ROUTE-DISTINGUISHER {
-    description
-      "Common node of evpn-bgp-auto-discovery,
-       evpn-evi-bgp-auto-discovery,
-       evpn-instance-bgp-auto-discovery, pw-routing-bgp";
-    container evpn-route-distinguisher {
-      description
-        "Route Distinguisher";
-      leaf type {
-        type Bgp-route-distinguisher;
-        description
-          "Router Distinguisher Type";
-      }
-      leaf as {
-        when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-          description
-            "../Type = TwoByteAS or ../Type = FourByteAS";
-        }
-        type Rdas-range;
-        description
-          "Two byte or 4 byte AS number";
-      }
-      leaf as-index {
-        when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-          description
-            "../Type = TwoByteAS or ../Type = FourByteAS";
-        }
-        type Rdas-index;
-        description
-          "AS:nn (hex or decimal format)";
-      }
-      leaf address {
-        when "../type = 'ipv4-address'" {
-          description
-            "../Type = IPV4Address";
-        }
-        type inet:ipv4-address-no-zone;
-        description
-          "IPV4 address";
-      }
-      leaf addr-index {
-        when "../type = 'ipv4-address'" {
-          description
-            "../Type = IPV4Address";
-        }
-        type Rd-addr-index;
-        description
-          "Addr index";
-      }
-    }
-  }
-
-  grouping EVPN-VIRTUAL-ETHERNET-SEGMENT {
-    description
-      "Common node of evpn-virtual-access-pw,
-       evpn-virtual-access-vfi";
-    container evpn-virtual-ethernet-segment {
-      description
-        "Enter Ethernet Segment configuration submode";
-      leaf enable {
-        type empty;
-        description
-          "Enable Ethernet Segment";
-      }
-      uses SERVICE-CARVING-MCAST-TYPE;
-      uses ES-IMPORT-ROUTE-TARGET;
-      uses SERVICE-CARVING-TYPE;
-      uses IDENTIFIER;
-      uses MANUAL-SERVICE-CARVING;
-    }
-  }
-
-  grouping LOGGING {
-    description
-      "Common node of pbb-edge-mac-secure,
-       interface-mac-secure, pseudowire-mac-secure";
-    leaf logging {
-      type L2vpn-logging;
-      description
-        "MAC Secure Logging";
-    }
-  }
-
-  grouping ES-IMPORT-ROUTE-TARGET {
-    description
-      "Common node of ethernet-segment,
-       evpn-virtual-ethernet-segment";
-    leaf es-import-route-target {
-      type yang:mac-address;
-      description
-        "ES-Import Route Target";
-    }
-  }
-
-  grouping SERVICE-CARVING-TYPE {
-    description
-      "Common node of ethernet-segment,
-       evpn-virtual-ethernet-segment";
-    leaf service-carving-type {
-      type Ethernet-segment-service-carving;
-      description
-        "Ethernet-Segment Service Carving mode";
-    }
-  }
-
-  grouping IMPLICIT-IMPORT-DISABLE {
-    description
-      "Common node of evpn-evi-bgp-auto-discovery,
-       evpn-instance-bgp-auto-discovery";
-    leaf implicit-import-disable {
-      type empty;
-      description
-        "Disables BGP Implicit Import";
-    }
-  }
-
-  grouping IDENTIFIER {
-    description
-      "Common node of ethernet-segment,
-       evpn-virtual-ethernet-segment";
-    container identifier {
-      presence "Indicates a identifier node is configured.";
-      description
-        "Ethernet segment identifier";
-      leaf bytes01 {
-        type xr:Hex-integer;
-        mandatory true;
-        description
-          "Type 0's 1st Byte or Type Byte and 1st Byte";
-      }
-      leaf bytes23 {
-        type xr:Hex-integer;
-        units "byte";
-        mandatory true;
-        description
-          "2nd and 3rd Bytes";
-      }
-      leaf bytes45 {
-        type xr:Hex-integer;
-        units "byte";
-        mandatory true;
-        description
-          "4th and 5th Bytes";
-      }
-      leaf bytes67 {
-        type xr:Hex-integer;
-        units "byte";
-        mandatory true;
-        description
-          "6th and 7th Bytes";
-      }
-      leaf bytes89 {
-        type xr:Hex-integer;
-        units "byte";
-        mandatory true;
-        description
-          "8th and 9th Bytes";
-      }
-      leaf type {
-        type Ethernet-segment-identifier;
-        mandatory true;
-        description
-          "Ethernet segment identifier type";
-      }
-    }
-  }
-
-  grouping EVPN-ROUTE-TARGET-TABLE {
-    description
-      "Common node of evpn-evi-bgp-auto-discovery,
-       evpn-instance-bgp-auto-discovery";
-    container evpn-route-targets {
-      description
-        "Route Target";
-      list evpn-route-target-as {
-        must "format = 'two-byte-as' or format = 'four-byte-as'" {
-          description
-            "path for evpn-route-target when format is 2 or 4 byte AS";
-        }
-        key "format role as as-index stitching";
-        description
-          "Name of the Route Target";
-        leaf format {
-          type Bgp-route-target-format;
-          description
-            "Format of the route target";
-        }
-        leaf role {
-          type Bgp-route-target-role;
-          description
-            "Role of the router target type";
-        }
-        leaf as {
-          type Rdas-range;
-          description
-            "Two byte or 4 byte AS number";
-        }
-        leaf as-index {
-          type Rdas-index;
-          description
-            "AS:nn (hex or decimal format)";
-        }
-        leaf stitching {
-          type Bgp-route-target;
-          description
-            "whether RT is Stitching RT";
-        }
-      }
-      list evpn-route-target-none {
-        must "format = 'none'" {
-          description
-            "path for evpn-route-target when format is none";
-        }
-        key "format role stitching";
-        description
-          "Name of the Route Target";
-        leaf format {
-          type Bgp-route-target-format;
-          description
-            "Format of the route target";
-        }
-        leaf role {
-          type Bgp-route-target-role;
-          description
-            "Role of the router target type";
-        }
-        leaf stitching {
-          type Bgp-route-target;
-          description
-            "whether RT is Stitching RT";
-        }
-      }
-      list evpn-route-target-ipv4-address {
-        must "format = 'ipv4-address'" {
-          description
-            "path for evpn-route-target when format is an ipv4 address";
-        }
-        key "format role address addr-index stitching";
-        description
-          "Name of the Route Target";
-        leaf format {
-          type Bgp-route-target-format;
-          description
-            "Format of the route target";
-        }
-        leaf role {
-          type Bgp-route-target-role;
-          description
-            "Role of the router target type";
-        }
-        leaf address {
-          type inet:ipv4-address-no-zone;
-          description
-            "IPV4 address";
-        }
-        leaf addr-index {
-          type Rd-addr-index;
-          description
-            "Addr index";
-        }
-        leaf stitching {
-          type Bgp-route-target;
-          description
-            "whether RT is Stitching RT";
-        }
-      }
-    }
-  }
-
-  grouping BRIDGE-DOMAIN-TABLE {
-    description
-      "Common node of bridge-domain-group, vlan-switch";
-    container bridge-domains {
-      description
-        "List of Bridge Domain";
-      list bridge-domain {
-        key "name";
-        description
-          "bridge domain";
-        container bd-storm-controls {
-          description
-            "Storm Control";
-          list bd-storm-control {
-            must "storm-control-unit";
-            key "sctype";
-            description
-              "Storm Control Type";
-            leaf sctype {
-              type Storm-control;
-              description
-                "Storm Control Type";
-            }
-            uses STORM-CONTROL-UNIT;
-          }
-        }
-        container member-vnis {
-          description
-            "Bridge Domain VxLAN Network Identifier Table";
-          list member-vni {
-            key "vni";
-            description
-              "Bridge Domain Member VxLAN Network Identifier";
-            container member-vni-static-mac-addresses {
-              description
-                "Static Mac Address Table";
-              list member-vni-static-mac-address {
-                key "mac-address";
-                description
-                  "Static Mac Address Configuration";
-                leaf next-hop-ip {
-                  type inet:ipv4-address-no-zone;
-                  description
-                    "Enable Static Mac Address Configuration";
-                }
-                leaf mac-address {
-                  type yang:mac-address;
-                  description
-                    "Static MAC address";
-                }
-              }
-            }
-            leaf vni {
-              type uint32 {
-                range "1..16777215";
-              }
-              description
-                "VxLAN Network Identifier number";
-            }
-          }
-        }
-        container bridge-domain-mac {
-          description
-            "MAC configuration commands";
-          container bd-mac-limit {
-            description
-              "MAC-Limit configuration commands";
-            leaf bd-mac-limit-action {
-              type Mac-limit-action;
-              description
-                "MAC address limit enforcement action";
-            }
-            leaf bd-mac-limit-notif {
-              type Mac-notification;
-              description
-                "Mac Address Limit Notification";
-            }
-            leaf bd-mac-limit-max {
-              type Mac-limit-range;
-              description
-                "Number of MAC addresses after which MAC
-                 limit action is taken";
-            }
-          }
-          container bd-mac-filters {
-            description
-              "Filter Mac Address";
-            list bd-mac-filter {
-              key "address";
-              description
-                "Static MAC address";
-              leaf drop {
-                type empty;
-                description
-                  "MAC address for filtering";
-              }
-              leaf address {
-                type yang:mac-address;
-                description
-                  "Static MAC address";
-              }
-            }
-          }
-          container mac-secure {
-            description
-              "MAC Secure";
-            leaf logging {
-              type empty;
-              description
-                "MAC Secure Logging";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable MAC Secure";
-            }
-            leaf threshold {
-              type empty;
-              description
-                "MAC Secure Threshold";
-            }
-            uses ACTION;
-            uses SHUTDOWN-RECOVERY-TIMER;
-          }
-          container bd-mac-aging {
-            description
-              "MAC-Aging configuration commands";
-            leaf bd-mac-aging-type {
-              type Mac-aging;
-              description
-                "MAC address aging type";
-            }
-            leaf bd-mac-aging-time {
-              type Mac-aging-range;
-              description
-                "Mac Aging Time";
-            }
-          }
-          leaf bd-mac-withdraw-relay {
-            type empty;
-            description
-              "Mac withdraw sent from access PW to access PW";
-          }
-          leaf bd-mac-withdraw-access-pw-disable {
-            type empty;
-            description
-              "MAC withdraw on Access PW";
-          }
-          leaf bd-mac-port-down-flush {
-            type empty;
-            description
-              "Disable MAC Flush when Port goes Down";
-          }
-          leaf bd-mac-withdraw {
-            type empty;
-            description
-              "Disable Mac Withdraw";
-          }
-          leaf bd-mac-withdraw-behavior {
-            type Mac-withdraw-behavior;
-            description
-              "MAC withdraw sent on bridge port down";
-          }
-          leaf bd-mac-learn {
-            type Bdmac-learn;
-            description
-              "Mac Learning Type";
-          }
-        }
-        container nv-satellite {
-          description
-            "nV Satellite";
-          leaf offload-ipv4-multicast-enable {
-            type empty;
-            description
-              "Enable IPv4 Multicast Offload to Satellite
-               Nodes";
-          }
-          leaf enable {
-            type empty;
-            description
-              "Enable nV Satellite Settings";
-          }
-        }
-        container bridge-domain-pbb {
-          description
-            "Bridge Domain PBB";
-          container pbb-edges {
-            description
-              "PBB Edge";
-            list pbb-edge {
-              key "isid core-bd-name";
-              description
-                "Configure BD as PBB Edge with ISID and
-                 associated PBB Core BD";
-              container pbb-edge-split-horizon-group {
-                description
-                  "Split Horizon Group";
-                leaf disable {
-                  type empty;
-                  description
-                    "Disable split horizon group";
-                }
-              }
-              container pbb-static-mac-mappings {
-                description
-                  "PBB Static Mac Address Mapping Table";
-                list pbb-static-mac-mapping {
-                  key "address";
-                  description
-                    "PBB Static Mac Address Mapping
-                     Configuration";
-                  leaf pbb-static-mac-mapping-bmac {
-                    type yang:mac-address;
-                    description
-                      "Static backbone MAC address to map with";
-                  }
-                  leaf address {
-                    type yang:mac-address;
-                    description
-                      "Static MAC address";
-                  }
-                }
-              }
-              container pbb-edge-dhcp-profile {
-                description
-                  "Attach a DHCP profile";
-                leaf profile-id {
-                  type Interface-profile;
-                  description
-                    "Set the snooping profile";
-                }
-                leaf dhcp-snooping-id {
-                  type string;
-                  description
-                    "Disable DHCP snooping";
-                }
-              }
-              container pbb-edge-mac {
-                description
-                  "MAC configuration commands";
-                container pbb-edge-mac-limit {
-                  description
-                    "MAC-Limit configuration commands";
-                  leaf pbb-edge-mac-limit-action {
-                    type Mac-limit-action;
-                    description
-                      "MAC address limit enforcement action";
-                  }
-                  leaf pbb-edge-mac-limit-max {
-                    type Mac-limit-range;
-                    description
-                      "Number of MAC addresses after which MAC
-                       limit action is taken";
-                  }
-                  leaf pbb-edge-mac-limit-notif {
-                    type Mac-notification;
-                    description
-                      "MAC address limit notification action";
-                  }
-                }
-                container pbb-edge-mac-aging {
-                  description
-                    "MAC-Aging configuration commands";
-                  leaf pbb-edge-mac-aging-type {
-                    type Mac-aging;
-                    description
-                      "MAC address aging type";
-                  }
-                  leaf pbb-edge-mac-aging-time {
-                    type Mac-aging-range;
-                    description
-                      "Mac Aging Time";
-                  }
-                }
-                container pbb-edge-mac-secure {
-                  description
-                    "MAC Secure";
-                  leaf enable {
-                    type empty;
-                    description
-                      "Enable MAC Secure";
-                  }
-                  leaf accept-shutdown {
-                    type empty;
-                    description
-                      "Accept Virtual instance port to be
-                       shutdown on mac violation";
-                  }
-                  uses LOGGING;
-                  uses DISABLE;
-                  uses ACTION;
-                }
-                leaf pbb-edge-mac-learning {
-                  type Mac-learn;
-                  description
-                    "Enable Mac Learning";
-                }
-              }
-              leaf pbb-edge-igmp-profile {
-                type xr:Cisco-ios-xr-string {
-                  length "1..32";
-                }
-                description
-                  "Attach a IGMP Snooping profile";
-              }
-              leaf unknown-unicast-bmac {
-                type yang:mac-address;
-                description
-                  "Configure Unknown Unicast BMAC address for
-                   PBB Edge Port";
-              }
-              leaf isid {
-                type Pbbisid-range;
-                description
-                  "ISID";
-              }
-              leaf core-bd-name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..27";
-                }
-                description
-                  "Core BD Name";
-              }
-            }
-          }
-          container pbb-core {
-            description
-              "PBB Core";
-            container pbb-core-mac {
-              description
-                "MAC configuration commands";
-              container pbb-core-mac-aging {
-                description
-                  "MAC-Aging configuration commands";
-                leaf pbb-core-mac-aging-type {
-                  type Mac-aging;
-                  description
-                    "MAC address aging type";
-                }
-                leaf pbb-core-mac-aging-time {
-                  type Mac-aging-range;
-                  description
-                    "Mac Aging Time";
-                }
-              }
-              container pbb-core-mac-limit {
-                description
-                  "MAC-Limit configuration commands";
-                leaf pbb-core-mac-limit-max {
-                  type Mac-limit-range;
-                  description
-                    "Number of MAC addresses after which MAC
-                     limit action is taken";
-                }
-                leaf pbb-core-mac-limit-notif {
-                  type Mac-notification;
-                  description
-                    "MAC address limit notification action";
-                }
-                leaf pbb-core-mac-limit-action {
-                  type Mac-limit-action;
-                  description
-                    "MAC address limit enforcement action";
-                }
-              }
-              leaf pbb-core-mac-learning {
-                type Mac-learn;
-                description
-                  "Enable Mac Learning";
-              }
-            }
-            container pbb-core-evis {
-              description
-                "PBB Core EVI Table";
-              list pbb-core-evi {
-                key "eviid";
-                description
-                  "PBB Core EVI";
-                leaf eviid {
-                  type Vpnid-range;
-                  description
-                    "Ethernet VPN ID";
-                }
-              }
-            }
-            container pbb-core-dhcp-profile {
-              description
-                "Attach a DHCP profile";
-              leaf profile-id {
-                type Interface-profile;
-                description
-                  "Set the snooping profile";
-              }
-              leaf dhcp-snooping-id {
-                type string;
-                description
-                  "Disable DHCP snooping";
-              }
-            }
-            leaf pbb-core-mmrp-flood-optimization {
-              type empty;
-              description
-                "Enabling MMRP PBB-VPLS Flood Optimization";
-            }
-            leaf vlan-id {
-              type Pbbvid-range;
-              description
-                "VLAN ID to push";
-            }
-            leaf pbb-core-igmp-profile {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Attach a IGMP Snooping profile";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Bridge Domain PBB Core Configuration";
-            }
-          }
-        }
-        container bridge-domain-evis {
-          description
-            "Bridge Domain EVI Table";
-          list bridge-domain-evi {
-            key "vpn-id";
-            description
-              "Bridge Domain MPLS EVPN";
-            leaf vpn-id {
-              type Evpnvpnid-range;
-              description
-                "MPLS Ethernet VPN-ID";
-            }
-          }
-        }
-        container access-vfis {
-          description
-            "Specify the access virtual forwarding
-             interface name";
-          list access-vfi {
-            key "name";
-            description
-              "Name of the Acess Virtual Forwarding
-               Interface";
-            container access-vfi-pseudowires {
-              description
-                "List of pseudowires";
-              list access-vfi-pseudowire {
-                key "neighbor pseudowire-id";
-                description
-                  "Pseudowire configuration";
-                container access-vfi-pseudowire-static-mac-addresses {
-                  description
-                    "Static Mac Address Table";
-                  list access-vfi-pseudowire-static-mac-address {
-                    key "address";
-                    description
-                      "Static Mac Address Configuration";
-                    leaf address {
-                      type yang:mac-address;
-                      description
-                        "Static MAC address";
-                    }
-                  }
-                }
-                leaf access-vfi-pw-class {
-                  type xr:Cisco-ios-xr-string {
-                    length "1..32";
-                  }
-                  description
-                    "Pseudowire class template name to use for
-                     this pseudowire";
-                }
-                leaf neighbor {
-                  type inet:ipv4-address-no-zone;
-                  description
-                    "Neighbor IP address";
-                }
-                leaf pseudowire-id {
-                  type Pseudowire-id-range;
-                  description
-                    "Pseudowire ID";
-                }
-              }
-            }
-            leaf access-vfi-shutdown {
-              type empty;
-              description
-                "shutdown the AccessVfi";
-            }
-            leaf name {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Name of the AccessVirtual Forwarding
-                 Interface";
-            }
-          }
-        }
-        container bd-pseudowires {
-          description
-            "List of pseudowires";
-          list bd-pseudowire {
-            key "neighbor pseudowire-id";
-            description
-              "Pseudowire configuration";
-            container pseudowire-dai {
-              description
-                "Access Pseudowire Dynamic ARP Inspection";
-              container pseudowire-dai-address-validation {
-                description
-                  "Address Validation";
-                leaf ipv4-verification {
-                  type L2vpn-verification;
-                  description
-                    "IPv4 Verification";
-                }
-                leaf destination-mac-verification {
-                  type L2vpn-verification;
-                  description
-                    "Destination MAC Verification";
-                }
-                leaf source-mac-verification {
-                  type L2vpn-verification;
-                  description
-                    "Source MAC Verification";
-                }
-              }
-              leaf logging {
-                type L2vpn-logging;
-                description
-                  "Logging Type";
-              }
-              leaf disable {
-                type empty;
-                description
-                  "Disable Dynamic ARP Inspection";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable Access Pseudowire Dynamic ARP
-                   Inspection";
-              }
-            }
-            container bdpw-storm-control-types {
-              description
-                "Storm Control";
-              list bdpw-storm-control-type {
-                must "storm-control-unit";
-                key "sctype";
-                description
-                  "Storm Control Type";
-                leaf sctype {
-                  type Storm-control;
-                  description
-                    "Storm Control Type";
-                }
-                uses STORM-CONTROL-UNIT;
-              }
-            }
-            container pseudowire-profile {
-              description
-                "Attach a DHCP profile";
-              leaf profile-id {
-                type Interface-profile;
-                description
-                  "Set the snooping profile";
-              }
-              leaf dhcp-snooping-id {
-                type string;
-                description
-                  "Disable DHCP snooping";
-              }
-            }
-            container bd-pw-static-mac-addresses {
-              description
-                "Static Mac Address Table";
-              list bd-pw-static-mac-address {
-                key "address";
-                description
-                  "Static Mac Address Configuration";
-                leaf address {
-                  type yang:mac-address;
-                  description
-                    "Static MAC address";
-                }
-              }
-            }
-            container pseudowire-ip-source-guard {
-              description
-                "IP Source Guard";
-              leaf logging {
-                type L2vpn-logging;
-                description
-                  "Logging Type";
-              }
-              leaf disable {
-                type empty;
-                description
-                  "Disable Dynamic IP source guard";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable IP Source Guard";
-              }
-            }
-            container pseudowire-mac {
-              description
-                "Bridge-domain Pseudowire MAC configuration
-                 commands";
-              container pseudowire-mac-secure {
-                description
-                  "MAC Secure";
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable MAC Secure";
-                }
-                uses LOGGING;
-                uses DISABLE;
-                uses ACTION;
-                uses SHUTDOWN-RECOVERY-TIMER;
-              }
-              container pseudowire-mac-aging {
-                description
-                  "MAC-Aging configuration commands";
-                leaf pseudowire-mac-aging-type {
-                  type Mac-aging;
-                  description
-                    "MAC address aging type";
-                }
-                leaf pseudowire-mac-aging-time {
-                  type Mac-aging-range;
-                  description
-                    "MAC Aging Time";
-                }
-              }
-              container pseudowire-mac-limit {
-                description
-                  "MAC-Limit configuration commands";
-                leaf pseudowire-mac-limit-action {
-                  type Mac-limit-action;
-                  description
-                    "Bridge Access Pseudowire MAC address limit
-                     enforcement action";
-                }
-                leaf pseudowire-mac-limit-notif {
-                  type Mac-notification;
-                  description
-                    "MAC address limit notification action in a
-                     Bridge Access Pseudowire";
-                }
-                leaf pseudowire-mac-limit-max {
-                  type Mac-limit-range;
-                  description
-                    "Number of MAC addresses on a Bridge Access
-                     Pseudowire after which MAC limit action is
-                     taken";
-                }
-              }
-              leaf pseudowire-mac-port-down-flush {
-                type Port-down-flush;
-                description
-                  "Enable/Disable MAC Flush When Port goes
-                   down";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Bridge-domain Pseudowire MAC configuration
-                   mode";
-              }
-              leaf pseudowire-mac-learning {
-                type Mac-learn;
-                description
-                  "Enable MAC Learning";
-              }
-            }
-            container bd-pw-split-horizon {
-              description
-                "Split Horizon";
-              container bd-pw-split-horizon-group {
-                description
-                  "Split Horizon Group";
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable split horizon group";
-                }
-              }
-            }
-            container bd-pw-mpls-static-labels {
-              description
-                "MPLS static labels";
-              leaf local-static-label {
-                type Pseudowire-label-range;
-                description
-                  "Pseudowire local static label";
-              }
-              leaf remote-static-label {
-                type Pseudowire-label-range;
-                description
-                  "Pseudowire remote static label";
-              }
-            }
-            container bridge-domain-backup-pseudowires {
-              description
-                "List of pseudowires";
-              list bridge-domain-backup-pseudowire {
-                key "neighbor pseudowire-id";
-                description
-                  "Backup pseudowire configuration";
-                leaf bridge-domain-backup-pw-class {
-                  type xr:Cisco-ios-xr-string {
-                    length "1..32";
-                  }
-                  description
-                    "PW class template name to use for this
-                     pseudowire";
-                }
-                leaf neighbor {
-                  type inet:ipv4-address-no-zone;
-                  description
-                    "Neighbor IP address";
-                }
-                leaf pseudowire-id {
-                  type Pseudowire-id-range;
-                  description
-                    "Pseudowire ID";
-                }
-              }
-            }
-            leaf pseudowire-mld-snoop {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Attach a MLD Snooping profile";
-            }
-            leaf pseudowire-igmp-snoop {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Attach a IGMP Snooping profile";
-            }
-            leaf pseudowire-flooding {
-              type Interface-traffic-flood;
-              description
-                "Bridge-domain Pseudowire flooding";
-            }
-            leaf bd-pw-class {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "PW class template name to use for this
-                 pseudowire";
-            }
-            leaf pseudowire-flooding-unknown-unicast {
-              type Interface-traffic-flood;
-              description
-                "Bridge-domain Pseudowire flooding Unknown
-                 Unicast";
-            }
-            leaf neighbor {
-              type inet:ipv4-address-no-zone;
-              description
-                "Neighbor IP address";
-            }
-            leaf pseudowire-id {
-              type Pseudowire-id-range;
-              description
-                "Pseudowire ID";
-            }
-          }
-        }
-        container vfis {
-          description
-            "Specify the virtual forwarding interface name";
-          list vfi {
-            key "name";
-            description
-              "Name of the Virtual Forwarding Interface";
-            container multicast-p2mp {
-              description
-                "Enable Multicast P2MP in this VFI";
-              container transports {
-                description
-                  "Multicast P2MP Transport";
-                list transport {
-                  key "transport-name";
-                  description
-                    "Multicast P2MP Transport Type";
-                  leaf attribute-set-name {
-                    type xr:Cisco-ios-xr-string {
-                      length "1..64";
-                    }
-                    description
-                      "Multicast P2MP TE Attribute Set Name";
-                  }
-                  leaf transport-name {
-                    type Multicast-p2mp-transport;
-                    description
-                      "Transport Type";
-                  }
-                }
-              }
-              container signalings {
-                description
-                  "Multicast P2MP Signaling Type";
-                list signaling {
-                  key "signaling-name";
-                  description
-                    "Multicast P2MP Signaling Type";
-                  leaf signaling-name {
-                    type Multicast-p2mp-signaling;
-                    description
-                      "Signaling Type";
-                  }
-                }
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable Autodiscovery P2MP";
-              }
-            }
-            container vfi-pseudowires {
-              description
-                "List of pseudowires";
-              list vfi-pseudowire {
-                key "neighbor pseudowire-id";
-                description
-                  "Pseudowire configuration";
-                container vfi-pw-dhcp-snoop {
-                  description
-                    "Attach a DHCP Snooping profile";
-                  leaf profile-id {
-                    type Interface-profile;
-                    description
-                      "Set the snooping profile";
-                  }
-                  leaf dhcp-snooping-id {
-                    type string;
-                    description
-                      "Disable DHCP snooping";
-                  }
-                }
-                container vfi-pw-mpls-static-labels {
-                  description
-                    "MPLS static labels";
-                  leaf local-static-label {
-                    type Pseudowire-label-range;
-                    description
-                      "Pseudowire local static label";
-                  }
-                  leaf remote-static-label {
-                    type Pseudowire-label-range;
-                    description
-                      "Pseudowire remote static label";
-                  }
-                }
-                container pseudowire-static-mac-addresses {
-                  description
-                    "Static Mac Address Table";
-                  list pseudowire-static-mac-address {
-                    key "address";
-                    description
-                      "Static Mac Address Configuration";
-                    leaf address {
-                      type yang:mac-address;
-                      description
-                        "Static MAC address";
-                    }
-                  }
-                }
-                leaf vfi-pw-class {
-                  type xr:Cisco-ios-xr-string {
-                    length "1..32";
-                  }
-                  description
-                    "PW class template name to use for this
-                     pseudowire";
-                }
-                leaf vfi-pw-igmp-snoop {
-                  type xr:Cisco-ios-xr-string {
-                    length "1..32";
-                  }
-                  description
-                    "Attach a IGMP Snooping profile";
-                }
-                leaf vfi-pw-mld-snoop {
-                  type xr:Cisco-ios-xr-string {
-                    length "1..32";
-                  }
-                  description
-                    "Attach a MLD Snooping profile";
-                }
-                leaf neighbor {
-                  type inet:ipv4-address-no-zone;
-                  description
-                    "Neighbor IP address";
-                }
-                leaf pseudowire-id {
-                  type Pseudowire-id-range;
-                  description
-                    "Pseudowire ID";
-                }
-              }
-            }
-            container bgp-auto-discovery {
-              description
-                "Enable Autodiscovery BGP in this VFI";
-              container ldp-signaling-protocol {
-                description
-                  "Signaling Protocol LDP in this VFI
-                   configuration";
-                container vpls-id {
-                  description
-                    "VPLS ID";
-                  leaf type {
-                    type Ldp-vpls-id;
-                    description
-                      "VPLS-ID Type";
-                  }
-                  leaf as {
-                    when "../type = 'two-byte-as'" {
-                      description
-                        "../Type = TwoByteAS";
-                    }
-                    type Vpls-id-as-range;
-                    description
-                      "Two byte AS number";
-                  }
-                  leaf as-index {
-                    when "../type = 'two-byte-as'" {
-                      description
-                        "../Type = TwoByteAS";
-                    }
-                    type Vpls-id-as-index;
-                    description
-                      "AS index";
-                  }
-                  leaf address {
-                    when "../type = 'ipv4-address'" {
-                      description
-                        "../Type = IPV4Address";
-                    }
-                    type inet:ipv4-address-no-zone;
-                    description
-                      "IPV4 address";
-                  }
-                  leaf address-index {
-                    when "../type = 'ipv4-address'" {
-                      description
-                        "../Type = IPV4Address";
-                    }
-                    type Vpls-id-addr-index;
-                    description
-                      "Address index";
-                  }
-                }
-                container flow-label-load-balance {
-                  description
-                    "Enable Flow Label based load balancing";
-                  leaf flow-label {
-                    type Flow-label-load-balance;
-                    description
-                      "Flow Label load balance type";
-                  }
-                  leaf static {
-                    type empty;
-                    description
-                      "Static Flow Label";
-                  }
-                }
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable LDP as Signaling Protocol.Deletion
-                     of this object also causes deletion of all
-                     objects under LDPSignalingProtocol.";
-                }
-              }
-              container bgp-route-policy {
-                description
-                  "Route policy";
-                leaf export {
-                  type string;
-                  description
-                    "Export route policy";
-                }
-              }
-              container route-distinguisher {
-                description
-                  "Route Distinguisher";
-                leaf type {
-                  type Bgp-route-distinguisher;
-                  description
-                    "Router Distinguisher Type";
-                }
-                leaf as {
-                  when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-                    description
-                      "../Type = TwoByteAS or ../Type =
-                       FourByteAS";
-                  }
-                  type Rdas-range;
-                  description
-                    "Two byte or 4 byte AS number";
-                }
-                leaf as-index {
-                  when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-                    description
-                      "../Type = TwoByteAS or ../Type =
-                       FourByteAS";
-                  }
-                  type Rdas-index;
-                  description
-                    "AS:nn (hex or decimal format)";
-                }
-                leaf address {
-                  when "../type = 'ipv4-address'" {
-                    description
-                      "../Type = IPV4Address";
-                  }
-                  type inet:ipv4-address-no-zone;
-                  description
-                    "IPV4 address";
-                }
-                leaf addr-index {
-                  when "../type = 'ipv4-address'" {
-                    description
-                      "../Type = IPV4Address";
-                  }
-                  type Rd-addr-index;
-                  description
-                    "Addr index";
-                }
-              }
-              container bgp-signaling-protocol {
-                description
-                  "Enable Signaling Protocol BGP in this VFI";
-                container flow-label-load-balance {
-                  description
-                    "Enable Flow Label based load balancing";
-                  leaf flow-label {
-                    type Flow-label-load-balance;
-                    description
-                      "Flow Label load balance type";
-                  }
-                  leaf static {
-                    type empty;
-                    description
-                      "Static Flow Label";
-                  }
-                }
-                leaf ve-range {
-                  type Vedge-range;
-                  description
-                    "Local Virtual Edge Block Configurable
-                     Range";
-                }
-                leaf veid {
-                  type Veid-range;
-                  description
-                    "Local Virtual Edge Identifier";
-                }
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable BGP as Signaling Protocol";
-                }
-              }
-              container route-targets {
-                description
-                  "Route Target";
-                list route-target {
-                  must "two-byte-as-or-four-byte-as or ipv4-address" {
-                    description
-                      "TwoByteAS-or-FourbyteAS or IPV4Address
-                       must be present.";
-                  }
-                  key "role format";
-                  description
-                    "Name of the Route Target";
-                  leaf role {
-                    type Bgp-route-target-role;
-                    description
-                      "Role of the router target type";
-                  }
-                  leaf format {
-                    type Bgp-route-target-format;
-                    description
-                      "Format of the route target";
-                  }
-                  list two-byte-as-or-four-byte-as {
-                    when "../format = 'two-byte-as' or ../format = 'four-byte-as'" {
-                      description
-                        "../Format = TwoByteAS or ../Format =
-                         FourbyteAS";
-                    }
-                    key "as as-index";
-                    description
-                      "two byte as or four byte as";
-                    leaf as {
-                      type Rdas-range;
-                      description
-                        "Two byte or 4 byte AS number";
-                    }
-                    leaf as-index {
-                      type Rdas-index;
-                      description
-                        "AS:nn (hex or decimal format)";
-                    }
-                  }
-                  list ipv4-address {
-                    when "../format = 'ipv4-address'" {
-                      description
-                        "../Format = IPV4Address";
-                    }
-                    key "address addr-index";
-                    description
-                      "ipv4 address";
-                    leaf address {
-                      type inet:ipv4-address-no-zone;
-                      description
-                        "IPV4 address";
-                    }
-                    leaf addr-index {
-                      type Rd-addr-index;
-                      description
-                        "Addr index";
-                    }
-                  }
-                }
-              }
-              leaf table-policy {
-                type string;
-                description
-                  "Table Policy for installation of forwarding
-                   data to L2FIB";
-              }
-              leaf ad-control-word {
-                type empty;
-                description
-                  "Enable control-word for this VFI";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable Autodiscovery BGP";
-              }
-            }
-            leaf vfi-shutdown {
-              type empty;
-              description
-                "Enabling Shutdown";
-            }
-            leaf vpnid {
-              type Vpnid-range;
-              description
-                "VPN Identifier";
-            }
-            leaf name {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Name of the Virtual Forwarding Interface";
-            }
-          }
-        }
-        container bridge-domainvnis {
-          description
-            "Bridge Domain EVPN VxLAN Network Identifier
-             Table";
-          list bridge-domainvni {
-            key "vpn-id";
-            description
-              "Bridge Domain VxLAN EVPN";
-            leaf vpn-id {
-              type uint32 {
-                range "1..16777215";
-              }
-              description
-                "VxLAN Ethernet VPN-ID";
-            }
-          }
-        }
-        container bd-attachment-circuits {
-          description
-            "Attachment Circuit table";
-          list bd-attachment-circuit {
-            key "name";
-            description
-              "Name of the Attachment Circuit";
-            container interface-ip-source-guard {
-              description
-                "IP Source Guard";
-              leaf logging {
-                type L2vpn-logging;
-                description
-                  "Logging Type";
-              }
-              leaf disable {
-                type empty;
-                description
-                  "Disable L2 Interface Dynamic IP source
-                   guard";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable IP Source Guard";
-              }
-            }
-            container interface-dai {
-              description
-                "L2 Interface Dynamic ARP Inspection";
-              container interface-dai-address-validation {
-                description
-                  "Address Validation";
-                leaf ipv4-verification {
-                  type L2vpn-verification;
-                  description
-                    "IPv4 Verification";
-                }
-                leaf destination-mac-verification {
-                  type L2vpn-verification;
-                  description
-                    "Destination MAC Verification";
-                }
-                leaf source-mac-verification {
-                  type L2vpn-verification;
-                  description
-                    "Source MAC Verification";
-                }
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable Address Validation";
-                }
-              }
-              leaf logging {
-                type L2vpn-logging;
-                description
-                  "Logging Type";
-              }
-              leaf disable {
-                type empty;
-                description
-                  "Disable L2 Interface Dynamic ARP Inspection";
-              }
-              leaf enable {
-                type empty;
-                description
-                  "Enable L2 Interface Dynamic ARP Inspection";
-              }
-            }
-            container interface-profile {
-              description
-                "Attach a DHCP profile";
-              leaf profile-id {
-                type Interface-profile;
-                description
-                  "Set the snooping profile";
-              }
-              leaf dhcp-snooping-id {
-                type string;
-                description
-                  "Disable DHCP snooping";
-              }
-            }
-            container bdac-storm-control-types {
-              description
-                "Storm Control";
-              list bdac-storm-control-type {
-                must "storm-control-unit";
-                key "sctype";
-                description
-                  "Storm Control Type";
-                leaf sctype {
-                  type Storm-control;
-                  description
-                    "Storm Control Type";
-                }
-                uses STORM-CONTROL-UNIT;
-              }
-            }
-            container split-horizon {
-              description
-                "Split Horizon";
-              container split-horizon-group-id {
-                description
-                  "Split Horizon Group ID";
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable split horizon group";
-                }
-              }
-            }
-            container static-mac-addresses {
-              description
-                "Static Mac Address Table";
-              list static-mac-address {
-                key "address";
-                description
-                  "Static Mac Address Configuration";
-                leaf address {
-                  type yang:mac-address;
-                  description
-                    "Static MAC address";
-                }
-              }
-            }
-            container interface-mac {
-              description
-                "MAC configuration commands";
-              container interface-mac-aging {
-                description
-                  "MAC-Aging configuration commands";
-                leaf interface-mac-aging-time {
-                  type Mac-aging-range;
-                  description
-                    "Mac Aging Time";
-                }
-                leaf interface-mac-aging-type {
-                  type Mac-aging;
-                  description
-                    "MAC address aging type";
-                }
-              }
-              container interface-mac-secure {
-                description
-                  "MAC Secure";
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable MAC Secure";
-                }
-                uses LOGGING;
-                uses DISABLE;
-                uses ACTION;
-                uses SHUTDOWN-RECOVERY-TIMER;
-              }
-              container interface-mac-limit {
-                description
-                  "MAC-Limit configuration commands";
-                leaf interface-mac-limit-max {
-                  type Mac-limit-range;
-                  description
-                    "Number of MAC addresses on an Interface
-                     after which MAC limit action is taken";
-                }
-                leaf interface-mac-limit-notif {
-                  type Mac-notification;
-                  description
-                    "MAC address limit notification action in a
-                     Interface";
-                }
-                leaf interface-mac-limit-action {
-                  type Mac-limit-action;
-                  description
-                    "Interface MAC address limit enforcement
-                     action";
-                }
-              }
-              leaf interface-mac-port-down-flush {
-                type Port-down-flush;
-                description
-                  "Enable/Disable MAC Flush When Port goes
-                   down";
-              }
-              leaf interface-mac-learning {
-                type Mac-learn;
-                description
-                  "Enable Mac Learning";
-              }
-            }
-            leaf interface-flooding {
-              type Interface-traffic-flood;
-              description
-                "Enable or Disable Flooding";
-            }
-            leaf interface-igmp-snoop {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Attach a IGMP Snooping profile";
-            }
-            leaf interface-flooding-unknown-unicast {
-              type Interface-traffic-flood;
-              description
-                "Enable or Disable Unknown Unicast Flooding";
-            }
-            leaf interface-mld-snoop {
-              type xr:Cisco-ios-xr-string {
-                length "1..32";
-              }
-              description
-                "Attach a MLD Snooping profile";
-            }
-            leaf name {
-              type xr:Interface-name;
-              description
-                "The name of the Attachment Circuit";
-            }
-          }
-        }
-        container bd-pseudowire-evpns {
-          description
-            "List of EVPN pseudowires";
-          list bd-pseudowire-evpn {
-            key "eviid acid";
-            description
-              "EVPN Pseudowire configuration";
-            leaf eviid {
-              type Evpnvpnid-range;
-              description
-                "Ethernet VPN ID";
-            }
-            leaf acid {
-              type Pseudowire-acid-range;
-              description
-                "AC ID";
-            }
-          }
-        }
-        container ip-source-guard {
-          description
-            "IP Source Guard";
-          leaf logging {
-            type empty;
-            description
-              "Enable Logging";
-          }
-          leaf enable {
-            type empty;
-            description
-              "Enable IP Source Guard";
-          }
-        }
-        container dai {
-          description
-            "Dynamic ARP Inspection";
-          container dai-address-validation {
-            description
-              "Address Validation";
-            leaf ipv4-verification {
-              type empty;
-              description
-                "Enable IPv4 Verification";
-            }
-            leaf destination-mac-verification {
-              type empty;
-              description
-                "Enable Destination MAC Verification";
-            }
-            leaf source-mac-verification {
-              type empty;
-              description
-                "Enable Source MAC Verification";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Address Validation";
-            }
-          }
-          leaf logging {
-            type empty;
-            description
-              "Enable Logging";
-          }
-          leaf enable {
-            type empty;
-            description
-              "Enable Dynamic ARP Inspection";
-          }
-        }
-        container routed-interfaces {
-          description
-            "Bridge Domain Routed Interface Table";
-          list routed-interface {
-            key "interface-name";
-            description
-              "Bridge Domain Routed Interface";
-            container routed-interface-split-horizon-group {
-              description
-                "Routed interface split horizon group";
-              leaf routed-interface-split-horizon-group-core {
-                type empty;
-                description
-                  "Configure BVI under SHG 1";
-              }
-            }
-            leaf interface-name {
-              type xr:Interface-name;
-              description
-                "The name of the Routed Interface";
-            }
-          }
-        }
-        leaf coupled-mode {
-          type empty;
-          description
-            "Coupled-mode configuration";
-        }
-        leaf shutdown {
-          type empty;
-          description
-            "shutdown the Bridge Domain";
-        }
-        leaf flooding-unknown-unicast {
-          type empty;
-          description
-            "Disable Unknown Unicast flooding";
-        }
-        leaf efp-visibility {
-          type empty;
-          description
-            "Enable multicast for multiple VLANs in the
-             bridge of a BVI";
-        }
-        leaf l2-multicast-source {
-          type L2mc-src-traffic-enabled;
-          description
-            "L2MC Source Traffic Enabled";
-        }
-        leaf igmp-snooping-disable {
-          type empty;
-          description
-            "Disable IGMP Snooping";
-        }
-        leaf transport-mode {
-          type Bridge-domain-transport-mode;
-          description
-            "Bridge Domain Transport mode";
-        }
-        leaf mld-snooping {
-          type xr:Cisco-ios-xr-string {
-            length "1..32";
-          }
-          description
-            "Attach MLD Snooping Profile Name";
-        }
-        leaf bridge-domain-mtu {
-          type Bridge-bd-mtu-range;
-          units "byte";
-          description
-            "Maximum transmission unit for this Bridge
-             Domain";
-        }
-        leaf dhcp {
-          type string {
-            length "1..32";
-          }
-          description
-            "DHCPv4 Snooping profile name";
-        }
-        leaf bridge-description {
-          type string {
-            length "1..64";
-          }
-          description
-            "Bridge-domain description Name";
-        }
-        leaf igmp-snooping {
-          type xr:Cisco-ios-xr-string {
-            length "1..32";
-          }
-          description
-            "Attach IGMP Snooping Profile Name";
-        }
-        leaf flooding {
-          type empty;
-          description
-            "Disable flooding";
-        }
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..27";
-          }
-          description
-            "Name of the bridge domain";
-        }
-      }
-    }
-  }
-
-  grouping EVI-REORIG-DISABLE {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evi-reorig-disable {
-      type empty;
-      description
-        "Disable route re-origination";
-    }
-  }
-
-  grouping EVI-STATIC-FLOW-LABEL {
-    description
-      "Common node of evi-load-balancing,
-       evpn-instance-load-balancing";
-    leaf evi-static-flow-label {
-      type empty;
-      description
-        "Enable Static Flow Label based load balancing";
-    }
-  }
-
-  grouping SHUTDOWN-RECOVERY-TIMER {
-    description
-      "Common node of mac-secure, interface-mac-secure,
-       pseudowire-mac-secure";
-    leaf shutdown-recovery-timer {
-      type Mac-secure-shutdown-recovery-time-range;
-      description
-        "MAC Secure Shutdown Recovery Timer";
-    }
-  }
-
-  grouping EVI-ADVERTISE-MAC-BVI {
-    description
-      "Common node of evi-advertise-mac,
-       evpn-instance-advertise-mac";
-    leaf evi-advertise-mac-bvi {
-      type empty;
-      description
-        "Advertise local MAC-only and BVI MAC routes";
-    }
-  }
-
-  grouping DISABLE {
-    description
-      "Common node of pbb-edge-mac-secure,
-       interface-mac-secure, pseudowire-mac-secure";
-    leaf disable {
-      type empty;
-      description
-        "Disable MAC Secure";
-    }
-  }
-
-  grouping EVPN-EVI-DESCRIPTION {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evpn-evi-description {
-      type string {
-        length "1..64";
-      }
-      description
-        "EVPN Instance description";
-    }
-  }
-
-  grouping EVI-UNKNOWN-UNICAST-FLOODING-DISABLE {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evi-unknown-unicast-flooding-disable {
-      type empty;
-      description
-        "Disable Unknown Unicast Flooding on this EVI";
-    }
-  }
-
-  grouping EVPN-EVI-CW-DISABLE {
-    description
-      "Common node of evpn-evi, evpn-instance";
-    leaf evpn-evi-cw-disable {
-      type empty;
-      description
-        "CW disable for EVPN EVI";
-    }
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container pseudowire-ether {
-      description
-        "PW-Ether attributes";
-      leaf generic-interface-list {
-        type xr:Cisco-ios-xr-string {
-          length "1..32";
-        }
-        description
-          "Name of the interface list";
-      }
-      leaf l2-overhead {
-        type uint32 {
-          range "1..64";
-        }
-        description
-          "PW Ether L2 overhead requirement";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container pseudowire-iw {
-      description
-        "PW-IW attributes";
-      leaf l2-overhead {
-        type uint32 {
-          range "1..64";
-        }
-        units "byte";
-        description
-          "L2 overhead size in bytes";
-      }
-      leaf generic-interface-list {
-        type xr:Cisco-ios-xr-string {
-          length "1..32";
-        }
-        description
-          "Name of the interface list";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container bvi {
-      description
-        "BVI attributes";
-      leaf host-routing {
-        type empty;
-        description
-          "Enable host-routing on this BVI";
-      }
-    }
-  }
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container l2-transport {
-      description
-        "Interface Layer 2 Transport service
-         configuration data";
-      leaf enabled {
-        type empty;
-        description
-          "This object is only valid on physical
-           interfaces and it controls whether that
-           interface is a port mode Layer 2 attachment
-           circuit (note that for subinterfaces, the Layer
-           2 property is specified when the subinterface
-           is created).The object must be set before any
-           other L2Transport configuration is supplied for
-           the interface, and must be the last
-           per-interface configuration object to be
-           removed.";
-      }
-    }
-  }
-  augment "/a2:snmp/a2:notification" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-snmp-agent-cfg'";
-    container vpls {
-      description
-        "CISCO-IETF-VPLS-GENERIC-MIB notification
-         configuration";
-      leaf full-clear {
-        type empty;
-        description
-          "Enable cvplsFwdFullAlarmCleared notification";
-      }
-      leaf status {
-        type empty;
-        description
-          "Enable cvplsStatusChanged notification";
-      }
-      leaf enable {
-        type empty;
-        description
-          "Enable CISCO-IETF-VPLS-GENERIC-MIB
-           notifications";
-      }
-      leaf full-raise {
-        type empty;
-        description
-          "Enable cvplsFwdFullAlarmRaised notification";
-      }
-    }
-  }
-  augment "/a2:snmp/a2:notification" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-snmp-agent-cfg'";
-    container l2vpn {
-      description
-        "CISCO-IETF-PW-MIB notification configuration";
-      leaf cisco {
-        type empty;
-        description
-          "Enable Cisco format including extra varbinds";
-      }
-      leaf enable {
-        type empty;
-        description
-          "Enable CISCO-IETF-PW-MIB notifications";
-      }
-      leaf vc-down {
-        type empty;
-        description
-          "Enable cpwVcDown notification";
-      }
-      leaf vc-up {
-        type empty;
-        description
-          "Enable cpwVcUp notification";
-      }
-    }
-  }
-  container l2vpn {
-    description
-      "L2VPN configuration";
-    container pw-routing {
-      description
-        "Pseudowire-routing attributes";
-      container pw-routing-bgp {
-        description
-          "Enable Autodiscovery BGP Pseudowire-routing BGP";
-        leaf enable {
-          type empty;
-          description
-            "Enable Autodiscovery BGP";
-        }
-        uses EVPN-ROUTE-DISTINGUISHER;
-      }
-      leaf pw-routing-global-id {
-        type Pseudowire-gbl-id-range;
-        description
-          "Pseudowire-routing Global ID";
-      }
-    }
-    container neighbor {
-      description
-        "L2VPN neighbor submode";
-      leaf ldp-flap {
-        type empty;
-        description
-          "Enable targetted LDP session flap action";
-      }
-    }
-    container database {
-      description
-        "L2VPN databases";
-      container g8032-rings {
-        description
-          "List of G8032 Ring";
-        list g8032-ring {
-          key "g8032-ring-name";
-          description
-            "G8032 Ring";
-          container erp-port0s {
-            description
-              "Ethernet ring protection port0";
-            list erp-port0 {
-              key "interface-name";
-              description
-                "Configure ERP main port0";
-              leaf monitor {
-                type xr:Interface-name;
-                description
-                  "Ethernet ring protection port0 monitor";
-              }
-              leaf interface-name {
-                type xr:Interface-name;
-                description
-                  "Port0 interface";
-              }
-            }
-          }
-          container erp-instances {
-            description
-              "List of ethernet ring protection instance";
-            list erp-instance {
-              key "erp-instance-id";
-              description
-                "Ethernet ring protection instance";
-              container rpl {
-                description
-                  "Ring protection link";
-                leaf port {
-                  type Erp-port1;
-                  description
-                    "ERP main port number";
-                }
-                leaf role {
-                  type Rpl-role;
-                  description
-                    "RPL role";
-                }
-              }
-              container aps {
-                description
-                  "Automatic protection switching";
-                container port1 {
-                  description
-                    "APS channel for ERP port1";
-                  leaf aps-type {
-                    type Erpaps;
-                    description
-                      "Port1 APS type";
-                  }
-                  leaf aps-channel {
-                    type string;
-                    description
-                      "Port1 APS channel in the format of
-                       InterfaceName, BDName or XconnectName";
-                  }
-                }
-                leaf port0 {
-                  type string;
-                  description
-                    "Port0 APS channel in the format of
-                     InterfaceName";
-                }
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable automatic protection switching";
-                }
-                leaf level {
-                  type Erpaps-level-range;
-                  description
-                    "Automatic protection switching level";
-                }
-              }
-              leaf description {
-                type string {
-                  length "1..32";
-                }
-                description
-                  "Ethernet ring protection instance
-                   description";
-              }
-              leaf inclusion-list {
-                type string;
-                description
-                  "Associates a set of VLAN IDs with the G
-                   .8032 instance";
-              }
-              leaf profile {
-                type string {
-                  length "1..32";
-                }
-                description
-                  "Ethernet ring protection instance profile";
-              }
-              leaf erp-instance-id {
-                type Erp-instance-range;
-                description
-                  "ERP instance number";
-              }
-            }
-          }
-          container erp-port1s {
-            description
-              "Ethernet ring protection port0";
-            list erp-port1 {
-              must "none-or-virtual or interface" {
-                description
-                  "None-or-Virtual or Interface must be
-                   present.";
-              }
-              key "erp-port-type";
-              description
-                "Ethernet ring protection port1";
-
-              grouping ERP-PORT1-CONTENT {
-                description
-                  "ERP PORT1 CONTENT";
-                leaf monitor {
-                  type xr:Interface-name;
-                  description
-                    "Ethernet ring protection port1 monitor";
-                }
-              }
-              container none-or-virtual {
-                when "../erp-port-type = 'none' or ../erp-port-type = 'virtual'" {
-                  description
-                    "../ERPPortType = None or ../ERPPortType =
-                     Virtual";
-                }
-                presence "Indicates that this node is configured.";
-                description
-                  "none or virtual";
-                uses ERP-PORT1-CONTENT;
-              }
-              leaf erp-port-type {
-                type Erp-port;
-                description
-                  "Port1 type";
-              }
-              list interface {
-                when "../erp-port-type = 'interface'" {
-                  description
-                    "../ERPPortType = Interface";
-                }
-                key "interface-name";
-                description
-                  "interface";
-                leaf interface-name {
-                  type xr:Interface-name;
-                  description
-                    "Port1 interface";
-                }
-                uses ERP-PORT1-CONTENT;
-              }
-            }
-          }
-          leaf open-ring {
-            type empty;
-            description
-              "Specify the G.8032 instance as open ring";
-          }
-          leaf exclusion-list {
-            type string;
-            description
-              "Vlan IDs in the format of a-b,c,d,e-f,g
-               ,untagged";
-          }
-          leaf erp-provider-bridge {
-            type empty;
-            description
-              "Ethernet ring protection provider bridge";
-          }
-          leaf g8032-ring-name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the G8032 ring";
-          }
-        }
-      }
-      container xconnect-groups {
-        description
-          "List of xconnect groups";
-        list xconnect-group {
-          key "name";
-          description
-            "Xconnect group";
-          container p2p-xconnects {
-            description
-              "List of point to point xconnects";
-            list p2p-xconnect {
-              key "name";
-              description
-                "Point to point xconnect";
-              container backup-attachment-circuits {
-                description
-                  "List of backup attachment circuits";
-                list backup-attachment-circuit {
-                  key "interface-name";
-                  description
-                    "Backup attachment circuit";
-                  leaf interface-name {
-                    type xr:Interface-name;
-                    description
-                      "Name of the attachment circuit interface";
-                  }
-                }
-              }
-              container pseudowire-evpns {
-                description
-                  "List of EVPN Services";
-                list pseudowire-evpn {
-                  key "eviid remote-acid source-acid";
-                  description
-                    "EVPN P2P Service Configuration";
-                  leaf class {
-                    type xr:Cisco-ios-xr-string {
-                      length "1..32";
-                    }
-                    description
-                      "Name of the pseudowire class";
-                  }
-                  leaf eviid {
-                    type Evpnvpnid-range;
-                    description
-                      "Ethernet VPN ID";
-                  }
-                  leaf remote-acid {
-                    type Pseudowire-evpnacid-range;
-                    description
-                      "Remote AC ID";
-                  }
-                  leaf source-acid {
-                    type Pseudowire-evpnacid-range;
-                    description
-                      "Source AC ID";
-                  }
-                }
-              }
-              container pseudowires {
-                description
-                  "List of pseudowires";
-                list pseudowire {
-                  must "pseudowire-address or neighbor" {
-                    description
-                      "pseudowire-address or neighbor must be
-                       present.";
-                  }
-                  key "pseudowire-id";
-                  description
-                    "Pseudowire configuration";
-
-                  grouping PSEUDOWIRE-CONTENT {
-                    description
-                      "Content grouping.";
-                    container mpls-static-labels {
-                      description
-                        "MPLS static labels";
-                      leaf local-static-label {
-                        type Pseudowire-label-range;
-                        description
-                          "Pseudowire local static label";
-                      }
-                      leaf remote-static-label {
-                        type Pseudowire-label-range;
-                        description
-                          "Pseudowire remote static label";
-                      }
-                    }
-                    container backup-pseudowires {
-                      description
-                        "List of pseudowires";
-                      list backup-pseudowire {
-                        key "neighbor pseudowire-id";
-                        description
-                          "Backup pseudowire for the cross connect";
-                        container backup-mpls-static-labels {
-                          description
-                            "MPLS static labels";
-                          leaf local-static-label {
-                            type Pseudowire-label-range;
-                            description
-                              "Pseudowire local static label";
-                          }
-                          leaf remote-static-label {
-                            type Pseudowire-label-range;
-                            description
-                              "Pseudowire remote static label";
-                          }
-                        }
-                        leaf backup-pw-class {
-                          type xr:Cisco-ios-xr-string {
-                            length "1..32";
-                          }
-                          description
-                            "PW class template name to use for the
-                             backup PW";
-                        }
-                        leaf neighbor {
-                          type inet:ipv4-address-no-zone;
-                          description
-                            "Neighbor IP address";
-                        }
-                        leaf pseudowire-id {
-                          type Pseudowire-id-range;
-                          description
-                            "Pseudowire ID";
-                        }
-                      }
-                    }
-                    container l2tp-static-attributes {
-                      description
-                        "L2TP Static Attributes";
-                      container l2tp-remote-cookie {
-                        description
-                          "L2TP remote cookie";
-                        leaf size {
-                          type L2tp-cookie-size;
-                          description
-                            "Remote cookie size";
-                        }
-                        leaf lower-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Lower remote cookie value";
-                        }
-                        leaf higher-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Higher remote cookie value";
-                        }
-                      }
-                      container l2tp-secondary-local-cookie {
-                        description
-                          "L2TP secondary local cookie";
-                        leaf size {
-                          type L2tp-cookie-size;
-                          description
-                            "Local cookie size";
-                        }
-                        leaf lower-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Lower local cookie value";
-                        }
-                        leaf higher-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Higher local cookie value";
-                        }
-                      }
-                      container l2tp-local-cookie {
-                        description
-                          "L2TP local cookie";
-                        leaf size {
-                          type L2tp-cookie-size;
-                          description
-                            "Local cookie size";
-                        }
-                        leaf lower-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Lower local cookie value";
-                        }
-                        leaf higher-value {
-                          type L2tp-cookie-value-range;
-                          description
-                            "Higher local cookie value";
-                        }
-                      }
-                      leaf l2tp-remote-session-id {
-                        type L2tp-session-id-range;
-                        description
-                          "L2TP remote session ID";
-                      }
-                      leaf l2tp-local-session-id {
-                        type L2tp-session-id-range;
-                        description
-                          "L2TP local session ID";
-                      }
-                    }
-                    container l2tp-static {
-                      description
-                        "Pseudowire L2TPv3 static configuration";
-                      leaf enable {
-                        type empty;
-                        description
-                          "Enable pseudowire L2TPv3 static
-                           configuration";
-                      }
-                    }
-                    leaf tag-impose {
-                      type Pseudowire-tag-range;
-                      description
-                        "Tag Impose vlan tagged mode";
-                    }
-                    leaf class {
-                      type xr:Cisco-ios-xr-string {
-                        length "1..32";
-                      }
-                      description
-                        "Name of the pseudowire class";
-                    }
-                    leaf source-address {
-                      type inet:ip-address-no-zone;
-                      description
-                        "Value of the Pseudowire source address.
-                         Must be IPv6 only.";
-                    }
-                    leaf bandwidth {
-                      type uint32 {
-                        range "0..4294967295";
-                      }
-                      description
-                        "Pseudowire Bandwidth";
-                    }
-                  }
-                  leaf pseudowire-id {
-                    type Pseudowire-id-range;
-                    description
-                      "Pseudowire ID";
-                  }
-                  list neighbor {
-                    key "neighbor";
-                    description
-                      "keys: neighbor";
-                    leaf neighbor {
-                      type inet:ipv4-address-no-zone;
-                      description
-                        "Pseudowire IPv4 address";
-                    }
-                    uses PSEUDOWIRE-CONTENT;
-                  }
-                  list pseudowire-address {
-                    key "pseudowire-address";
-                    description
-                      "keys: pseudowire-address";
-                    leaf pseudowire-address {
-                      type inet:ipv6-address-no-zone;
-                      description
-                        "Pseudowire IPv6 address. A pseudowire
-                         can have only one address: IPv4 or IPv6";
-                    }
-                    uses PSEUDOWIRE-CONTENT;
-                  }
-                }
-              }
-              container monitor-sessions {
-                description
-                  "List of Monitor session segments";
-                list monitor-session {
-                  key "name";
-                  description
-                    "Monitor session segment";
-                  leaf enable {
-                    type empty;
-                    description
-                      "Enable monitor session segment ";
-                  }
-                  leaf name {
-                    type xr:Cisco-ios-xr-string {
-                      length "1..64";
-                    }
-                    description
-                      "Name of the monitor session";
-                  }
-                }
-              }
-              container pseudowire-routeds {
-                description
-                  "List of pseudowire-routed";
-                list pseudowire-routed {
-                  key "global-id prefix acid sacid";
-                  description
-                    "Pseudowire configuration";
-                  leaf tag-impose {
-                    type Pseudowire-tag-range;
-                    description
-                      "Tag Impose vlan tagged mode";
-                  }
-                  leaf class {
-                    type xr:Cisco-ios-xr-string {
-                      length "1..32";
-                    }
-                    description
-                      "Name of the pseudowire class";
-                  }
-                  leaf global-id {
-                    type Pseudowire-gbl-id-range;
-                    description
-                      "Target Global ID";
-                  }
-                  leaf prefix {
-                    type inet:ipv4-address-no-zone;
-                    description
-                      "Target Prefix";
-                  }
-                  leaf acid {
-                    type Pseudowire-acid-range;
-                    description
-                      "Target AC ID";
-                  }
-                  leaf sacid {
-                    type Pseudowire-acid-range;
-                    description
-                      "Source AC ID";
-                  }
-                }
-              }
-              container pseudowire-evpn-services {
-                description
-                  "List of EVPN Services keyed by EVI and
-                   Service ID";
-                list pseudowire-evpn-service {
-                  key "eviid service-id";
-                  description
-                    "EVPN P2P Service Configuration";
-                  leaf class {
-                    type xr:Cisco-ios-xr-string {
-                      length "1..32";
-                    }
-                    description
-                      "Name of the pseudowire class";
-                  }
-                  leaf eviid {
-                    type Evpnvpnid-range;
-                    description
-                      "Ethernet VPN ID";
-                  }
-                  leaf service-id {
-                    type Pseudowire-evpnacid-range;
-                    description
-                      "Service ID (Remote and Source AC ID)";
-                  }
-                }
-              }
-              container attachment-circuits {
-                description
-                  "List of attachment circuits";
-                list attachment-circuit {
-                  key "name";
-                  description
-                    "Attachment circuit interface";
-                  leaf enable {
-                    type empty;
-                    description
-                      "Enable attachment circuit interface";
-                  }
-                  leaf name {
-                    type xr:Interface-name;
-                    description
-                      "Name of the attachment circuit interface";
-                  }
-                }
-              }
-              leaf p2p-description {
-                type string {
-                  length "1..64";
-                }
-                description
-                  "cross connect description Name";
-              }
-              leaf interworking {
-                type Interworking;
-                description
-                  "Interworking";
-              }
-              leaf name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..38";
-                }
-                description
-                  "Name of the point to point xconnect";
-              }
-            }
-          }
-          container mp2mp-xconnects {
-            description
-              "List of multi point to multi point xconnects";
-            list mp2mp-xconnect {
-              key "name";
-              description
-                "Multi point to multi point xconnect";
-              container mp2mp-auto-discovery {
-                description
-                  "auto-discovery in this MP2MP";
-                container route-distinguisher {
-                  description
-                    "Route Distinguisher";
-                  leaf type {
-                    type Bgp-route-distinguisher;
-                    description
-                      "Router distinguisher type";
-                  }
-                  leaf as {
-                    when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-                      description
-                        "../Type = TwoByteAS or ../Type =
-                         FourByteAS";
-                    }
-                    type Rdas-range;
-                    description
-                      "Two byte or 4 byte AS number";
-                  }
-                  leaf as-index {
-                    when "../type = 'two-byte-as' or ../type = 'four-byte-as'" {
-                      description
-                        "../Type = TwoByteAS or ../Type =
-                         FourByteAS";
-                    }
-                    type Rdas-index;
-                    description
-                      "AS:nn (hex or decimal format)";
-                  }
-                  leaf address {
-                    when "../type = 'ipv4-address'" {
-                      description
-                        "../Type = IPV4Address";
-                    }
-                    type inet:ipv4-address-no-zone;
-                    description
-                      "IPV4 address";
-                  }
-                  leaf addr-index {
-                    when "../type = 'ipv4-address'" {
-                      description
-                        "../Type = IPV4Address";
-                    }
-                    type Rd-addr-index;
-                    description
-                      "Addr index";
-                  }
-                }
-                container mp2mp-route-policy {
-                  description
-                    "Route policy";
-                  leaf export {
-                    type string;
-                    description
-                      "Export route policy";
-                  }
-                }
-                container mp2mp-route-targets {
-                  description
-                    "Route Target";
-                  list mp2mp-route-target {
-                    must "two-byte-as-or-four-byte-as or ipv4-address" {
-                      description
-                        "TwoByteAS-or-FourbyteAS or IPV4Address
-                         must be present.";
-                    }
-                    key "role format";
-                    description
-                      "Name of the Route Target";
-                    leaf role {
-                      type Bgp-route-target-role;
-                      description
-                        "Role of the router target type";
-                    }
-                    leaf format {
-                      type Bgp-route-target-format;
-                      description
-                        "Format of the route target";
-                    }
-                    list two-byte-as-or-four-byte-as {
-                      when "../format = 'two-byte-as' or ../format = 'four-byte-as'" {
-                        description
-                          "../Format = TwoByteAS or ../Format =
-                           FourbyteAS";
-                      }
-                      key "as as-index";
-                      description
-                        "two byte as or four byte as";
-                      leaf as {
-                        type Rdas-range;
-                        description
-                          "Two byte or 4 byte AS number";
-                      }
-                      leaf as-index {
-                        type Rdas-index;
-                        description
-                          "AS:nn (hex or decimal format)";
-                      }
-                    }
-                    list ipv4-address {
-                      when "../format = 'ipv4-address'" {
-                        description
-                          "../Format = IPV4Address";
-                      }
-                      key "address addr-index";
-                      description
-                        "ipv4 address";
-                      leaf address {
-                        type inet:ipv4-address-no-zone;
-                        description
-                          "IPV4 address";
-                      }
-                      leaf addr-index {
-                        type Rd-addr-index;
-                        description
-                          "Addr index";
-                      }
-                    }
-                  }
-                }
-                container mp2mp-signaling-protocol {
-                  description
-                    "signaling protocol in this MP2MP";
-                  container flow-label-load-balance {
-                    description
-                      "Enable Flow Label based load balancing";
-                    leaf flow-label {
-                      type Flow-label-load-balance;
-                      description
-                        "Flow Label load balance type";
-                    }
-                    leaf static {
-                      type empty;
-                      description
-                        "Static Flow Label";
-                    }
-                  }
-                  container ceids {
-                    description
-                      "Local Customer Edge Identifier Table";
-                    list ceid {
-                      key "ce-id";
-                      description
-                        "Local Customer Edge Identifier ";
-                      container remote-ceid-attachment-circuits {
-                        description
-                          "AC And Remote Customer Edge Identifier
-                           Table";
-                        list remote-ceid-attachment-circuit {
-                          key "name remote-ce-id";
-                          description
-                            "AC And Remote Customer Edge Identifier";
-                          leaf name {
-                            type xr:Interface-name;
-                            description
-                              "The name of the Attachment Circuit";
-                          }
-                          leaf remote-ce-id {
-                            type Ce-id-range;
-                            description
-                              "Remote Customer Edge Identifier";
-                          }
-                        }
-                      }
-                      leaf ce-id {
-                        type Ce-id-range;
-                        description
-                          "Local Customer Edge Identifier";
-                      }
-                    }
-                  }
-                  leaf ce-range {
-                    type Cedge-range;
-                    description
-                      "Local Customer Edge Identifier";
-                  }
-                  leaf enable {
-                    type empty;
-                    description
-                      "Enable signaling protocol";
-                  }
-                }
-                leaf enable {
-                  type empty;
-                  description
-                    "Enable auto-discovery";
-                }
-              }
-              leaf mp2mpmtu {
-                type L2vpn-mtu-range;
-                units "byte";
-                description
-                  "Maximum transmission unit for this MP2MP
-                   VPWS instance";
-              }
-              leaf mp2mp-control-word {
-                type empty;
-                description
-                  "Disable control word";
-              }
-              leaf mp2mpl2-encapsulation {
-                type L2-encapsulation;
-                description
-                  "Configure Layer 2 Encapsulation";
-              }
-              leaf mp2mp-interworking {
-                type Interworking;
-                description
-                  "Interworking";
-              }
-              leaf mp2mp-shutdown {
-                type empty;
-                description
-                  "shutdown this MP2MP VPWS instance";
-              }
-              leaf mp2mpvpn-id {
-                type Vpnid-range;
-                description
-                  "VPN Identifier";
-              }
-              leaf name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..26";
-                }
-                description
-                  "Name of the multi point to multi point
-                   xconnect";
-              }
-            }
-          }
-          leaf name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the xconnect group";
-          }
-        }
-      }
-      container bridge-domain-groups {
-        description
-          "List of bridge groups";
-        list bridge-domain-group {
-          key "name";
-          description
-            "Bridge group";
-          leaf name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the Bridge group";
-          }
-          uses BRIDGE-DOMAIN-TABLE;
-        }
-      }
-      container pseudowire-classes {
-        description
-          "List of pseudowire classes";
-        list pseudowire-class {
-          key "name";
-          description
-            "Pseudowire class";
-          container l2tpv3-encapsulation {
-            description
-              "L2TPv3 encapsulation";
-            container sequencing {
-              description
-                "Sequencing";
-              leaf sequencing {
-                type L2tpv3-sequencing;
-                default "off";
-                description
-                  "Sequencing";
-              }
-              leaf resync-threshold {
-                type Resync-threshold-range;
-                default "5";
-                description
-                  "Out of sequence threshold";
-              }
-            }
-            container type-of-service {
-              description
-                "Type of service";
-              leaf type-of-service-value {
-                type Type-of-service-range;
-                description
-                  "Type of service value";
-              }
-              leaf type-of-service-mode {
-                type Type-of-service-mode;
-                description
-                  "Type of service mode";
-              }
-            }
-            container signaling-protocol {
-              description
-                "L2TPv3 signaling protocol";
-              leaf protocol {
-                type L2tp-signaling-protocol;
-                default "l2tpv3";
-                description
-                  "L2TPv3 signaling protocol";
-              }
-              leaf l2tpv3-class-name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..32";
-                }
-                description
-                  "Name of the L2TPv3 class name";
-              }
-            }
-            container path-mtu {
-              description
-                "Path maximum transmission unit";
-              leaf enable {
-                type empty;
-                description
-                  "Enable path MTU";
-              }
-              leaf max-path-mtu {
-                type Max-path-mtu-range;
-                description
-                  "Maximum path maximum transmission unit";
-              }
-            }
-            leaf df-bit-set {
-              type empty;
-              description
-                "Set the do not fragment bit to 1";
-            }
-            leaf cookie-size {
-              type L2tp-cookie-size;
-              default "zero";
-              description
-                "Cookie size";
-            }
-            leaf source-address {
-              type inet:ipv4-address-no-zone;
-              description
-                "Source IP address";
-            }
-            leaf transport-mode {
-              type Transport-mode;
-              description
-                "Transport mode";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable L2TPv3 encapsulation";
-            }
-            leaf time-to-live {
-              type Time-to-live-range;
-              description
-                "Time to live";
-            }
-          }
-          container backup-disable-delay {
-            description
-              "Back Up Pseudowire class";
-            leaf type {
-              type Backup-disable;
-              description
-                "Delay or Never";
-            }
-            leaf disable-backup {
-              when "../type = 'delay'" {
-                description
-                  "../Type = Delay";
-              }
-              type Backup-disable-delay-range;
-              description
-                "Disable backup delay";
-            }
-          }
-          container mpls-encapsulation {
-            description
-              "MPLS encapsulation";
-            container sequencing {
-              description
-                "Sequencing";
-              leaf sequencing {
-                type Mpls-sequencing;
-                default "off";
-                description
-                  "Sequencing";
-              }
-              leaf resync-threshold {
-                type Resync-threshold-range;
-                default "5";
-                description
-                  "Out of sequence threshold";
-              }
-            }
-            container mpls-redundancy {
-              description
-                "Redundancy options for MPLS encapsulation";
-              leaf redundancy-one-way {
-                type empty;
-                description
-                  "Force one-way PW redundancy behavior in
-                   Redundancy Group";
-              }
-              leaf redundancy-initial-delay {
-                type Pw-redundancy-initial-delay-range;
-                units "second";
-                description
-                  "Initial delay before activating the
-                   redundant PW, in seconds";
-              }
-            }
-            container preferred-path {
-              description
-                "Preferred path";
-              leaf type {
-                type Preferred-path;
-                description
-                  "Preferred Path Type";
-              }
-              leaf interface-tunnel-number {
-                when "../type = 'te-tunnel' or ../type = 'ip-tunnel' or ../type = 'tp-tunnel'" {
-                  description
-                    "../Type = TE-Tunnel or ../Type =
-                     IP-Tunnel or ../Type = TP-Tunnel";
-                }
-                type uint32 {
-                  range "0..65535";
-                }
-                description
-                  "Interface Tunnel number for preferred path";
-              }
-              leaf fallback-disable {
-                when "../type = 'te-tunnel' or ../type = 'ip-tunnel' or ../type = 'tp-tunnel' or ../type = 'sr-te-policy' or ../type = 'named-te-tunnel'" {
-                  description
-                    "../Type = TE-Tunnel or ../Type =
-                     IP-Tunnel or ../Type = TP-Tunnel or .
-                     ./Type = SR-TE-Policy or ../Type =
-                     Named-TE-Tunnel";
-                }
-                type empty;
-                description
-                  "Fallback disable";
-              }
-              leaf path-name {
-                when "../type = 'sr-te-policy' or ../type = 'named-te-tunnel'" {
-                  description
-                    "../Type = SR-TE-Policy or ../Type =
-                     Named-TE-Tunnel";
-                }
-                type xr:Cisco-ios-xr-string {
-                  length "1..60";
-                }
-                description
-                  "Name of the SR TE Policy or IFName";
-              }
-            }
-            container load-balance-group {
-              description
-                "Load Balancing";
-              container flow-label-load-balance {
-                description
-                  "Enable Flow Label based load balancing";
-                leaf flow-label {
-                  type Flow-label-load-balance;
-                  description
-                    "Flow Label load balance type";
-                }
-                leaf static {
-                  type empty;
-                  description
-                    "Static Flow Label";
-                }
-              }
-              leaf flow-label-load-balance-code {
-                type Flow-label-tlv-code;
-                description
-                  "Enable Legacy Flow Label TLV code";
-              }
-              leaf pw-label-load-balance {
-                type Load-balance;
-                description
-                  "Enable PW Label based Load Balancing";
-              }
-            }
-            leaf pw-switching-tlv {
-              type Pw-switching-point-tlv;
-              description
-                "Pseudowire Switching Point Tlv";
-            }
-            leaf static-tag-rewrite {
-              type Tag-rewrite-range;
-              description
-                "Static Tag rewrite";
-            }
-            leaf signaling-protocol {
-              type Mpls-signaling-protocol;
-              default "ldp";
-              description
-                "MPLS signaling protocol";
-            }
-            leaf vccv-type {
-              type Vccv-verification;
-              default "lsp-ping";
-              description
-                "VCCV verification type";
-            }
-            leaf source-address {
-              type inet:ipv4-address-no-zone;
-              description
-                "Source IP address";
-            }
-            leaf transport-mode {
-              type Transport-mode;
-              description
-                "Transport mode";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable MPLS encapsulation";
-            }
-            leaf control-word {
-              type Control-word;
-              description
-                "Enable control word";
-            }
-          }
-          leaf mac-withdraw {
-            type empty;
-            description
-              "Enable backup MAC withdraw";
-          }
-          leaf enable {
-            type empty;
-            description
-              "Enable pseudowire class";
-          }
-          leaf name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the pseudowire class";
-          }
-        }
-      }
-      container vlan-switches {
-        description
-          "List of VLAN Switches";
-        list vlan-switch {
-          key "name";
-          description
-            "VLAN Switch";
-          container vlan-switch-ports {
-            description
-              "List of VLAN Switched Ports";
-            list vlan-switch-port {
-              key "interface-name";
-              description
-                "VLAN Switched Port";
-              leaf interface-name {
-                type xr:Interface-name;
-                description
-                  "Interface name";
-              }
-            }
-          }
-          container vni-ranges {
-            description
-              "Configure VLAN Switch VxLAN Ethernet VPN-ID
-               ranges";
-            leaf vni-range1-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #1";
-            }
-            leaf vni-range1-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #1";
-            }
-            leaf vni-range2-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #2";
-            }
-            leaf vni-range2-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #2";
-            }
-            leaf vni-range3-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #3";
-            }
-            leaf vni-range3-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #3";
-            }
-            leaf vni-range4-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #4";
-            }
-            leaf vni-range4-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #4";
-            }
-            leaf vni-range5-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #5";
-            }
-            leaf vni-range5-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #5";
-            }
-            leaf vni-range6-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #6";
-            }
-            leaf vni-range6-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #6";
-            }
-            leaf vni-range7-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #7";
-            }
-            leaf vni-range7-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #7";
-            }
-            leaf vni-range8-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #8";
-            }
-            leaf vni-range8-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #8";
-            }
-            leaf vni-range9-min {
-              type uint32;
-              description
-                "Minimum value of VNI range #9";
-            }
-            leaf vni-range9-max {
-              type uint32;
-              description
-                "Maximum value of VNI range #9";
-            }
-          }
-          container vlan-ranges {
-            description
-              "Configure VLAN Switch VLAN ranges";
-            leaf vlan-range1-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #1";
-            }
-            leaf vlan-range1-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #1";
-            }
-            leaf vlan-range2-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #2";
-            }
-            leaf vlan-range2-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #2";
-            }
-            leaf vlan-range3-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #3";
-            }
-            leaf vlan-range3-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #3";
-            }
-            leaf vlan-range4-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #4";
-            }
-            leaf vlan-range4-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #4";
-            }
-            leaf vlan-range5-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #5";
-            }
-            leaf vlan-range5-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #5";
-            }
-            leaf vlan-range6-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #6";
-            }
-            leaf vlan-range6-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #6";
-            }
-            leaf vlan-range7-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #7";
-            }
-            leaf vlan-range7-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #7";
-            }
-            leaf vlan-range8-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #8";
-            }
-            leaf vlan-range8-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #8";
-            }
-            leaf vlan-range9-min {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Minimum value of VLAN range #9";
-            }
-            leaf vlan-range9-max {
-              type L2vpn-vs-vlan-tag;
-              description
-                "Maximum value of VLAN range #9";
-            }
-          }
-          container routed-interface-ranges {
-            description
-              "Configure VLAN Switch Routed BVI Interface
-               ranges";
-            leaf interface-range1-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #1";
-            }
-            leaf interface-range1-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #1";
-            }
-            leaf interface-range2-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #2";
-            }
-            leaf interface-range2-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #2";
-            }
-            leaf interface-range3-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #3";
-            }
-            leaf interface-range3-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #3";
-            }
-            leaf interface-range4-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #4";
-            }
-            leaf interface-range4-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #4";
-            }
-            leaf interface-range5-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #5";
-            }
-            leaf interface-range5-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #5";
-            }
-            leaf interface-range6-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #6";
-            }
-            leaf interface-range6-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #6";
-            }
-            leaf interface-range7-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #7";
-            }
-            leaf interface-range7-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #7";
-            }
-            leaf interface-range8-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #8";
-            }
-            leaf interface-range8-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #8";
-            }
-            leaf interface-range9-min {
-              type uint32;
-              description
-                "Minimum value of Interface range #9";
-            }
-            leaf interface-range9-max {
-              type uint32;
-              description
-                "Maximum value of Interface range #9";
-            }
-          }
-          leaf name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the VLAN Switch";
-          }
-          uses BRIDGE-DOMAIN-TABLE;
-        }
-      }
-      container flexible-xconnect-service-table {
-        description
-          "List of Flexible XConnect Services";
-        container vlan-unaware-flexible-xconnect-services {
-          description
-            "List of Vlan-Unaware Flexible XConnect
-             Services";
-          list vlan-unaware-flexible-xconnect-service {
-            key "name";
-            description
-              "Flexible XConnect Service";
-            container vlan-unaware-fxc-attachment-circuits {
-              description
-                "List of attachment circuits";
-              list vlan-unaware-fxc-attachment-circuit {
-                key "name";
-                description
-                  "Attachment circuit interface";
-                leaf name {
-                  type xr:Interface-name;
-                  description
-                    "Name of the attachment circuit interface";
-                }
-              }
-            }
-            container vlan-unaware-fxc-pseudowire-evpns {
-              description
-                "List of EVPN Services";
-              list vlan-unaware-fxc-pseudowire-evpn {
-                key "eviid acid";
-                description
-                  "EVPN FXC Service Configuration";
-                leaf eviid {
-                  type Evpnvpnid-range;
-                  description
-                    "Ethernet VPN ID";
-                }
-                leaf acid {
-                  type Pseudowire-acid-range;
-                  description
-                    "AC ID";
-                }
-              }
-            }
-            leaf name {
-              type xr:Cisco-ios-xr-string {
-                length "1..23";
-              }
-              description
-                "Name of the Flexible XConnect Service";
-            }
-          }
-        }
-        container vlan-aware-flexible-xconnect-services {
-          description
-            "List of Vlan-Aware Flexible XConnect Services";
-          list vlan-aware-flexible-xconnect-service {
-            key "eviid";
-            description
-              "Flexible XConnect Service";
-            container vlan-aware-fxc-attachment-circuits {
-              description
-                "List of attachment circuits";
-              list vlan-aware-fxc-attachment-circuit {
-                key "name";
-                description
-                  "Attachment circuit interface";
-                leaf name {
-                  type xr:Interface-name;
-                  description
-                    "Name of the attachment circuit interface";
-                }
-              }
-            }
-            leaf eviid {
-              type Evpnvpnid-range;
-              description
-                "Ethernet VPN ID";
-            }
-          }
-        }
-      }
-      container redundancy {
-        description
-          "Redundancy groups";
-        container iccp-redundancy-groups {
-          description
-            "List of Inter-Chassis Communication Protocol
-             redundancy groups";
-          list iccp-redundancy-group {
-            key "group-id";
-            description
-              "ICCP Redundancy group";
-            container iccp-interfaces {
-              description
-                "List of interfaces";
-              list iccp-interface {
-                key "interface-name";
-                description
-                  "Interface name";
-                leaf secondary-vlan-range {
-                  type string;
-                  description
-                    "Secondary VLAN range, in the form of 1-3,5
-                     ,8-11";
-                }
-                leaf recovery-delay {
-                  type uint32 {
-                    range "30..3600";
-                  }
-                  default "180";
-                  description
-                    "Failure clear recovery delay";
-                }
-                leaf primary-vlan-range {
-                  type string;
-                  description
-                    "Primary VLAN range, in the form of 1-3,5
-                     ,8-11";
-                }
-                leaf mac-flush-tcn {
-                  type empty;
-                  description
-                    "Enable STP-TCN MAC flushing";
-                }
-                leaf interface-name {
-                  type xr:Interface-name;
-                  description
-                    "Interface name";
-                }
-              }
-            }
-            leaf multi-homing-node-id {
-              type uint32 {
-                range "0..254";
-              }
-              description
-                "ICCP-based service multi-homing node ID";
-            }
-            leaf group-id {
-              type uint32 {
-                range "1..4294967295";
-              }
-              description
-                "Group ID";
-            }
-          }
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable redundancy groups";
-        }
-      }
-    }
-    container pbb {
-      description
-        "L2VPN PBB Global";
-      leaf backbone-source-mac {
-        type yang:mac-address;
-        description
-          "Backbone Source MAC";
-      }
-    }
-    container auto-discovery {
-      description
-        "Global auto-discovery attributes";
-      container bgp-signaling {
-        description
-          "Global bgp signaling attributes";
-        leaf mtu-mismatch-ignore {
-          type empty;
-          description
-            "Ignore MTU mismatch for auto-discovered
-             pseudowires";
-        }
-      }
-    }
-    container utility {
-      description
-        "L2VPN utilities";
-      container logging {
-        description
-          "L2VPN logging utility";
-        leaf bridge-domain-state-change {
-          type empty;
-          description
-            "Enable Bridge Domain state change logging";
-        }
-        leaf pseudowire-state-change {
-          type empty;
-          description
-            "Enable pseudowire state change logging";
-        }
-        leaf vfi {
-          type empty;
-          description
-            "Enable VFI state change logging";
-        }
-        leaf nsr-state-change {
-          type empty;
-          description
-            "Enable Non Stop Routing state change logging";
-        }
-        leaf pwhe-replication-state-change {
-          type empty;
-          description
-            "Enable PW-HE Replication state change logging";
-        }
-      }
-    }
-    container snmp {
-      description
-        "SNMP related configuration";
-      container mib {
-        description
-          "MIB related configuration";
-        container mib-interface {
-          description
-            "Interface related configuration for MIB";
-          container format {
-            description
-              "MIB interface name output format";
-            leaf external-interface-format {
-              type empty;
-              description
-                "Set MIB interface name output in slash
-                 format (/)";
-            }
-          }
-        }
-        container mib-pseudowire {
-          description
-            "Pseudowire related configuration for MIB";
-          leaf statistics {
-            type empty;
-            description
-              "Enable pseudowire statistics in MIB output";
-          }
-        }
-      }
-    }
-    leaf nsr {
-      type empty;
-      description
-        "Enable Non-Stop Routing";
-    }
-    leaf mtu-mismatch-ignore {
-      type empty;
-      description
-        "Ignore MTU Mismatch for XCs";
-    }
-    leaf tcn-propagation {
-      type empty;
-      description
-        "Topology change notification propagation";
-    }
-    leaf pwoam-refresh {
-      type uint32 {
-        range "1..4095";
-      }
-      units "second";
-      description
-        "Configure PW OAM refresh interval";
-    }
-    leaf load-balance {
-      type Load-balance;
-      description
-        "Enable flow load balancing on l2vpn bridges";
-    }
-    leaf mspw-description {
-      type string {
-        length "1..64";
-      }
-      description
-        "MS-PW global description";
-    }
-    leaf mac-limit-threshold {
-      type Mac-limit-threshold-range;
-      units "percentage";
-      description
-        "Configure MAC limit threshold percent";
-    }
-    leaf pw-status-disable {
-      type empty;
-      description
-        "Disable PW status";
-    }
-    leaf enable {
-      type empty;
-      description
-        "Enable L2VPN feature";
-    }
-    leaf pw-grouping {
-      type empty;
-      description
-        "Enable PW grouping";
-    }
-    leaf capability {
-      type L2vpn-capability-mode;
-      description
-        "L2VPN Capability Mode";
-    }
-    leaf l2vpn-router-id {
-      type inet:ipv4-address-no-zone;
-      description
-        "Global L2VPN Router ID";
-    }
-  }
-  container generic-interface-lists {
-    description
-      "Generic Interface List configuration";
-    list generic-interface-list {
-      key "generic-interface-list-name";
-      description
-        "Generic interface list";
-      container interfaces {
-        description
-          "Interface table";
-        list interface {
-          key "interface-name";
-          description
-            "Interface";
-          leaf enable {
-            type empty;
-            description
-              "Enable interface";
-          }
-          leaf interface-name {
-            type xr:Interface-name;
-            description
-              "Name of the interface";
-          }
-        }
-      }
-      leaf enable {
-        type empty;
-        description
-          "Enable interface list";
-      }
-      leaf generic-interface-list-name {
-        type xr:Cisco-ios-xr-string {
-          length "1..32";
-        }
-        description
-          "Name of the interface list";
-      }
-    }
-  }
-  container evpn {
-    description
-      "EVPN configuration";
-    container evpn-tables {
-      description
-        "EVPN submodes";
-      container evpn-timers {
-        description
-          "Enter EVPN timers configuration submode";
-        leaf evpn-carving {
-          type uint32 {
-            range "0..300";
-          }
-          default "0";
-          description
-            "Global Carving timer";
-        }
-        leaf evpn-mac-postpone {
-          type uint32 {
-            range "0..300";
-          }
-          default "300";
-          description
-            "Global MAC postpone timer";
-        }
-        leaf evpn-recovery {
-          type uint32 {
-            range "0..3600";
-          }
-          default "30";
-          description
-            "Global Recovery timer";
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable EVPN timers";
-        }
-        leaf evpn-peering {
-          type uint32 {
-            range "0..300";
-          }
-          default "3";
-          description
-            "Global Peering timer";
-        }
-      }
-      container evpn-evis {
-        description
-          "Enter EVPN Instance configuration submode";
-        list evpn-evi {
-          key "eviid";
-          description
-            "Enter EVPN Instance configuration submode";
-          container evi-load-balancing {
-            description
-              "Enter Loadbalancing configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Loadbalancing";
-            }
-            uses EVI-STATIC-FLOW-LABEL;
-          }
-          container evpn-evi-bgp-auto-discovery {
-            description
-              "Enable Autodiscovery BGP in EVPN Instance";
-            leaf enable {
-              type empty;
-              description
-                "Enable Autodiscovery BGP";
-            }
-            uses TABLE-POLICY;
-            uses EVPN-ROUTE-DISTINGUISHER;
-            uses IMPLICIT-IMPORT-DISABLE;
-            uses EVPN-ROUTE-TARGET-TABLE;
-          }
-          container evi-multicast {
-            description
-              "Enter Multicast configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Multicast";
-            }
-            uses EVI-MCAST-SOURCE-CONNECTED;
-          }
-          container evi-advertise-mac {
-            description
-              "Enter Advertise local MAC-only routes
-               configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Advertise local MAC-only routes";
-            }
-            uses EVI-ADVERTISE-MAC-BVI;
-          }
-          leaf eviid {
-            type Evpnvpnid-range;
-            description
-              "EVI ID";
-          }
-          uses EVI-REORIG-DISABLE;
-          uses EVI-ADVERTISE-MAC-DEPRECATED;
-          uses EVPN-EVI-DESCRIPTION;
-          uses EVI-ECMP-DISABLE;
-          uses EVI-UNKNOWN-UNICAST-FLOODING-DISABLE;
-          uses EVPN-EVI-CW-DISABLE;
-        }
-      }
-      container evpn-virtual-access-vfis {
-        description
-          "Virtual Access VFI interfaces";
-        list evpn-virtual-access-vfi {
-          key "name";
-          description
-            "Virtual Access VFI";
-          container evpn-virtual-access-vfi-timers {
-            description
-              "Enter Virtual Forwarding Interface timers
-               configuration submode";
-            leaf evpn-virtual-access-vfi-recovery {
-              type uint32 {
-                range "0..3600";
-              }
-              default "30";
-              description
-                "Virtual Forwarding Interface-specific
-                 Recovery timer";
-            }
-            leaf evpn-virtual-access-vfi-peering {
-              type uint32 {
-                range "0..300";
-              }
-              default "3";
-              description
-                "Virtual Forwarding Interface-specific
-                 Peering timer";
-            }
-            leaf evpn-virtual-access-vfi-carving {
-              type uint32 {
-                range "0..300";
-              }
-              default "0";
-              description
-                "Virtual Forwarding Interface-specific
-                 Carving timer";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Virtual Forwarding Interface timers";
-            }
-          }
-          leaf name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the Virtual Access VFI";
-          }
-          uses EVPN-VIRTUAL-ETHERNET-SEGMENT;
-        }
-      }
-      container evpn-load-balancing {
-        description
-          "Enter EVPN Loadbalancing configuration submode";
-        leaf evpn-static-flow-label {
-          type empty;
-          description
-            "Enable Static Flow Label based load balancing";
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable EVPN Loadbalancing";
-        }
-      }
-      container evpn-bgp-auto-discovery {
-        description
-          "Enable Autodiscovery BGP in EVPN";
-        leaf enable {
-          type empty;
-          description
-            "Enable Autodiscovery BGP";
-        }
-        uses EVPN-ROUTE-DISTINGUISHER;
-      }
-      container evpn-groups {
-        description
-          "Enter EVPN Group Table submode";
-        list evpn-group {
-          key "group-id";
-          description
-            "Enter EVPN Group submode";
-          container evpn-group-core-interfaces {
-            description
-              "EVPN Group core interfaces";
-            list evpn-group-core-interface {
-              key "interface-name";
-              description
-                "EVPN Group Core interface";
-              leaf interface-name {
-                type xr:Interface-name;
-                description
-                  "Name of the EVPN Group core interface";
-              }
-            }
-          }
-          leaf group-id {
-            type Evpn-group-id-range;
-            description
-              "Group ID";
-          }
-        }
-      }
-      container evpn-instances {
-        description
-          "Enter EVPN Instance configuration submode";
-        list evpn-instance {
-          key "vpn-id encapsulation side";
-          description
-            "Enter EVPN Instance configuration submode";
-          container evpn-instance-bgp-auto-discovery {
-            description
-              "Enable Autodiscovery BGP in EVPN Instance";
-            container evpn-route-policy {
-              description
-                "Route policy";
-              leaf export {
-                type string;
-                description
-                  "Export route policy";
-              }
-              leaf import {
-                type string;
-                description
-                  "Import route policy";
-              }
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Autodiscovery BGP";
-            }
-            uses TABLE-POLICY;
-            uses EVPN-ROUTE-DISTINGUISHER;
-            uses IMPLICIT-IMPORT-DISABLE;
-            uses EVPN-ROUTE-TARGET-TABLE;
-          }
-          container evpn-instance-etree {
-            description
-              "Enter EVPN E-Tree configuration submode";
-            leaf evpn-instance-etree-rt-leaf {
-              type empty;
-              description
-                "Configure E-Tree as Route-Target leaf";
-            }
-            leaf evpn-instance-etree-leaf {
-              type empty;
-              description
-                "Configure E-Tree as leaf";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable EVPN E-Tree";
-            }
-          }
-          container evpn-instance-advertise-mac {
-            description
-              "Enter Advertise local MAC-only routes
-               configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Advertise local MAC-only routes";
-            }
-            uses EVI-ADVERTISE-MAC-BVI;
-          }
-          container evpn-instance-multicast {
-            description
-              "Enter Multicast configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Multicast";
-            }
-            uses EVI-MCAST-SOURCE-CONNECTED;
-          }
-          container evpn-instance-load-balancing {
-            description
-              "Enter Loadbalancing configuration submode";
-            leaf enable {
-              type empty;
-              description
-                "Enable Loadbalancing";
-            }
-            uses EVI-STATIC-FLOW-LABEL;
-          }
-          leaf evpn-route-sync-vrf-default {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Set EVI for default VRF";
-          }
-          leaf evi-preferred-nexthop {
-            type Preferred-nexthop-mode;
-            description
-              "Enable Preferred Nexthop mode on this EVI";
-          }
-          leaf evpn-evi-transmit-mtu-zero {
-            type boolean;
-            description
-              "Transmit MTU zero to remote for this EVPN EVI
-               .";
-          }
-          leaf evpn-evi-mtu-mismatch-ignore {
-            type boolean;
-            description
-              "Ignore mismatch between local and remote MTUs
-               for this EVPN EVI.";
-          }
-          leaf evpn-instance-vpws-single-active-backup-suppression {
-            type empty;
-            description
-              "Configure EVPN VPWS Single-Active Backup
-               Suppression";
-          }
-          leaf vpn-id {
-            type Vpnid-range;
-            description
-              "EVPN Instance ID";
-          }
-          leaf encapsulation {
-            type Evpn-encapsulation;
-            description
-              "EVPN Instance Encapsulation";
-          }
-          leaf side {
-            type Evpn-side;
-            description
-              "EVPN Instance Side";
-          }
-          uses EVI-REORIG-DISABLE;
-          uses EVI-ADVERTISE-MAC-DEPRECATED;
-          uses EVPN-EVI-DESCRIPTION;
-          uses EVI-ECMP-DISABLE;
-          uses EVI-UNKNOWN-UNICAST-FLOODING-DISABLE;
-          uses EVPN-EVI-CW-DISABLE;
-        }
-      }
-      container evpn-logging {
-        description
-          "Enter EVPN Logging configuration submode";
-        leaf evpn-df-election {
-          type empty;
-          description
-            "Enable Designated Forwarder election logging";
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable EVPN Logging";
-        }
-      }
-      container evpn-interfaces {
-        description
-          "Attachment Circuit interfaces";
-        list evpn-interface {
-          key "interface-name";
-          description
-            "Attachment circuit interface";
-          container evpnac-timers {
-            description
-              "Enter Interface-specific timers configuration
-               submode";
-            leaf evpnac-peering {
-              type uint32 {
-                range "0..300";
-              }
-              default "3";
-              description
-                "Interface-specific Peering timer";
-            }
-            leaf evpnac-carving {
-              type uint32 {
-                range "0..300";
-              }
-              default "0";
-              description
-                "Interface-specific Carving timer";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Interface-specific timers";
-            }
-            leaf evpnac-recovery {
-              type uint32 {
-                range "0..3600";
-              }
-              default "30";
-              description
-                "Interface-specific Recovery timer";
-            }
-          }
-          container ethernet-segment {
-            description
-              "Enter Ethernet Segment configuration submode";
-            leaf force-single-homed {
-              type empty;
-              description
-                "Force ethernet segment to remain
-                 single-homed";
-            }
-            leaf load-balancing-mode {
-              type Ethernet-segment-load-balance;
-              description
-                "Ethernet-Segment Load Balancing mode";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Ethernet Segment";
-            }
-            leaf backbone-source-mac {
-              type yang:mac-address;
-              description
-                "Backbone Source MAC";
-            }
-            uses SERVICE-CARVING-MCAST-TYPE;
-            uses ES-IMPORT-ROUTE-TARGET;
-            uses SERVICE-CARVING-TYPE;
-            uses IDENTIFIER;
-            uses MANUAL-SERVICE-CARVING;
-          }
-          leaf evpn-core-isolation-group {
-            type Evpn-core-group-id-range;
-            description
-              "Enter EVPN Core Isolation Group ID";
-          }
-          leaf evpn-access-signal-mode {
-            type Interface-access-signal-mode;
-            description
-              "Override default signal sent to bring down
-               access circuit";
-          }
-          leaf mac-flush {
-            type Mac-flush-mode;
-            description
-              "Enable MAC Flushing";
-          }
-          leaf interface-name {
-            type xr:Interface-name;
-            description
-              "Name of the attachment circuit interface";
-          }
-        }
-      }
-      container evpn-virtual-access-pws {
-        description
-          "Virtual Access Pseudowire interfaces";
-        list evpn-virtual-access-pw {
-          key "neighbor pseudowire-id";
-          description
-            "Virtual Access Pseudowire";
-          container evpn-virtual-access-pw-timers {
-            description
-              "Enter Virtual Access Pseudowire-specific
-               timers configuration submode";
-            leaf evpn-virtual-access-pw-recovery {
-              type uint32 {
-                range "0..3600";
-              }
-              default "30";
-              description
-                "Virtual Access Pseudowire-specific Recovery
-                 timer";
-            }
-            leaf evpn-virtual-access-pw-peering {
-              type uint32 {
-                range "0..300";
-              }
-              default "3";
-              description
-                "Virtual Access Pseudowire-specific Peering
-                 timer";
-            }
-            leaf enable {
-              type empty;
-              description
-                "Enable Virtual Access Pseudowire-specific
-                 timers";
-            }
-            leaf evpn-virtual-access-pw-carving {
-              type uint32 {
-                range "0..300";
-              }
-              default "0";
-              description
-                "Virtual Access Pseudowire-specific Carving
-                 timer";
-            }
-          }
-          leaf neighbor {
-            type inet:ipv4-address-no-zone;
-            description
-              "Neighbor IP address";
-          }
-          leaf pseudowire-id {
-            type Pseudowire-id-range;
-            description
-              "Pseudowire ID";
-          }
-          uses EVPN-VIRTUAL-ETHERNET-SEGMENT;
-        }
-      }
-      container evpn-ethernet-segment {
-        description
-          "EVPN Global Ethernet Segment submode";
-        container evpn-esi-types {
-          description
-            "EVPN ESI type table";
-          list evpn-esi-type {
-            key "esi-type";
-            description
-              "ESI type";
-            leaf disable-auto-generation {
-              type empty;
-              description
-                "Disable ESI Autogeneration";
-            }
-            leaf esi-type {
-              type Evpn-esi-type-range;
-              description
-                "ESI type";
-            }
-          }
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable EVPN Global Ethernet Segment submode";
-        }
-      }
-      leaf evpn-global-transmit-mtu-zero {
-        type empty;
-        description
-          "Transmit MTU zero to remote for all EVIs";
-      }
-      leaf evpn-global-mtu-mismatch-ignore {
-        type empty;
-        description
-          "Ignore mismatch between local and remote MTUs
-           for all EVIs.";
-      }
-      leaf evi-cost-out {
-        type empty;
-        description
-          "Configure node to cost-out";
-      }
-      leaf evpn-source-interface {
-        type xr:Interface-name;
-        description
-          "Configure EVPN router-id implicitly through
-           Loopback Interface";
-      }
-      leaf evpn-cost-in-startup {
-        type uint32 {
-          range "30..86400";
-        }
-        units "second";
-        description
-          "Cost-in node after given time (seconds) on
-           startup timer";
-      }
-    }
-    leaf enable {
-      type empty;
-      description
-        "Enable EVPN feature";
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-pbr-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-pbr-cfg.yang
deleted file mode 100644
index 74586329c..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-pbr-cfg.yang
+++ /dev/null
@@ -1,83 +0,0 @@
-module Cisco-IOS-XR-pbr-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-pbr-cfg";
-  prefix pbr-cfg;
-
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR pbr package configuration.
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg
-     module with configuration data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.1";
-  }
-  revision 2018-05-17 {
-    description
-      "CSCvi93168 PBR commit replace feature.";
-  }
-  revision 2016-03-08 {
-    description
-      "Moved augment statement to a separate file";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container pbr {
-      description
-        "Interface PBR configuration";
-      container service-policies {
-        description
-          "Ingress service policy";
-        list service-policy {
-          key "service-policy";
-          description
-            "Service policy details";
-          leaf service-policy {
-            type string {
-              length "1..64";
-            }
-            description
-              "Name of policy-map";
-          }
-        }
-      }
-      leaf service-policy-in {
-        type string;
-        description
-          "Class for subscriber ingress policy";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper-sub1.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper-sub1.yang
deleted file mode 100644
index 73bf79898..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper-sub1.yang
+++ /dev/null
@@ -1,142 +0,0 @@
-submodule Cisco-IOS-XR-shellutil-oper-sub1 {
-  belongs-to Cisco-IOS-XR-shellutil-oper {
-    prefix Cisco-IOS-XR-shellutil-oper;
-  }
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This submodule contains a collection of YANG definitions
-     for Cisco IOS-XR shellutil package operational data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.1";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Time-source {
-    type enumeration {
-      enum "error" {
-        value 0;
-        description
-          "Error";
-      }
-      enum "none" {
-        value 1;
-        description
-          "Unsynchronized time";
-      }
-      enum "ntp" {
-        value 2;
-        description
-          "Network time protocol";
-      }
-      enum "manual" {
-        value 3;
-        description
-          "User configured";
-      }
-      enum "calendar" {
-        value 4;
-        description
-          "Hardware calendar";
-      }
-    }
-    description
-      "Time source";
-  }
-
-  grouping SYSTEM-UPTIME {
-    description
-      "System uptime";
-    leaf host-name {
-      type string;
-      description
-        "Host name";
-    }
-    leaf uptime {
-      type uint32;
-      units "second";
-      description
-        "Amount of time in seconds since this system
-         was last initialized";
-    }
-  }
-
-  grouping TIME-DATE {
-    description
-      "Date and time";
-    leaf year {
-      type uint16;
-      description
-        "Year [0..65535]";
-    }
-    leaf month {
-      type uint8;
-      description
-        "Month [1..12]";
-    }
-    leaf day {
-      type uint8;
-      description
-        "Day [1..31]";
-    }
-    leaf hour {
-      type uint8;
-      description
-        "Hour [0..23]";
-    }
-    leaf minute {
-      type uint8;
-      description
-        "Minute [0..59]";
-    }
-    leaf second {
-      type uint8;
-      description
-        "Second [0..60], use 60 for leap-second";
-    }
-    leaf millisecond {
-      type uint16;
-      description
-        "Millisecond [0..999]";
-    }
-    leaf wday {
-      type uint16;
-      description
-        "Week Day [0..6]";
-    }
-    leaf time-zone {
-      type string;
-      description
-        "Time zone";
-    }
-    leaf time-source {
-      type Time-source;
-      description
-        "Time source";
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper.yang
deleted file mode 100644
index 011ed3d2d..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-shellutil-oper.yang
+++ /dev/null
@@ -1,60 +0,0 @@
-module Cisco-IOS-XR-shellutil-oper {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-shellutil-oper";
-  prefix shellutil-oper;
-
-  import cisco-semver {
-    prefix semver;
-  }
-  include Cisco-IOS-XR-shellutil-oper-sub1 {
-    revision-date 2019-04-05;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR shellutil package operational data.
-     
-     This module contains definitions
-     for the following management objects:
-       system-time: System time information
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.1";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  container system-time {
-    config false;
-    description
-      "System time information";
-    container clock {
-      description
-        "System clock information";
-      uses TIME-DATE;
-    }
-    container uptime {
-      description
-        "System uptime information";
-      uses SYSTEM-UPTIME;
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-snmp-agent-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-snmp-agent-cfg.yang
deleted file mode 100644
index d8052d60e..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-snmp-agent-cfg.yang
+++ /dev/null
@@ -1,2369 +0,0 @@
-module Cisco-IOS-XR-snmp-agent-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-snmp-agent-cfg";
-  prefix snmp-agent-cfg;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR snmp-agent package configuration.
-     
-     This module contains definitions
-     for the following management objects:
-       snmp: The heirarchy point for all the SNMP configurations
-       mib: The heirarchy point for all the MIB configurations
-     
-     Copyright (c) 2013-2020 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2020-03-31 {
-    description
-      "CSCvs82990 Native yang model support for uncovered snmp-server cmds";
-    semver:module-version "3.0.0";
-  }
-  revision 2019-11-21 {
-    description
-      "CSCvs07760 Changed host config schema default values in sync with cli
-       2019-11-06
-       Yang Support for snmp-agent components via bug CSCvk56072
-       2019-10-31
-       Added mandatory nodes.
-       2019-06-13
-       Added new option under host config via bug CSCvq13863";
-    semver:module-version "2.0.0";
-  }
-  revision 2019-05-29 {
-    description
-      "Type6 algorithm support to configure SNMP community, community-map, host, vrf host and user via bug CSCvp30991.";
-    semver:module-version "1.0.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-  }
-  revision 2018-06-27 {
-    description
-      "Error while configuring snmp-server host via netconf bug CSCvj92659.";
-  }
-  revision 2018-03-12 {
-    description
-      "Yang model support to configure snmp-server timeouts threshold 100000";
-  }
-  revision 2017-12-20 {
-    description
-      "Removed nonstateful class from correlator config";
-  }
-  revision 2017-10-15 {
-    description
-      "Removed presence statement generated from internal CLI data.";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-10-27 {
-    description
-      "IOS XR 5.3.2 revision.";
-  }
-  revision 2015-01-07 {
-    description
-      "IOS XR 5.3.1 revision.";
-  }
-
-  typedef Snmp-tos {
-    type enumeration {
-      enum "precedence" {
-        value 0;
-        description
-          "SNMP TOS type Precedence";
-      }
-      enum "dscp" {
-        value 1;
-        description
-          "SNMP TOS type DSCP";
-      }
-    }
-    description
-      "Snmp tos";
-  }
-
-  typedef Snmp-hash-algorithm {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No authentication required";
-      }
-      enum "md5" {
-        value 1;
-        description
-          "Standard Message Digest algorithm";
-      }
-      enum "sha" {
-        value 2;
-        description
-          "SHA algorithm";
-      }
-    }
-    description
-      "Snmp hash algorithm";
-  }
-
-  typedef Snmp-priv-algorithm {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "No Privacy";
-      }
-      enum "des" {
-        value 1;
-        description
-          "Des algorithm";
-      }
-      enum "3des" {
-        value 2;
-        description
-          "3des algorithm";
-      }
-      enum "aes128" {
-        value 3;
-        description
-          "aes128 algorithm";
-      }
-      enum "aes192" {
-        value 4;
-        description
-          "aes192 algorithm";
-      }
-      enum "aes256" {
-        value 5;
-        description
-          "aes256 algorithm";
-      }
-    }
-    description
-      "Snmp priv algorithm";
-  }
-
-  typedef Snmp-owner-access {
-    type enumeration {
-      enum "sdr-owner" {
-        value 0;
-        description
-          "Secure Domain Router Owner permissions";
-      }
-      enum "system-owner" {
-        value 1;
-        description
-          "System owner permissions";
-      }
-    }
-    description
-      "Snmp owner access";
-  }
-
-  typedef Snmp-bulkstat-schema {
-    type enumeration {
-      enum "exact-interface" {
-        value 1;
-        description
-          "Exact Interface";
-      }
-      enum "exact-oid" {
-        value 2;
-        description
-          "Exact OID";
-      }
-      enum "wild-interface" {
-        value 3;
-        description
-          "Wild Interface";
-      }
-      enum "wild-oid" {
-        value 4;
-        description
-          "Wild OID";
-      }
-      enum "range-oid" {
-        value 5;
-        description
-          "Range of OID";
-      }
-      enum "repeat-oid" {
-        value 6;
-        description
-          "Repeated the instance";
-      }
-    }
-    description
-      "Snmp bulkstat schema";
-  }
-
-  typedef Snmpacl {
-    type enumeration {
-      enum "ipv4" {
-        value 1;
-        description
-          "Ipv4 Access-list";
-      }
-      enum "ipv6" {
-        value 2;
-        description
-          "Ipv6 Access-list";
-      }
-    }
-    description
-      "Snmpacl";
-  }
-
-  typedef Snmp-dscp-value {
-    type union {
-      type enumeration {
-        enum "default" {
-          value 0;
-          description
-            "Applicable to DSCP: bits 000000";
-        }
-        enum "af11" {
-          value 10;
-          description
-            "Applicable to DSCP: bits 001010";
-        }
-        enum "af12" {
-          value 12;
-          description
-            "Applicable to DSCP: bits 001100";
-        }
-        enum "af13" {
-          value 14;
-          description
-            "Applicable to DSCP: bits 001110";
-        }
-        enum "af21" {
-          value 18;
-          description
-            "Applicable to DSCP: bits 010010";
-        }
-        enum "af22" {
-          value 20;
-          description
-            "Applicable to DSCP: bits 010100";
-        }
-        enum "af23" {
-          value 22;
-          description
-            "Applicable to DSCP: bits 010110";
-        }
-        enum "af31" {
-          value 26;
-          description
-            "Applicable to DSCP: bits 011010";
-        }
-        enum "af32" {
-          value 28;
-          description
-            "Applicable to DSCP: bits 011100";
-        }
-        enum "af33" {
-          value 30;
-          description
-            "Applicable to DSCP: bits 011110";
-        }
-        enum "af41" {
-          value 34;
-          description
-            "Applicable to DSCP: bits 100010";
-        }
-        enum "af42" {
-          value 36;
-          description
-            "Applicable to DSCP: bits 100100";
-        }
-        enum "af43" {
-          value 38;
-          description
-            "Applicable to DSCP: bits 100110";
-        }
-        enum "ef" {
-          value 46;
-          description
-            "Applicable to DSCP: bits 101110";
-        }
-        enum "cs1" {
-          value 8;
-          description
-            "Applicable to DSCP: bits 001000";
-        }
-        enum "cs2" {
-          value 16;
-          description
-            "Applicable to DSCP: bits 010000";
-        }
-        enum "cs3" {
-          value 24;
-          description
-            "Applicable to DSCP: bits 011000";
-        }
-        enum "cs4" {
-          value 32;
-          description
-            "Applicable to DSCP: bits 100000";
-        }
-        enum "cs5" {
-          value 40;
-          description
-            "Applicable to DSCP: bits 101000";
-        }
-        enum "cs6" {
-          value 48;
-          description
-            "Applicable to DSCP: bits 110000";
-        }
-        enum "cs7" {
-          value 56;
-          description
-            "Applicable to DSCP: bits 111000";
-        }
-      }
-      type uint32 {
-        range "0..63";
-      }
-    }
-    description
-      "Snmp dscp value";
-  }
-
-  typedef Snmp-precedence-value1 {
-    type union {
-      type enumeration {
-        enum "routine" {
-          value 0;
-          description
-            "Applicable to Precedence: value 0";
-        }
-        enum "priority" {
-          value 1;
-          description
-            "Applicable to Precedence: value 1";
-        }
-        enum "immediate" {
-          value 2;
-          description
-            "Applicable to Precedence: value 2";
-        }
-        enum "flash" {
-          value 3;
-          description
-            "Applicable to Precedence: value 3";
-        }
-        enum "flash-override" {
-          value 4;
-          description
-            "Applicable to Precedence: value 4";
-        }
-        enum "critical" {
-          value 5;
-          description
-            "Applicable to Precedence: value 5";
-        }
-        enum "internet" {
-          value 6;
-          description
-            "Applicable to Precedence: value 6";
-        }
-        enum "network" {
-          value 7;
-          description
-            "Applicable to Precedence: value 7";
-        }
-      }
-      type uint32 {
-        range "0..7";
-      }
-    }
-    description
-      "Snmp precedence value1";
-  }
-
-  typedef Snmp-security-model {
-    type enumeration {
-      enum "no-authentication" {
-        value 0;
-        description
-          "No Authentication required";
-      }
-      enum "authentication" {
-        value 1;
-        description
-          "Authentication password alone required for
-           access";
-      }
-      enum "privacy" {
-        value 2;
-        description
-          "Authentication and privacy password required
-           for access";
-      }
-    }
-    description
-      "Snmp security model";
-  }
-
-  typedef Snmp-mib-view-inclusion {
-    type enumeration {
-      enum "included" {
-        value 1;
-        description
-          "MIB View to be included";
-      }
-      enum "excluded" {
-        value 2;
-        description
-          "MIB View to be excluded";
-      }
-    }
-    description
-      "Snmp mib view inclusion";
-  }
-
-  typedef Snmp-bulkstat-file-format {
-    type enumeration {
-      enum "schema-ascii" {
-        value 1;
-        description
-          "Tranfer file in schema Ascii format";
-      }
-      enum "bulk-ascii" {
-        value 2;
-        description
-          "Tranfer file in Bulk Ascii format";
-      }
-      enum "bulk-binary" {
-        value 3;
-        description
-          "Tranfer file in Bulk binary format";
-      }
-    }
-    description
-      "Snmp bulkstat file format";
-  }
-
-  typedef Snmp-access-level {
-    type enumeration {
-      enum "read-only" {
-        value 0;
-        description
-          "Read Only Access for a community string";
-      }
-      enum "read-write" {
-        value 1;
-        description
-          "Read Write Access for a community string";
-      }
-    }
-    description
-      "Snmp access level";
-  }
-
-  typedef Snmp-context {
-    type enumeration {
-      enum "vrf" {
-        value 1;
-        description
-          "VRF feature";
-      }
-      enum "bridge" {
-        value 4;
-        description
-          "BRIDGE feature";
-      }
-      enum "ospf" {
-        value 5;
-        description
-          "OSPF feature";
-      }
-      enum "ospfv3" {
-        value 6;
-        description
-          "OSPFv3 feature";
-      }
-    }
-    description
-      "Snmp context";
-  }
-
-  typedef Group-snmp-version {
-    type enumeration {
-      enum "v1" {
-        value 0;
-        description
-          "SNMP version 1";
-      }
-      enum "v2c" {
-        value 1;
-        description
-          "SNMP version 2";
-      }
-      enum "v3" {
-        value 2;
-        description
-          "SNMP version 3";
-      }
-    }
-    description
-      "Group snmp version";
-  }
-
-  typedef User-snmp-version {
-    type enumeration {
-      enum "v1" {
-        value 1;
-        description
-          "SNMP version 1";
-      }
-      enum "v2c" {
-        value 2;
-        description
-          "SNMP version 2";
-      }
-      enum "v3" {
-        value 3;
-        description
-          "SNMP version 3";
-      }
-    }
-    description
-      "User snmp version";
-  }
-
-  grouping APPLIED-TO {
-    description
-      "Common node of rule, rule-set";
-    container applied-to {
-      description
-        "Applied to the Rule or Ruleset";
-      container hosts {
-        description
-          "Table of configured hosts to apply rules to";
-        list host {
-          key "ip-address port";
-          description
-            "A destination host";
-          leaf ip-address {
-            type inet:ip-address-no-zone;
-            description
-              "IP address";
-          }
-          leaf port {
-            type xr:Cisco-ios-xr-port-number;
-            description
-              "Port (specify 162 for default)";
-          }
-        }
-      }
-      leaf all {
-        type empty;
-        description
-          "Apply to all of the device";
-      }
-    }
-  }
-
-  grouping CONTEXT-TABLE {
-    description
-      "Common node of snmp, vrf";
-    container contexts {
-      description
-        "List of Context Names";
-      list context {
-        key "context-name";
-        description
-          "Context Name";
-        leaf context-name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "Context Name";
-        }
-      }
-    }
-  }
-
-  grouping VAR-BIND-TABLE {
-    description
-      "Common node of root-cause, non-root-cause";
-    container var-binds {
-      description
-        "Varbinds to match";
-      list var-bind {
-        key "oid";
-        description
-          "Varbind match conditions";
-        container match {
-          description
-            "VarBind match conditions";
-          leaf value {
-            type string;
-            description
-              "Regular Expression to match value";
-          }
-          leaf index {
-            type string;
-            description
-              "Regular Expression to match index";
-          }
-        }
-        leaf oid {
-          type string;
-          description
-            "OID of varbind (dotted decimal)";
-        }
-      }
-    }
-  }
-
-  grouping TRAP-HOST-TABLE {
-    description
-      "Common node of snmp, vrf";
-    container trap-hosts {
-      description
-        "Specify hosts to receive SNMP notifications";
-      list trap-host {
-        key "ip-address";
-        description
-          "Specify hosts to receive SNMP notifications";
-        container encrypted-user-communities {
-          description
-            "Container class for defining default
-             Clear/encrypt communities for a trap host";
-          list encrypted-user-community {
-            key "community-name";
-            description
-              "Default Clear/Encrypt Community name
-               associated with a trap host";
-            leaf community-name {
-              type xr:Cisco-ios-xr-string;
-              description
-                "SNMPv1/v2c community string or SNMPv3 user";
-            }
-            leaf port {
-              type xr:Cisco-ios-xr-port-number;
-              description
-                "UDP port number";
-            }
-            leaf version {
-              type string;
-              mandatory true;
-              description
-                "SNMP Version to be used 1/2c/3";
-            }
-            leaf security-level {
-              type Snmp-security-model;
-              description
-                "Security level to be used noauth/auth/priv";
-            }
-            leaf basic-trap-types {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setBasicTrapTypes is used for
-                 all traps except copy-completeSet this value
-                 to an integer corresponding to the trapBGP
-                 8192, CONFIG 4096,SYSLOG 131072,SNMP_TRAP
-                 1COPY_COMPLETE_TRAP 64To provide a
-                 combination of trap Add the respective
-                 numbersValue must be set to 0 for all traps";
-            }
-            leaf advanced-trap-types1 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setUse this for providing
-                 copy-complete trapValue must be set to 0 if
-                 not used";
-            }
-            leaf advanced-trap-types2 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setvalue should always to set as
-                 0";
-            }
-            leaf dying-gasp {
-              type boolean;
-              description
-                "Enable dying gasp trap for this host";
-            }
-          }
-        }
-        container type6-encrypted-user-communities {
-          description
-            "Container class for defining type6
-             Clear/encrypt communities for a trap host";
-          list type6-encrypted-user-community {
-            key "community-name";
-            description
-              "Type6 Clear/Encrypt Community name associated
-               with a trap host";
-            leaf community-name {
-              type xr:Cisco-ios-xr-string;
-              description
-                "SNMPv1/v2c community string or SNMPv3 user";
-            }
-            leaf port {
-              type xr:Cisco-ios-xr-port-number;
-              description
-                "UDP port number";
-            }
-            leaf version {
-              type string;
-              mandatory true;
-              description
-                "SNMP Version to be used 1/2c/3";
-            }
-            leaf security-level {
-              type Snmp-security-model;
-              description
-                "Security level to be used noauth/auth/priv";
-            }
-            leaf basic-trap-types {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setBasicTrapTypes is used for
-                 all traps except copy-completeSet this value
-                 to an integer corresponding to the trapBGP
-                 8192, CONFIG 4096,SYSLOG 131072,SNMP_TRAP
-                 1COPY_COMPLETE_TRAP 64To provide a
-                 combination of trap Add the respective
-                 numbersValue must be set to 0 for all traps";
-            }
-            leaf advanced-trap-types1 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setUse this for providing
-                 copy-complete trapValue must be set to 0 if
-                 not used";
-            }
-            leaf advanced-trap-types2 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setvalue should always to set as
-                 0";
-            }
-            leaf dying-gasp {
-              type boolean;
-              description
-                "Enable dying gasp trap for this host";
-            }
-          }
-        }
-        container inform-host {
-          description
-            "Container class for defining notification type
-             for a Inform host";
-          container inform-user-communities {
-            description
-              "Container class for defining communities for
-               a inform host";
-            list inform-user-community {
-              key "community-name";
-              description
-                "Unencrpted Community name associated with a
-                 inform host";
-              leaf community-name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..128";
-                }
-                description
-                  "SNMPv2c community string or SNMPv3 user";
-              }
-              leaf port {
-                type xr:Cisco-ios-xr-port-number;
-                description
-                  "UDP port number";
-              }
-              leaf version {
-                type string;
-                mandatory true;
-                description
-                  "SNMP Version to be used 2c/3";
-              }
-              leaf security-level {
-                type Snmp-security-model;
-                description
-                  "Security level to be used noauth/auth/priv";
-              }
-              leaf basic-trap-types {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setBasicTrapTypes is used for
-                   all traps except copy-completeSet this
-                   value to an integer corresponding to the
-                   trapBGP 8192, CONFIG 4096,SYSLOG 131072
-                   ,SNMP_TRAP 1COPY_COMPLETE_TRAP 64To provide
-                   a combination of trap Add the respective
-                   numbersValue must be set to 0 for all traps";
-              }
-              leaf advanced-trap-types1 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setUse this for providing
-                   copy-complete trapValue must be set to 0 if
-                   not used";
-              }
-              leaf advanced-trap-types2 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setvalue should always to set
-                   as 0";
-              }
-              leaf dying-gasp {
-                type boolean;
-                description
-                  "Enable dying gasp trap for this host";
-              }
-            }
-          }
-          container inform-type6-encrypted-user-communities {
-            description
-              "Container class for defining type6
-               Clear/encrypt communities for a inform host";
-            list inform-type6-encrypted-user-community {
-              key "community-name";
-              description
-                "Type6 Clear/Encrypt Community name
-                 associated with a inform host";
-              leaf community-name {
-                type xr:Cisco-ios-xr-string;
-                description
-                  "SNMPv2c community string or SNMPv3 user";
-              }
-              leaf port {
-                type xr:Cisco-ios-xr-port-number;
-                description
-                  "UDP port number";
-              }
-              leaf version {
-                type string;
-                mandatory true;
-                description
-                  "SNMP Version to be used 2c/3";
-              }
-              leaf security-level {
-                type Snmp-security-model;
-                description
-                  "Security level to be used noauth/auth/priv";
-              }
-              leaf basic-trap-types {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setBasicTrapTypes is used for
-                   all traps except copy-completeSet this
-                   value to an integer corresponding to the
-                   trapBGP 8192, CONFIG 4096,SYSLOG 131072
-                   ,SNMP_TRAP 1COPY_COMPLETE_TRAP 64To provide
-                   a combination of trap Add the respective
-                   numbersValue must be set to 0 for all traps";
-              }
-              leaf advanced-trap-types1 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setUse this for providing
-                   copy-complete trapValue must be set to 0 if
-                   not used";
-              }
-              leaf advanced-trap-types2 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setvalue should always to set
-                   as 0";
-              }
-              leaf dying-gasp {
-                type boolean;
-                description
-                  "Enable dying gasp trap for this host";
-              }
-            }
-          }
-          container inform-encrypted-user-communities {
-            description
-              "Container class for defining default
-               Clear/encrypt communities for a inform host";
-            list inform-encrypted-user-community {
-              key "community-name";
-              description
-                "Clear/Encrypt Community name associated with
-                 a inform host";
-              leaf community-name {
-                type xr:Cisco-ios-xr-string;
-                description
-                  "SNMPv2c community string or SNMPv3 user";
-              }
-              leaf port {
-                type xr:Cisco-ios-xr-port-number;
-                description
-                  "UDP port number";
-              }
-              leaf version {
-                type string;
-                mandatory true;
-                description
-                  "SNMP Version to be used 2c/3";
-              }
-              leaf security-level {
-                type Snmp-security-model;
-                description
-                  "Security level to be used noauth/auth/priv";
-              }
-              leaf basic-trap-types {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setBasicTrapTypes is used for
-                   all traps except copy-completeSet this
-                   value to an integer corresponding to the
-                   trapBGP 8192, CONFIG 4096,SYSLOG 131072
-                   ,SNMP_TRAP 1COPY_COMPLETE_TRAP 64To provide
-                   a combination of trap Add the respective
-                   numbersValue must be set to 0 for all traps";
-              }
-              leaf advanced-trap-types1 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setUse this for providing
-                   copy-complete trapValue must be set to 0 if
-                   not used";
-              }
-              leaf advanced-trap-types2 {
-                type uint32;
-                mandatory true;
-                description
-                  "Number to signify the feature traps that
-                   needs to be setvalue should always to set
-                   as 0";
-              }
-              leaf dying-gasp {
-                type boolean;
-                description
-                  "Enable dying gasp trap for this host";
-              }
-            }
-          }
-        }
-        container default-user-communities {
-          description
-            "Container class for defining communities for a
-             trap host";
-          list default-user-community {
-            key "community-name";
-            description
-              "Unencrpted Community name associated with a
-               trap host";
-            leaf community-name {
-              type xr:Cisco-ios-xr-string {
-                length "1..128";
-              }
-              description
-                "SNMPv1/v2c community string or SNMPv3 user";
-            }
-            leaf port {
-              type xr:Cisco-ios-xr-port-number;
-              description
-                "UDP port number";
-            }
-            leaf version {
-              type string;
-              mandatory true;
-              description
-                "SNMP Version to be used 1/2c/3";
-            }
-            leaf security-level {
-              type Snmp-security-model;
-              description
-                "Security level to be used noauth/auth/priv";
-            }
-            leaf basic-trap-types {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setBasicTrapTypes is used for
-                 all traps except copy-completeSet this value
-                 to an integer corresponding to the trapBGP
-                 8192, CONFIG 4096,SYSLOG 131072,SNMP_TRAP
-                 1COPY_COMPLETE_TRAP 64To provide a
-                 combination of trap Add the respective
-                 numbersValue must be set to 0 for all traps";
-            }
-            leaf advanced-trap-types1 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setUse this for providing
-                 copy-complete trapValue must be set to 0 if
-                 not used";
-            }
-            leaf advanced-trap-types2 {
-              type uint32;
-              mandatory true;
-              description
-                "Number to signify the feature traps that
-                 needs to be setvalue should always to set as
-                 0";
-            }
-            leaf dying-gasp {
-              type boolean;
-              description
-                "Enable dying gasp trap for this host";
-            }
-          }
-        }
-        leaf ip-address {
-          type inet:ip-address-no-zone;
-          description
-            "IP address of SNMP notification host";
-        }
-      }
-    }
-  }
-
-  grouping CONTEXT-MAPPING-TABLE {
-    description
-      "Common node of snmp, vrf";
-    container context-mappings {
-      description
-        "List of context names";
-      list context-mapping {
-        key "context-mapping-name";
-        description
-          "Context mapping name";
-        leaf context-mapping-name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "Context mapping name";
-        }
-        leaf context {
-          type Snmp-context;
-          description
-            "SNMP context feature type";
-        }
-        leaf instance-name {
-          type string;
-          description
-            "OSPF protocol instance";
-        }
-        leaf vrf-name {
-          type string;
-          description
-            "VRF name associated with the context";
-        }
-        leaf topology-name {
-          type string;
-          description
-            "Topology name associated with the context";
-        }
-      }
-    }
-  }
-
-  container snmp {
-    description
-      "The heirarchy point for all the SNMP
-       configurations";
-    container encrypted-community-maps {
-      description
-        "Container class to hold clear/encrypted
-         communitie maps";
-      list encrypted-community-map {
-        key "community-name";
-        description
-          "Clear/encrypted SNMP community map";
-        leaf community-name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "SNMP community map";
-        }
-        leaf context {
-          type string;
-          description
-            "SNMP Context Name ";
-        }
-        leaf security {
-          type string;
-          description
-            "SNMP Security Name ";
-        }
-        leaf target-list {
-          type string;
-          description
-            "target list name ";
-        }
-      }
-    }
-    container views {
-      description
-        "Class to configure a SNMPv2 MIB view";
-      list view {
-        key "view-name family";
-        description
-          "Name of the view";
-        leaf view-name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "Name of the view";
-        }
-        leaf family {
-          type string;
-          description
-            "MIB view family name";
-        }
-        leaf view-inclusion {
-          type Snmp-mib-view-inclusion;
-          mandatory true;
-          description
-            "MIB view to be included or excluded";
-        }
-      }
-    }
-    container logging {
-      description
-        "SNMP logging";
-      container threshold {
-        description
-          "SNMP logging threshold";
-        leaf oid-processing {
-          type uint32 {
-            range "0..20000";
-          }
-          default "500";
-          description
-            "SNMP logging threshold for OID processing";
-        }
-        leaf pdu-processing {
-          type uint32 {
-            range "0..20000";
-          }
-          default "20000";
-          description
-            "SNMP logging threshold for PDU processing";
-        }
-      }
-    }
-    container administration {
-      description
-        "Container class for SNMP administration";
-      container default-communities {
-        description
-          "Container class to hold unencrpted communities";
-        list default-community {
-          key "community-name";
-          description
-            "Unencrpted SNMP community string and access
-             priviledges";
-          leaf community-name {
-            type string {
-              length "1..128";
-            }
-            description
-              "SNMP community string";
-          }
-          leaf priviledge {
-            type Snmp-access-level;
-            description
-              "Read/Write Access";
-          }
-          leaf view-name {
-            type string;
-            description
-              "MIB view to which the community has access";
-          }
-          leaf v4acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v4-access-list {
-            type string;
-            description
-              "Ipv4 Access-list name";
-          }
-          leaf v6acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v6-access-list {
-            type string;
-            description
-              "Ipv6 Access-list name";
-          }
-          leaf owner {
-            type Snmp-owner-access;
-            description
-              "Logical Router or System owner access";
-          }
-        }
-      }
-      container type6-encrypted-communities {
-        description
-          "Container class to hold type6 clear/encrypted
-           communities";
-        list type6-encrypted-community {
-          key "community-name";
-          description
-            "Type6 Clear/encrypted SNMP community string
-             and access priviledges";
-          leaf community-name {
-            type xr:Cisco-ios-xr-string;
-            description
-              "SNMP community string";
-          }
-          leaf priviledge {
-            type Snmp-access-level;
-            description
-              "Read/Write Access";
-          }
-          leaf view-name {
-            type string;
-            description
-              "MIB view to which the community has access";
-          }
-          leaf v4acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v4-access-list {
-            type string;
-            description
-              "Ipv4 Access-list name";
-          }
-          leaf v6acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v6-access-list {
-            type string;
-            description
-              "Ipv6 Access-list name";
-          }
-          leaf owner {
-            type Snmp-owner-access;
-            description
-              "Logical Router or System owner access";
-          }
-        }
-      }
-      container encrypted-communities {
-        description
-          "Container class to hold clear/encrypted
-           communities";
-        list encrypted-community {
-          key "community-name";
-          description
-            "Clear/encrypted SNMP community string and
-             access priviledges";
-          leaf community-name {
-            type xr:Cisco-ios-xr-string;
-            description
-              "SNMP community string";
-          }
-          leaf priviledge {
-            type Snmp-access-level;
-            description
-              "Read/Write Access";
-          }
-          leaf view-name {
-            type string;
-            description
-              "MIB view to which the community has access";
-          }
-          leaf v4acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v4-access-list {
-            type string;
-            description
-              "Ipv4 Access-list name";
-          }
-          leaf v6acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v6-access-list {
-            type string;
-            description
-              "Ipv6 Access-list name";
-          }
-          leaf owner {
-            type Snmp-owner-access;
-            description
-              "Logical Router or System owner access";
-          }
-        }
-      }
-    }
-    container agent {
-      description
-        "The heirarchy point for SNMP Agent
-         configurations";
-      container engine-id {
-        description
-          "SNMPv3 engineID";
-        container remotes {
-          description
-            "SNMPv3 remote SNMP Entity";
-          list remote {
-            key "remote-address";
-            description
-              "engineID of the remote agent";
-            leaf remote-address {
-              type inet:ip-address-no-zone;
-              description
-                "IP address of remote SNMP entity";
-            }
-            leaf remote-engine-id {
-              type string;
-              description
-                "engine ID octet string";
-            }
-            leaf port {
-              type xr:Cisco-ios-xr-port-number;
-              description
-                "UDP port number";
-            }
-          }
-        }
-        leaf local {
-          type string;
-          description
-            "engineID of the local agent";
-        }
-      }
-    }
-    container trap {
-      description
-        "Class to hold trap configurations";
-      leaf timeout {
-        type uint32 {
-          range "1..1000";
-        }
-        description
-          "Timeout for TRAP message retransmissions";
-      }
-      leaf throttle-time {
-        type uint32 {
-          range "10..500";
-        }
-        units "millisecond";
-        description
-          "Set throttle time for handling traps";
-      }
-      leaf queue-length {
-        type uint32 {
-          range "1..5000";
-        }
-        description
-          "Message queue length for each TRAP host";
-      }
-    }
-    container type6-encrypted-community-maps {
-      description
-        "Container class to hold type6 clear/encrypted
-         communitie maps";
-      list type6-encrypted-community-map {
-        key "community-name";
-        description
-          "Type6 Clear/encrypted SNMP community map";
-        leaf community-name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "SNMP community map";
-        }
-        leaf context {
-          type string;
-          description
-            "SNMP Context Name ";
-        }
-        leaf security {
-          type string;
-          description
-            "SNMP Security Name ";
-        }
-        leaf target-list {
-          type string;
-          description
-            "target list name ";
-        }
-      }
-    }
-    container drop-packet {
-      description
-        "SNMP packet drop config";
-      container report {
-        description
-          "SNMP drop report";
-        container acl {
-          description
-            "SNMP drop report for ACL";
-          leaf v4acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v4-access-list {
-            type string;
-            description
-              "Ipv4 Access-list name";
-          }
-          leaf v6acl-type {
-            type Snmpacl;
-            description
-              "Access-list type";
-          }
-          leaf v6-access-list {
-            type string;
-            description
-              "Ipv6 Access-list name";
-          }
-        }
-      }
-      leaf unknown-user {
-        type empty;
-        description
-          "Enable drop unknown user name";
-      }
-    }
-    container ipv6 {
-      description
-        "SNMP TOS bit for outgoing packets";
-      container tos {
-        description
-          "Type of TOS";
-        leaf type {
-          type Snmp-tos;
-          description
-            "SNMP TOS type DSCP or Precedence";
-        }
-        leaf precedence {
-          when "../type = 'precedence'" {
-            description
-              "../Type = Precedence";
-          }
-          type Snmp-precedence-value1;
-          description
-            "SNMP Precedence value";
-        }
-        leaf dscp {
-          when "../type = 'dscp'" {
-            description
-              "../Type = DSCP";
-          }
-          type Snmp-dscp-value;
-          description
-            "SNMP DSCP value";
-        }
-      }
-    }
-    container ipv4 {
-      description
-        "SNMP TOS bit for outgoing packets";
-      container tos {
-        description
-          "Type of TOS";
-        leaf type {
-          type Snmp-tos;
-          description
-            "SNMP TOS type DSCP or Precedence";
-        }
-        leaf precedence {
-          when "../type = 'precedence'" {
-            description
-              "../Type = Precedence";
-          }
-          type Snmp-precedence-value1;
-          description
-            "SNMP Precedence value";
-        }
-        leaf dscp {
-          when "../type = 'dscp'" {
-            description
-              "../Type = DSCP";
-          }
-          type Snmp-dscp-value;
-          description
-            "SNMP DSCP value";
-        }
-      }
-    }
-    container system {
-      description
-        "container to hold system information";
-      leaf chassis-id {
-        type string {
-          length "1..255";
-        }
-        description
-          "String to uniquely identify this chassis";
-      }
-      leaf location {
-        type string {
-          length "1..255";
-        }
-        description
-          "The physical location of this node";
-      }
-      leaf contact {
-        type string {
-          length "1..255";
-        }
-        description
-          "identification of the contact person for this
-           managed node";
-      }
-    }
-    container target {
-      description
-        "SNMP target configurations";
-      container targets {
-        description
-          "List of targets";
-        list target {
-          key "target-list-name";
-          description
-            "Name of the target list";
-          container vrf-names {
-            description
-              "List of VRF Name for a target list";
-            list vrf-name {
-              key "name";
-              description
-                "VRF name of the target";
-              leaf name {
-                type xr:Cisco-ios-xr-string;
-                description
-                  "VRF Name";
-              }
-            }
-          }
-          container target-addresses {
-            description
-              "SNMP Target address configurations";
-            list target-address {
-              key "ip-address";
-              description
-                "IP Address to be configured for the Target";
-              leaf ip-address {
-                type inet:ip-address-no-zone;
-                description
-                  "IPv4/Ipv6 address";
-              }
-            }
-          }
-          leaf target-list-name {
-            type xr:Cisco-ios-xr-string;
-            description
-              "Name of the target list";
-          }
-        }
-      }
-    }
-    container notification {
-      description
-        "Enable SNMP notifications";
-      container snmp {
-        description
-          "SNMP notification configuration";
-        leaf authentication {
-          type empty;
-          description
-            "Enable authentication notification";
-        }
-        leaf cold-start {
-          type empty;
-          description
-            "Enable cold start notification";
-        }
-        leaf warm-start {
-          type empty;
-          description
-            "Enable warm start notification";
-        }
-        leaf enable {
-          type empty;
-          description
-            "Enable SNMP notifications";
-        }
-      }
-    }
-    container correlator {
-      description
-        "Configure properties of the trap correlator";
-      container rules {
-        description
-          "Table of configured rules";
-        list rule {
-          key "name";
-          description
-            "Rule name";
-          container non-stateful {
-            description
-              "The Non-Stateful Rule Type";
-            container root-causes {
-              description
-                "Table of configured rootcause (only one
-                 entry allowed)";
-              list root-cause {
-                key "oid";
-                description
-                  "The rootcause - maximum of one can be
-                   configured per rule";
-                leaf created {
-                  type empty;
-                  description
-                    "Create rootcause";
-                }
-                leaf oid {
-                  type string;
-                  description
-                    "OID of rootcause trap (dotted decimal)";
-                }
-                uses VAR-BIND-TABLE;
-              }
-            }
-            container non-root-causes {
-              description
-                "Table of configured non-rootcause";
-              list non-root-cause {
-                key "oid";
-                description
-                  "A non-rootcause";
-                leaf created {
-                  type empty;
-                  description
-                    "Create nonrootcause";
-                }
-                leaf oid {
-                  type string;
-                  description
-                    "OID of nonrootcause trap (dotted decimal)";
-                }
-                uses VAR-BIND-TABLE;
-              }
-            }
-            leaf timeout {
-              type uint32 {
-                range "1..600000";
-              }
-              units "millisecond";
-              description
-                "Timeout (time to wait for active
-                 correlation) in milliseconds";
-            }
-          }
-          leaf created {
-            type empty;
-            description
-              "Create rule";
-          }
-          leaf name {
-            type string {
-              length "1..32";
-            }
-            description
-              "Rule name";
-          }
-          uses APPLIED-TO;
-        }
-      }
-      container rule-sets {
-        description
-          "Table of configured rulesets";
-        list rule-set {
-          key "name";
-          description
-            "Ruleset name";
-          container rulenames {
-            description
-              "Table of configured rulenames";
-            list rulename {
-              key "rulename";
-              description
-                "A rulename";
-              leaf rulename {
-                type string {
-                  length "1..32";
-                }
-                description
-                  "Rule name";
-              }
-            }
-          }
-          leaf name {
-            type string {
-              length "1..32";
-            }
-            description
-              "Ruleset name";
-          }
-          uses APPLIED-TO;
-        }
-      }
-      leaf buffer-size {
-        type uint32 {
-          range "1024..52428800";
-        }
-        description
-          "Configure size of the correlator buffer";
-      }
-    }
-    container bulk-stats {
-      description
-        "SNMP bulk stats configuration commands";
-      container schemas {
-        description
-          "Configure schema definition";
-        list schema {
-          key "schema-name";
-          description
-            "The name of the Schema";
-          container instance {
-            presence "Indicates a instance node is configured.";
-            description
-              "Object instance information";
-            leaf type {
-              type Snmp-bulkstat-schema;
-              mandatory true;
-              description
-                "Type of the instance";
-            }
-            leaf instance {
-              type xr:Interface-name;
-              description
-                "Instance of the schema";
-            }
-            leaf start {
-              type string;
-              mandatory true;
-              description
-                "Start Instance OID for repetition";
-            }
-            leaf end {
-              type string;
-              mandatory true;
-              description
-                "End Instance OID for repetition";
-            }
-            leaf max {
-              type uint32;
-              mandatory true;
-              description
-                "Max value of Instance repetition";
-            }
-            leaf sub-interface {
-              type boolean;
-              mandatory true;
-              description
-                "Include all the subinterface";
-            }
-          }
-          leaf type {
-            type empty;
-            description
-              "Configure schema name";
-          }
-          leaf schema-object-list {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of an object List";
-          }
-          leaf poll-interval {
-            type uint32 {
-              range "1..20000";
-            }
-            units "minute";
-            description
-              "Periodicity for polling of objects in this
-               schema in minutes";
-          }
-          leaf schema-name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "The name of the schema";
-          }
-        }
-      }
-      container objects {
-        description
-          "Configure an Object List ";
-        list object {
-          key "object-list-name";
-          description
-            "Name of the object List";
-          container objects {
-            description
-              "Configure an object List";
-            list object {
-              key "oid";
-              description
-                "Object name or OID";
-              leaf oid {
-                type string;
-                description
-                  "Object name or OID ";
-              }
-            }
-          }
-          leaf type {
-            type empty;
-            description
-              "Configure object list name";
-          }
-          leaf object-list-name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of the object List";
-          }
-        }
-      }
-      container transfers {
-        description
-          "Periodicity for the transfer of bulk data in
-           minutes";
-        list transfer {
-          key "transfer-name";
-          description
-            "Name of bulk transfer";
-          container transfer-schemas {
-            description
-              "Schema that contains objects to be collected";
-            list transfer-schema {
-              key "schema-name";
-              description
-                "Schema that contains objects to be collected";
-              leaf schema-name {
-                type xr:Cisco-ios-xr-string {
-                  length "1..32";
-                }
-                description
-                  "Schema that contains objects to be
-                   collected";
-              }
-            }
-          }
-          leaf secondary {
-            type string;
-            description
-              "FTP or rcp or TFTP can be used for file
-               transfer";
-          }
-          leaf type {
-            type empty;
-            description
-              "Configure transfer list name";
-          }
-          leaf buffer-size {
-            type uint32 {
-              range "1024..2147483647";
-            }
-            units "byte";
-            description
-              "Bulkstat data file maximum size in bytes";
-          }
-          leaf retain {
-            type uint32 {
-              range "0..20000";
-            }
-            units "minute";
-            description
-              "Retention period in minutes";
-          }
-          leaf format {
-            type Snmp-bulkstat-file-format;
-            description
-              "Format of the bulk data file";
-          }
-          leaf retry {
-            type uint32 {
-              range "0..100";
-            }
-            description
-              "Number of transmission retries";
-          }
-          leaf enable {
-            type empty;
-            description
-              "Start Data Collection for this Configuration";
-          }
-          leaf primary {
-            type string;
-            description
-              "FTP or rcp or TFTP can be used for file
-               transfer";
-          }
-          leaf interval {
-            type uint32;
-            units "minute";
-            description
-              "Periodicity for the transfer of bulk data in
-               minutes";
-          }
-          leaf transfer-name {
-            type xr:Cisco-ios-xr-string {
-              length "1..32";
-            }
-            description
-              "Name of bulk transfer";
-          }
-        }
-      }
-      leaf memory {
-        type uint32 {
-          range "100..200000";
-        }
-        units "kilobyte";
-        description
-          "per process memory limit in kilo bytes";
-      }
-    }
-    container default-community-maps {
-      description
-        "Container class to hold unencrpted community map";
-      list default-community-map {
-        key "community-name";
-        description
-          "Unencrpted SNMP community map name ";
-        leaf community-name {
-          type xr:Cisco-ios-xr-string {
-            length "1..128";
-          }
-          description
-            "SNMP community map";
-        }
-        leaf context {
-          type string;
-          description
-            "SNMP Context Name ";
-        }
-        leaf security {
-          type string;
-          description
-            "SNMP Security Name ";
-        }
-        leaf target-list {
-          type string;
-          description
-            "target list name ";
-        }
-      }
-    }
-    container overload-control {
-      presence "Indicates a overload-control node is configured.";
-      description
-        "Set overload control params for handling
-         incoming messages";
-      leaf drop-time {
-        type uint32 {
-          range "0..300";
-        }
-        units "second";
-        mandatory true;
-        description
-          "Drop time in seconds for incoming queue
-           (default 1 sec)";
-      }
-      leaf throttle-rate {
-        type uint32 {
-          range "0..1000";
-        }
-        units "millisecond";
-        mandatory true;
-        description
-          "Throttle time in milliseconds for incoming
-           queue (default 500 msec)";
-      }
-    }
-    container timeouts {
-      description
-        "SNMP timeouts";
-      leaf duplicates {
-        type uint32 {
-          range "0..20";
-        }
-        units "second";
-        default "1";
-        description
-          "Duplicate request feature timeout";
-      }
-      leaf in-qdrop {
-        type uint32 {
-          range "0..20";
-        }
-        units "second";
-        default "10";
-        description
-          "incoming queue drop feature timeout";
-      }
-      leaf threshold {
-        type uint32 {
-          range "0..100000";
-        }
-        units "second";
-        default "50000";
-        description
-          "Threshold request feature timeout";
-      }
-      leaf subagent {
-        type uint32 {
-          range "1..20";
-        }
-        units "second";
-        default "10";
-        description
-          "Sub-Agent Request timeout";
-      }
-      leaf pdu-stats {
-        type uint32 {
-          range "1..10";
-        }
-        units "second";
-        default "2";
-        description
-          "SNMP pdu statistics timeout";
-      }
-    }
-    container users {
-      description
-        "Define a user who can access the SNMP engine";
-      list user {
-        key "user-name";
-        description
-          "Name of the user";
-        leaf user-name {
-          type string;
-          description
-            "Name of the user";
-        }
-        leaf group-name {
-          type string;
-          mandatory true;
-          description
-            "Group to which the user belongs";
-        }
-        leaf version {
-          type User-snmp-version;
-          mandatory true;
-          description
-            "SNMP version to be used. v1,v2c or v3";
-        }
-        leaf authentication-password-configured {
-          type empty;
-          description
-            "Flag to indicate that authentication password
-             is configred for version 3";
-        }
-        leaf algorithm {
-          type Snmp-hash-algorithm;
-          description
-            "The algorithm used md5 or sha";
-        }
-        leaf authentication-password {
-          type xr:Proprietary-password;
-          description
-            "The authentication password";
-        }
-        leaf privacy-password-configured {
-          type empty;
-          description
-            "Flag to indicate that the privacy password is
-             configured for version 3";
-        }
-        leaf priv-algorithm {
-          type Snmp-priv-algorithm;
-          description
-            "The algorithm used des56 or aes128 or aes192or
-             aes256 or 3des";
-        }
-        leaf privacy-password {
-          type xr:Proprietary-password;
-          description
-            "The privacy password";
-        }
-        leaf v4acl-type {
-          type Snmpacl;
-          description
-            "Access-list type";
-        }
-        leaf v4-access-list {
-          type string;
-          description
-            "Ipv4 Access-list name";
-        }
-        leaf v6acl-type {
-          type Snmpacl;
-          description
-            "Access-list type";
-        }
-        leaf v6-access-list {
-          type string;
-          description
-            "Ipv6 Access-list name";
-        }
-        leaf owner {
-          type Snmp-owner-access;
-          description
-            "The system access either SDROwner or
-             SystemOwner";
-        }
-        leaf remote-address {
-          type inet:ip-address-no-zone;
-          description
-            "IP address of remote SNMP entity";
-        }
-        leaf port {
-          type xr:Cisco-ios-xr-port-number;
-          description
-            "UDP port number";
-        }
-        leaf user-auth-type {
-          type uint32;
-          description
-            "User Authentication Type";
-        }
-        leaf user-priv-auth-type {
-          type uint32;
-          description
-            "User Priv Authentication Type";
-        }
-      }
-    }
-    container vrfs {
-      description
-        "SNMP VRF configuration commands";
-      list vrf {
-        key "name";
-        description
-          "VRF name";
-        leaf name {
-          type xr:Cisco-ios-xr-string;
-          description
-            "VRF name";
-        }
-        uses TRAP-HOST-TABLE;
-        uses CONTEXT-TABLE;
-        uses CONTEXT-MAPPING-TABLE;
-      }
-    }
-    container groups {
-      description
-        "Define a User Security Model group";
-      list group {
-        key "name";
-        description
-          "Name of the group";
-        leaf name {
-          type xr:Cisco-ios-xr-string {
-            length "1..128";
-          }
-          description
-            "Name of the group";
-        }
-        leaf snmp-version {
-          type Group-snmp-version;
-          mandatory true;
-          description
-            "snmp version";
-        }
-        leaf security-model {
-          type Snmp-security-model;
-          description
-            "security model like auth/noAuth/Priv
-             applicable for v3";
-        }
-        leaf notify-view {
-          type string;
-          description
-            "notify view name";
-        }
-        leaf read-view {
-          type string;
-          description
-            "read view name";
-        }
-        leaf write-view {
-          type string;
-          description
-            "write view name";
-        }
-        leaf v4acl-type {
-          type Snmpacl;
-          description
-            "Access-list type";
-        }
-        leaf v4-access-list {
-          type string;
-          description
-            "Ipv4 Access-list name";
-        }
-        leaf v6acl-type {
-          type Snmpacl;
-          description
-            "Access-list type";
-        }
-        leaf v6-access-list {
-          type string;
-          description
-            "Ipv6 Access-list name";
-        }
-        leaf context-name {
-          type string;
-          description
-            "Context name";
-        }
-      }
-    }
-    leaf inform-retries {
-      type uint32 {
-        range "0..100";
-      }
-      description
-        "Number of times to retry an Inform request
-         (default 3)";
-    }
-    leaf trap-port {
-      type uint32 {
-        range "1024..65535";
-      }
-      description
-        "Change the source port of all traps";
-    }
-    leaf oid-poll-stats {
-      type empty;
-      description
-        "Enable Poll OID statistics";
-    }
-    leaf trap-source {
-      type xr:Interface-name;
-      description
-        "Assign an interface for the source address of
-         all traps";
-    }
-    leaf vrf-authentication-trap-disable {
-      type empty;
-      description
-        "Disable authentication traps for packets on a
-         vrf";
-    }
-    leaf inform-timeout {
-      type uint32 {
-        range "1..42949671";
-      }
-      units "second";
-      description
-        "Timeout value in seconds for Inform request
-         (default 15 sec)";
-    }
-    leaf trap-source-ipv6 {
-      type xr:Interface-name;
-      description
-        "Assign an interface for the source IPV6 address
-         of all traps";
-    }
-    leaf packet-size {
-      type uint32 {
-        range "484..65500";
-      }
-      description
-        "Largest SNMP packet size";
-    }
-    leaf throttle-time {
-      type uint32 {
-        range "50..1000";
-      }
-      description
-        "Throttle time for incoming queue (default 0
-         msec)";
-    }
-    leaf trap-source-ipv4 {
-      type xr:Interface-name;
-      description
-        "Assign an interface for the source address of
-         all traps";
-    }
-    leaf inform-pending {
-      type uint32 {
-        range "0..4294967295";
-      }
-      description
-        "Max nmber of informs to hold in queue, (default
-         25)";
-    }
-    uses TRAP-HOST-TABLE;
-    uses CONTEXT-TABLE;
-    uses CONTEXT-MAPPING-TABLE;
-  }
-  container mib {
-    description
-      "The heirarchy point for all the MIB
-       configurations";
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-act.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-act.yang
deleted file mode 100644
index 70a428e56..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-act.yang
+++ /dev/null
@@ -1,801 +0,0 @@
-module Cisco-IOS-XR-spirit-install-act {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-spirit-install-act";
-  prefix spirit-install-act;
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR action package configuration.
-     
-     Copyright (c) 2016-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-10-01 {
-    description
-      "Made changes to be RFC6087 compliant";
-    semver:module-version "1.1.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2018-09-10 {
-    description
-      "Added output container with op-id and Error as leaf node";
-  }
-  revision 2017-10-23 {
-    description
-      "Yang support for all install action cli's";
-  }
-  revision 2017-07-27 {
-    description
-      "IOS XR 6.4.1 revision.";
-  }
-
-  rpc install-add {
-    description
-      "Cli-command install add source";
-    input {
-      leaf packagepath {
-        type string;
-        description
-          "install add source Package path";
-      }
-      leaf-list packagename {
-        type string;
-        max-elements "31";
-        description
-          "install add source Package name";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-commit {
-    description
-      "Cli-command install commit";
-    input {
-      leaf sdr {
-        type empty;
-        description
-          "commit packages in the system";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-remove {
-    description
-      "Cli-command remove";
-    input {
-      container packages {
-        description
-          "install remove packages";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install remove package name";
-        }
-      }
-      container ids {
-        description
-          "install remove ids";
-        leaf-list id-no {
-          type string;
-          max-elements "32";
-          description
-            "install remove id number";
-        }
-      }
-      leaf inactive {
-        type empty;
-        description
-          "Remove inactive packages from XR repo";
-      }
-      leaf inactiveall {
-        type empty;
-        description
-          "Remove inactive packages from Host,Sysadmin and XR repo";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-prepare {
-    description
-      "Cli-command prepare";
-    input {
-      container packages {
-        description
-          "install prepare packages";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install prepare package name";
-        }
-      }
-      container ids {
-        description
-          "install prepare ids";
-        leaf-list id-no {
-          type string;
-          max-elements "32";
-          description
-            "install prepare id number";
-        }
-      }
-      leaf clean {
-        type empty;
-        description
-          "Clean the prepared packages";
-      }
-      container prepare-force {
-        description
-          "install prepare force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install prepare force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install prepare force ids";
-        }
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-activate {
-    description
-      "Cli-command activate";
-    input {
-      container warm {
-        description
-          "install warm";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install warm package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install warm ids";
-        }
-      }
-      container warm-force {
-        description
-          "install warm force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install warm force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install warm force ids";
-        }
-      }
-      container warm-replace {
-        description
-          "install warm replace";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install warm replace package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install warm replace ids";
-        }
-      }
-      container warm-replace-force {
-        description
-          "install warm replace force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install warm replace force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install warm replace force ids";
-        }
-      }
-      container reload {
-        description
-          "install reload";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install reload package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install reload ids";
-        }
-      }
-      container reload-force {
-        description
-          "install reload force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install reload force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install reload force ids";
-        }
-      }
-      container replace {
-        description
-          "install replace";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install replace package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install replace ids";
-        }
-      }
-      container replace-force {
-        description
-          "install replace force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install replace force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install replace force ids";
-        }
-      }
-      container activate-force {
-        description
-          "install activate force";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install activate force package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install activate force ids";
-        }
-      }
-      container packages {
-        description
-          "install activate packages";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install activate package name";
-        }
-      }
-      container ids {
-        description
-          "install activate ids";
-        leaf-list id-no {
-          type string;
-          max-elements "32";
-          description
-            "install activate id number";
-        }
-      }
-      leaf activate_prepared_pkg {
-        type empty;
-        description
-          "Activate the prepared package";
-      }
-      leaf force {
-        type empty;
-        description
-          "Activate the prepared package with force option";
-      }
-      leaf activate-reload {
-        type empty;
-        description
-          "Activate the prepared package with reload option";
-      }
-      leaf activate-reload-force {
-        type empty;
-        description
-          "Activate the prepared package with reload force option";
-      }
-      leaf activate_warm_prepared_pkg {
-        type empty;
-        description
-          "Activate the prepared package with warm option";
-      }
-      leaf activate_warm_force_prepared_pkg {
-        type empty;
-        description
-          "Activate the prepared package with warm force option";
-      }
-      leaf activate_warm_replace_prepared_pkg {
-        type empty;
-        description
-          "Activate the prepared package with warm replace option";
-      }
-      leaf activate_warm_force_replace_prepared_pkg {
-        type empty;
-        description
-          "Activate the prepared package with warm force replace option";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-deactivate {
-    description
-      "Cli-command deactivate";
-    input {
-      container reload {
-        description
-          "install deactivate reload";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install deactivate reload package name";
-        }
-        leaf-list ids {
-          type string;
-          max-elements "32";
-          description
-            "install deactivate reload ids";
-        }
-      }
-      container packages {
-        description
-          "install deactivate packages";
-        leaf-list packagename {
-          type string;
-          max-elements "32";
-          description
-            "install deactivate package name";
-        }
-      }
-      container ids {
-        description
-          "install deactivate ids";
-        leaf-list id-no {
-          type string;
-          max-elements "32";
-          description
-            "install deactivate id number";
-        }
-      }
-      leaf superseded {
-        type empty;
-        description
-          "Deactivate all superseded packages";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-extract {
-    description
-      "Cli-command extract";
-    input {
-      container packages {
-        description
-          "install extract packages";
-        leaf-list packagename {
-          type string;
-          max-elements "1";
-          description
-            "install extract package name";
-        }
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-verify {
-    description
-      "Cli-command install verify packages";
-    input {
-      leaf-list location {
-        type string;
-        max-elements "32";
-        description
-          "install verify packages location";
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-update {
-    description
-      "Cli-command install update";
-    input {
-      leaf packagepath {
-        type string;
-        description
-          "install update package path";
-      }
-      leaf-list packagename {
-        type string;
-        max-elements "31";
-        description
-          "install update package name";
-      }
-      container warm {
-        description
-          "install update warm";
-        leaf packagepath {
-          type string;
-          description
-            "install update warm package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update warm package name";
-        }
-      }
-      container warm-force {
-        description
-          "install update warm force";
-        leaf packagepath {
-          type string;
-          description
-            "install update warm force package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update warm force package name";
-        }
-      }
-      container warm-replace {
-        description
-          "install update warm replace";
-        leaf packagepath {
-          type string;
-          description
-            "install update warm replace package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update warm replace package name";
-        }
-      }
-      container warm-replace-force {
-        description
-          "install update warm replace force";
-        leaf packagepath {
-          type string;
-          description
-            "install update warm replace force package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update warm replace force package name";
-        }
-      }
-      container force {
-        description
-          "install update force";
-        leaf packagepath {
-          type string;
-          description
-            "install update force package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update force package name";
-        }
-      }
-      container replace {
-        description
-          "install update replace";
-        leaf packagepath {
-          type string;
-          description
-            "install update replace package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update replace package name";
-        }
-      }
-      container replace-force {
-        description
-          "install update replace force";
-        leaf packagepath {
-          type string;
-          description
-            "install update replace force package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update replace force package name";
-        }
-      }
-      container replace-commit {
-        description
-          "install update replace commit";
-        leaf packagepath {
-          type string;
-          description
-            "install update replace commit package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update replace commit package name";
-        }
-      }
-      container replace-commit-force {
-        description
-          "install update replace commit force";
-        leaf packagepath {
-          type string;
-          description
-            "install update replace commit force package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install update replace commit force package name";
-        }
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-replace {
-    description
-      "Add & Activate packages in given GISO";
-    input {
-      leaf packagepath {
-        type string;
-        description
-          "install replace package patch";
-      }
-      container commit {
-        description
-          "install replace commit";
-        leaf packagepath {
-          type string;
-          description
-            "install replace commit package path";
-        }
-      }
-      container commit-force {
-        description
-          "install replace commit force";
-        leaf packagepath {
-          type string;
-          description
-            "install replace commit force package path";
-        }
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-  rpc install-source {
-    description
-      "Cli-command install source";
-    input {
-      leaf packagepath {
-        type string;
-        description
-          "install source package path";
-      }
-      leaf-list packagename {
-        type string;
-        max-elements "31";
-        description
-          "install source package name";
-      }
-      container reload {
-        description
-          "install source reload";
-        leaf packagepath {
-          type string;
-          description
-            "install source reload package path";
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-          description
-            "install source reload package name";
-        }
-      }
-      container warm {
-        leaf packagepath {
-          type string;
-        }
-        leaf-list packagename {
-          type string;
-          max-elements "31";
-        }
-      }
-    }
-    output {
-      leaf op-id {
-        type string;
-        description
-          "operation id of the triggered action";
-      }
-      leaf Error {
-        type string;
-        description
-          "case when op-id is not triggered";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang
deleted file mode 100644
index 90f165262..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub1.yang
+++ /dev/null
@@ -1,596 +0,0 @@
-submodule Cisco-IOS-XR-spirit-install-instmgr-oper-sub1 {
-  belongs-to Cisco-IOS-XR-spirit-install-instmgr-oper {
-    prefix Cisco-IOS-XR-spirit-install-instmgr-oper;
-  }
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This submodule contains a collection of YANG definitions
-     for Cisco IOS-XR spirit-install-instmgr package operational data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "2.1.0";
-  }
-  revision 2018-11-29 {
-    description
-      "Structured the yang response for show CLIs.";
-  }
-  revision 2018-08-24 {
-    description
-      "Changed model structure for software version and deprecated img-info node.";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2017-07-24 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef Inst-req-state {
-    type enumeration {
-      enum "in-progress" {
-        value 0;
-        description
-          "In progress";
-      }
-      enum "success" {
-        value 1;
-        description
-          "Success";
-      }
-      enum "failure" {
-        value 2;
-        description
-          "Failure";
-      }
-    }
-    description
-      "Install request state type";
-  }
-
-  typedef Install-opt-string {
-    type string;
-    description
-      "Install opt string";
-  }
-
-  grouping INST-ALL-PKG-TYPE {
-    description
-      "Information for all nodes";
-    leaf node {
-      type string;
-      description
-        "Node";
-    }
-    list package {
-      description
-        "Details of package";
-      uses INST-PKG-TYPE;
-    }
-  }
-
-  grouping INST-ALL-PACKAGES-BAG {
-    description
-      "Package result bag";
-    list node {
-      description
-        "node name";
-      uses INST-ALL-PKG-TYPE;
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-LOG {
-    description
-      "show install log info";
-    container input-packages {
-      description
-        "packages given when triggering the operation";
-      uses PACKAGE-LIST;
-    }
-    container skipped-packages {
-      description
-        "packages skipped";
-      uses PACKAGE-LIST;
-    }
-    leaf raw-data {
-      type string;
-      description
-        "RawData";
-    }
-    leaf op-id {
-      type uint32;
-      description
-        "OpId";
-    }
-    leaf action {
-      type string;
-      description
-        "Operation triggered";
-    }
-    leaf status {
-      type Inst-req-state;
-      description
-        "Status of operation";
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-SUP-SUMMARY {
-    description
-      "show install superseded summary info";
-    container packages {
-      description
-        "List of packages";
-      uses PACKAGE-LIST-SUP;
-    }
-    leaf number-of-packages {
-      type uint32;
-      description
-        "NumberOfPackages";
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping INST-REQUEST-BAG {
-    description
-      "Request result bag";
-    leaf request {
-      type string;
-      description
-        "The last user request";
-    }
-    leaf state {
-      type Inst-req-state;
-      description
-        "The state of the last user request";
-    }
-    leaf timestamp {
-      type string;
-      description
-        "The time the current state was entered";
-    }
-    leaf error {
-      type string;
-      description
-        "String describing the error, if any";
-    }
-    leaf operation-id {
-      type Install-opt-string;
-      description
-        "Operation ID of the ongoing or  previous
-         completed install operation";
-    }
-  }
-
-  grouping INSTMGR-REPO {
-    description
-      "contains packages in repository";
-    container packages {
-      description
-        "Package in repository";
-      uses PACKAGE-LIST;
-    }
-    leaf number-of-packages {
-      type uint32;
-      description
-        "NumberOfPackages";
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-REPO {
-    description
-      "show install repository info";
-    container host {
-      description
-        "Host packages";
-      uses INSTMGR-REPO;
-    }
-    container admin {
-      description
-        "Admin packages";
-      uses INSTMGR-REPO;
-    }
-    container xr {
-      description
-        "XR packages";
-      uses INSTMGR-REPO;
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping INST-VER-PKG-TYPE {
-    description
-      "Install package type";
-    leaf name {
-      type string;
-      description
-        "Name";
-    }
-    leaf version {
-      type string;
-      description
-        "Version";
-    }
-    leaf built-by {
-      type string;
-      description
-        "User built by";
-    }
-    leaf built-on {
-      type string;
-      description
-        "Time built";
-    }
-    leaf workspace {
-      type string;
-      description
-        "Workspace built in";
-    }
-    leaf build-host {
-      type string;
-      description
-        "Build host";
-    }
-  }
-
-  grouping INST-VERSION-BAG {
-    description
-      "Install version bag";
-    leaf label {
-      type string;
-      description
-        "Label";
-    }
-    leaf copyright-info {
-      type string;
-      description
-        "Copyright information";
-    }
-    leaf hardware-info {
-      type string;
-      description
-        "Hardware information";
-    }
-    leaf uptime {
-      type string;
-      description
-        "System uptime";
-    }
-    leaf location {
-      type Install-opt-string;
-      description
-        "Prefix for the path where packages will be
-         installed";
-    }
-    leaf processor {
-      type Install-opt-string;
-      description
-        "Processor";
-    }
-    list package {
-      description
-        "Packages";
-      uses INST-VER-PKG-TYPE;
-    }
-  }
-
-  grouping INST-TOP-LEVEL-PKG-TYPE {
-    description
-      "Install user-installable package type";
-    leaf name {
-      type string;
-      description
-        "Package name";
-    }
-    leaf architecture {
-      type string;
-      description
-        "Architecture";
-    }
-    leaf version {
-      type string;
-      description
-        "Version";
-    }
-    leaf release {
-      type string;
-      description
-        "Release";
-    }
-    leaf epoch {
-      type Install-opt-string;
-      description
-        "Epoch";
-    }
-    leaf xr-mandatory {
-      type boolean;
-      description
-        "XR Mandatory";
-    }
-    leaf xr-optional {
-      type boolean;
-      description
-        "XR Optional";
-    }
-    leaf gpg-key-id {
-      type Install-opt-string;
-      description
-        "The GPG key ID at install time. A key ID of '0'
-         indicates a package with no GPG signature.";
-    }
-  }
-
-  grouping INST-SUMMARY-PACKAGES-BAG {
-    description
-      "Summary packages result bag";
-    leaf xr-packages-hash {
-      type string;
-      description
-        "Hash of XR packages";
-    }
-    list package {
-      description
-        "Packages";
-      uses INST-TOP-LEVEL-PKG-TYPE;
-    }
-  }
-
-  grouping INST-PACKAGES-BAG {
-    description
-      "Package result bag";
-    list package {
-      description
-        "Packages";
-      uses INST-PKG-TYPE;
-    }
-  }
-
-  grouping INSTMGR-YANG-SHOW-INSTALL-PREPARE {
-    description
-      "show install prepare";
-    container packages {
-      description
-        "prepared packages";
-      uses PACKAGE-LIST;
-    }
-    leaf no-prepare-done {
-      type string;
-      description
-        "NoPrepareDone";
-    }
-    leaf prepared-boot-image {
-      type string;
-      description
-        "boot image name";
-    }
-    leaf prepared-boot-partition {
-      type string;
-      description
-        "boot partition name";
-    }
-    leaf restart-type {
-      type string;
-      description
-        "RestartType";
-    }
-  }
-
-  grouping PACKAGE-LIST {
-    description
-      "List of packages";
-    list package {
-      description
-        "Details of package";
-      uses INST-PKG-TYPE;
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-INACTIVE {
-    description
-      "show install inactive/inactive summary info";
-    container packages {
-      description
-        "inactive packages";
-      uses PACKAGE-LIST;
-    }
-    leaf number-of-packages {
-      type uint32;
-      description
-        "NumberOfPackages";
-    }
-    leaf node {
-      type string;
-      description
-        "Node";
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping INSTMGR-SHOW-VALID-LOGID {
-    description
-      "show valid lod ids";
-    leaf from {
-      type uint32;
-      description
-        "From";
-    }
-    leaf to {
-      type uint32;
-      description
-        "To";
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping SUPERSEDED-INFO {
-    description
-      "contains superseded-by details of a package";
-    list package {
-      description
-        "Details of package";
-      uses INST-PKG-TYPE;
-    }
-  }
-
-  grouping INST-PKG-TYPE {
-    description
-      "Install package type";
-    leaf name {
-      type string;
-      description
-        "Package name";
-    }
-    leaf architecture {
-      type string;
-      description
-        "Architecture";
-    }
-    leaf version {
-      type string;
-      description
-        "Version";
-    }
-    leaf release {
-      type string;
-      description
-        "Release";
-    }
-    leaf epoch {
-      type Install-opt-string;
-      description
-        "Epoch";
-    }
-    leaf gpg-key-id {
-      type Install-opt-string;
-      description
-        "The GPG key ID at install time. A key ID of '0'
-         indicates a package with no GPG signature.";
-    }
-  }
-
-  grouping PACKAGE-INFO-SUP {
-    description
-      "List of packages";
-    list package {
-      description
-        "superseded package";
-      uses INST-PKG-TYPE;
-    }
-    list superseded-by {
-      description
-        "superseding packages";
-      uses SUPERSEDED-INFO;
-    }
-  }
-
-  grouping PACKAGE-LIST-SUP {
-    description
-      "List of packages";
-    list superseded-package {
-      description
-        "info of packages superseded";
-      uses PACKAGE-INFO-SUP;
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-SUPERSEDED-ROW {
-    description
-      "show install superseded";
-    container packages {
-      description
-        "Superseded packages";
-      uses PACKAGE-LIST-SUP;
-    }
-    leaf location {
-      type string;
-      description
-        "node location";
-    }
-    leaf node-type {
-      type string;
-      description
-        "type of node";
-    }
-    leaf boot-partition-name {
-      type string;
-      description
-        "name of boot partition";
-    }
-    leaf number-of-packages {
-      type uint32;
-      description
-        "package count";
-    }
-    leaf error {
-      type string;
-      description
-        "Error";
-    }
-  }
-
-  grouping INSTMGR-SHOW-INST-SUPERSEDED {
-    description
-      "show install superseded info";
-    list package-info {
-      description
-        "Superseded package info";
-      uses INSTMGR-SHOW-INST-SUPERSEDED-ROW;
-    }
-  }
-
-  grouping INSTALL-LOG {
-    description
-      "Install Log";
-    leaf log {
-      type string;
-      description
-        "operation log";
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang
deleted file mode 100644
index 3396309e8..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper-sub2.yang
+++ /dev/null
@@ -1,447 +0,0 @@
-submodule Cisco-IOS-XR-spirit-install-instmgr-oper-sub2 {
-  belongs-to Cisco-IOS-XR-spirit-install-instmgr-oper {
-    prefix Cisco-IOS-XR-spirit-install-instmgr-oper;
-  }
-
-  import cisco-semver {
-    prefix semver;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This submodule contains a collection of YANG definitions
-     for Cisco IOS-XR spirit-install-instmgr package operational data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "2.1.0";
-  }
-  revision 2018-11-29 {
-    description
-      "Structured the yang response for show CLIs.";
-  }
-  revision 2018-08-24 {
-    description
-      "Changed model structure for software version and deprecated img-info node.";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2017-07-24 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef Node-role-et {
-    type enumeration {
-      enum "node-unknown" {
-        description
-          "Unknown";
-      }
-      enum "node-active" {
-        description
-          "Active";
-      }
-      enum "node-standby" {
-        description
-          "Standby";
-      }
-      enum "node-unusable" {
-        description
-          "Unusable";
-      }
-    }
-    description
-      "node role";
-  }
-
-  typedef Issudir-node-status-et {
-    type enumeration {
-      enum "not-issu-ready" {
-        description
-          "Not ISSU Ready";
-      }
-      enum "issu-ready" {
-        description
-          "ISSU Ready";
-      }
-      enum "isus-go" {
-        description
-          "ISSU Go";
-      }
-      enum "node-fail" {
-        description
-          "Node Fail";
-      }
-    }
-    description
-      "ISSU node status";
-  }
-
-  typedef Issu-node-role-et {
-    type enumeration {
-      enum "unknown-role" {
-        description
-          "Unknown";
-      }
-      enum "primary-role" {
-        description
-          "Primary";
-      }
-      enum "secondary-role" {
-        description
-          "Secondary";
-      }
-      enum "tertiary-role" {
-        description
-          "Tertiary";
-      }
-    }
-    description
-      "ISSU role";
-  }
-
-  typedef Card-type-et {
-    type enumeration {
-      enum "card-rp" {
-        description
-          "Card RP";
-      }
-      enum "card-drp" {
-        description
-          "Card DRP";
-      }
-      enum "card-lc" {
-        description
-          "Card LC";
-      }
-      enum "card-sc" {
-        description
-          "Card SC";
-      }
-      enum "card-sp" {
-        description
-          "Card SP";
-      }
-      enum "card-other" {
-        description
-          "Card Other";
-      }
-    }
-    description
-      "card type";
-  }
-
-  typedef Isd-error-et {
-    type enumeration {
-      enum "none" {
-        description
-          "ISD ERROR NONE";
-      }
-      enum "not-compatible" {
-        description
-          "ISD ERROR NOT COMPATIBLE";
-      }
-      enum "not-enough-resource" {
-        description
-          "ISD ERROR NOT ENOUGH RESOURCE";
-      }
-      enum "not-nsr-ready" {
-        description
-          "ISD ERROR NOT NSR READY";
-      }
-      enum "not-conn-sdrsm" {
-        description
-          "ISD ERROR NOT CONNECTED SDR SM";
-      }
-      enum "cmd-invalid" {
-        description
-          "ISD ERROR INST CMD INVALID";
-      }
-      enum "load-prep-fail" {
-        description
-          "ISD ERROR INST LOAD PREP FAILURE";
-      }
-      enum "error-timeout" {
-        description
-          "ISD ERROR TIMEOUT";
-      }
-      enum "err-node-down" {
-        description
-          "ISD ERROR NODE DOWN";
-      }
-      enum "node-not-ready" {
-        description
-          "ISD ERROR NODE NOT READY";
-      }
-      enum "err-node-new" {
-        description
-          "ISD ERROR NODE NEW";
-      }
-      enum "err-card-oir" {
-        description
-          "ISD ERROR CARD OIR";
-      }
-      enum "invalid-evt" {
-        description
-          "ISD ERROR INVALID EVT";
-      }
-      enum "disconn-from-calv" {
-        description
-          "ISD ERROR DISCONN FROM CALVADOS";
-      }
-      enum "gsp-down" {
-        description
-          "ISD ERROR GSP DOWN";
-      }
-      enum "abort-by-ism" {
-        description
-          "ISD ERROR ABORT BY ISM";
-      }
-      enum "rpfo" {
-        description
-          "ISD ERROR RPFO";
-      }
-      enum "pkg-null" {
-        description
-          "ISD ERROR PKG NULL";
-      }
-      enum "error-general" {
-        description
-          "ISD ERROR GENERAL";
-      }
-      enum "fsa-error" {
-        description
-          "ISD ERROR FSA ERROR";
-      }
-      enum "err-post-issu" {
-        description
-          "ISD ERROR POST ISSU";
-      }
-      enum "err-issu-dir-restart" {
-        description
-          "ISD ERROR ISSUDIR RESTART";
-      }
-    }
-    description
-      "isd error";
-  }
-
-  typedef Isd-issu-status-et {
-    type enumeration {
-      enum "ok" {
-        description
-          "ISSU STATUS OK";
-      }
-      enum "prep-done" {
-        description
-          "ISSU STATUS PREP DONE";
-      }
-      enum "big-bang" {
-        description
-          "ISSU STATUS BIG BANG";
-      }
-      enum "done" {
-        description
-          "ISSU STATUS DONE";
-      }
-      enum "abort" {
-        description
-          "ISSU STATUS ABORT";
-      }
-      enum "cmd-reject" {
-        description
-          "ISSU STATUS CMD REJECT";
-      }
-      enum "unknown" {
-        description
-          "ISSU STATUS UNKNOWN";
-      }
-      enum "abort-cleanup" {
-        description
-          "ISSU STATUS ABORT CLEANUP";
-      }
-      enum "abort-cmd-reject" {
-        description
-          "ISSU STATUS CMD ABORT REJECT";
-      }
-    }
-    description
-      "isd status";
-  }
-
-  typedef Isd-state-et {
-    type enumeration {
-      enum "none" {
-        description
-          "ISSU ST NONE";
-      }
-      enum "idle" {
-        description
-          "ISSU ST IDLE";
-      }
-      enum "init" {
-        description
-          "ISSU ST INIT";
-      }
-      enum "init-done" {
-        description
-          "ISSU ST INIT DONE";
-      }
-      enum "load-prep" {
-        description
-          "ISSU ST LOAD PREP";
-      }
-      enum "load-exec" {
-        description
-          "ISSU ST LOAD EXEC";
-      }
-      enum "load-issu-go" {
-        description
-          "ISSU ST LOAD ISSU GO";
-      }
-      enum "load-done" {
-        description
-          "ISSU ST LOAD DONE";
-      }
-      enum "run-prep-isd" {
-        description
-          "ISSU ST RUN PREP ISD";
-      }
-      enum "run-prep-ism" {
-        description
-          "ISSU ST RUN PREP ISM";
-      }
-      enum "big-bang" {
-        description
-          "ISSU ST RUN BIG BANG";
-      }
-      enum "run-done" {
-        description
-          "ISSU ST RUN DONE";
-      }
-      enum "cleanup" {
-        description
-          "ISSU ST CLEANUP";
-      }
-      enum "cleanup-done" {
-        description
-          "ISSU ST CLEANUP DONE";
-      }
-      enum "abort" {
-        description
-          "ISSU ST ABORT";
-      }
-      enum "abort-done" {
-        description
-          "ISSU ST ABORT DONE";
-      }
-      enum "abort-cleanup" {
-        description
-          "ISSU ST ABORT CLEANUP";
-      }
-      enum "unknown-state" {
-        description
-          "ISSU UNKNOWN STATE";
-      }
-    }
-    description
-      "isd state";
-  }
-
-  grouping ISD-INV-INFO {
-    description
-      "ISSU Inventory Information";
-    leaf node-id {
-      type int32;
-      description
-        "Node ID";
-    }
-    leaf node-type {
-      type Card-type-et;
-      description
-        "Node Type";
-    }
-    leaf issu-node-role {
-      type Issu-node-role-et;
-      description
-        "ISSU Node Role";
-    }
-    leaf node-state {
-      type Issudir-node-status-et;
-      description
-        "Node State";
-    }
-    leaf node-role {
-      type Node-role-et;
-      description
-        "Node role";
-    }
-  }
-
-  grouping ISD-INV-INFO-CONTAINER {
-    description
-      "ISSU Inventory Information all nodes";
-    list invinfo {
-      description
-        "invinfo";
-      uses ISD-INV-INFO;
-    }
-  }
-
-  grouping ISD-STAGE-INFO {
-    description
-      "ISSU Director stage Information";
-    leaf state {
-      type Isd-state-et;
-      description
-        "State";
-    }
-    leaf issu-node-cnt {
-      type int32;
-      description
-        "ISSU Node Count";
-    }
-    leaf issu-ready-node-cnt {
-      type int32;
-      description
-        "ISSU Ready Node Count";
-    }
-    leaf percentage {
-      type int32;
-      units "percentage";
-      description
-        "Percentage";
-    }
-    leaf issu-status {
-      type Isd-issu-status-et;
-      description
-        "Abort Status";
-    }
-    leaf issu-error {
-      type Isd-error-et;
-      description
-        "ISSU Error";
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper.yang
deleted file mode 100644
index 80f94358c..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-spirit-install-instmgr-oper.yang
+++ /dev/null
@@ -1,269 +0,0 @@
-module Cisco-IOS-XR-spirit-install-instmgr-oper {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-spirit-install-instmgr-oper";
-  prefix spirit-install-instmgr-oper;
-
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  include Cisco-IOS-XR-spirit-install-instmgr-oper-sub2 {
-    revision-date 2019-04-05;
-  }
-  include Cisco-IOS-XR-spirit-install-instmgr-oper-sub1 {
-    revision-date 2019-04-05;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR spirit-install-instmgr package operational data.
-     
-     This module contains definitions
-     for the following management objects:
-       install: Install operations info
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "2.1.0";
-  }
-  revision 2018-11-29 {
-    description
-      "Structured the yang response for show CLIs.";
-  }
-  revision 2018-08-24 {
-    description
-      "Changed model structure for software version and deprecated img-info node.";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2017-07-24 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  grouping SUMMARY {
-    description
-      "Common node of committed, active";
-    container summary {
-      description
-        "Summary information";
-      uses INST-SUMMARY-PACKAGES-BAG;
-    }
-  }
-
-  grouping NODE-TABLE {
-    description
-      "Common node of active, committed";
-    container nodes {
-      description
-        "Table for per-node package data";
-      list node {
-        key "node";
-        description
-          "Per-node package data";
-        leaf node {
-          type xr:Node-id;
-          description
-            "Node name";
-        }
-        uses INST-PACKAGES-BAG;
-      }
-    }
-  }
-
-  container install {
-    config false;
-    description
-      "Install operations info";
-    container superseded {
-      description
-        "Show superseded packages";
-      uses INSTMGR-SHOW-INST-SUPERSEDED;
-    }
-    container valid-log-id {
-      description
-        "Show valid log ids for XR";
-      uses INSTMGR-SHOW-VALID-LOGID;
-    }
-    container package-xr {
-      description
-        "Show the list of installed packages";
-      list package {
-        key "package-name";
-        description
-          "Show the info for a installed package";
-        container verbose {
-          description
-            "Show the verbose info for a installed package";
-          uses INSTALL-LOG;
-        }
-        container brief {
-          description
-            "Show the info for a installed package";
-          uses INSTALL-LOG;
-        }
-        container detail {
-          description
-            "Show the deatil info for a installed package";
-          uses INSTALL-LOG;
-        }
-        leaf package-name {
-          type string {
-            length "1..256";
-          }
-          description
-            "Package name";
-        }
-      }
-    }
-    container inactive-summary {
-      description
-        "Show XR inactive packages";
-      uses INSTMGR-SHOW-INST-INACTIVE;
-    }
-    container prepare {
-      description
-        "Show prepared packages ready for activation";
-      uses INSTMGR-YANG-SHOW-INSTALL-PREPARE;
-    }
-    container packages {
-      description
-        "Show packages installed";
-      container active {
-        description
-          "Information about active packages";
-        uses NODE-TABLE;
-        uses SUMMARY;
-      }
-      container committed {
-        description
-          "Information about committed packages";
-        uses NODE-TABLE;
-        uses SUMMARY;
-      }
-    }
-    container version {
-      description
-        "Show install version";
-      uses INST-VERSION-BAG;
-    }
-    container repository {
-      description
-        "Show install repository all";
-      uses INSTMGR-SHOW-INST-REPO;
-    }
-    container inactive {
-      description
-        "Show XR inactive packages";
-      uses INSTMGR-SHOW-INST-INACTIVE;
-    }
-    container request {
-      description
-        "Show current request";
-      uses INST-REQUEST-BAG;
-    }
-    container superseded-summary {
-      description
-        "Show superseded summary packages";
-      uses INSTMGR-SHOW-INST-SUP-SUMMARY;
-    }
-    container issu {
-      description
-        "ISSU operation";
-      container stage {
-        description
-          "Show XR install issu stage";
-        uses ISD-STAGE-INFO;
-      }
-      container inventory {
-        description
-          "Show XR install issu inventory";
-        uses ISD-INV-INFO-CONTAINER;
-      }
-    }
-    container last-operation-log {
-      description
-        "It shows the log of last operation performed";
-      uses INSTMGR-SHOW-INST-LOG;
-    }
-    container admin-packages {
-      description
-        "Show packages installed";
-      container admin-active-summary {
-        description
-          "Show Calvados Active packages summary";
-        uses INST-ALL-PACKAGES-BAG;
-      }
-      container admin-active {
-        description
-          "Show calvados active packages installed";
-        uses INST-ALL-PACKAGES-BAG;
-      }
-      container admin-committed-summary {
-        description
-          "Show Calvados Committed packages summary";
-        uses INST-ALL-PACKAGES-BAG;
-      }
-      container admin-inactive {
-        description
-          "Show calvados inactive packages";
-        uses INSTMGR-SHOW-INST-INACTIVE;
-      }
-      container admin-committed {
-        description
-          "Show Calvados Committed packages installed";
-        uses INST-ALL-PACKAGES-BAG;
-      }
-      container admin-inactive-summary {
-        description
-          "Show calvados inactive packages";
-        uses INSTMGR-SHOW-INST-INACTIVE;
-      }
-      container admin-superseded {
-        description
-          "Show calvados superseded packages";
-        uses INST-ALL-PACKAGES-BAG;
-      }
-    }
-    container operation-logs {
-      description
-        "Show log file";
-      list operation-log {
-        key "operation-id";
-        description
-          "Show log file for the specified install ID";
-        leaf operation-id {
-          type uint32 {
-            range "0..134217728";
-          }
-          description
-            "Op ID number";
-        }
-        uses INSTMGR-SHOW-INST-LOG;
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-tunnel-gre-cfg.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-tunnel-gre-cfg.yang
deleted file mode 100644
index 5d96b7056..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-tunnel-gre-cfg.yang
+++ /dev/null
@@ -1,280 +0,0 @@
-module Cisco-IOS-XR-tunnel-gre-cfg {
-  namespace "http://cisco.com/ns/yang/Cisco-IOS-XR-tunnel-gre-cfg";
-  prefix tunnel-gre-cfg;
-
-  import ietf-inet-types {
-    prefix inet;
-  }
-  import Cisco-IOS-XR-types {
-    prefix xr;
-  }
-  import cisco-semver {
-    prefix semver;
-  }
-  import Cisco-IOS-XR-ifmgr-cfg {
-    prefix a1;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 West Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of YANG definitions
-     for Cisco IOS-XR tunnel-gre package configuration.
-     
-     This YANG module augments the
-       Cisco-IOS-XR-ifmgr-cfg
-     module with configuration data.
-     
-     Copyright (c) 2013-2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2017-09-07 {
-    description
-      "Fixed type translation error.";
-  }
-  revision 2017-05-01 {
-    description
-      "Fixing backward compatibility error in module.";
-  }
-  revision 2016-05-25 {
-    description
-      "Initial version";
-  }
-  revision 2015-11-09 {
-    description
-      "IOS XR 6.0 revision.";
-  }
-
-  typedef Tunnel-mode-direction {
-    type enumeration {
-      enum "decap" {
-        value 1;
-        description
-          "Decap-only tunnel";
-      }
-      enum "encap" {
-        value 2;
-        description
-          "Encap-only tunnel";
-      }
-    }
-    description
-      "Tunnel mode direction";
-  }
-
-  augment "/a1:interface-configurations/a1:interface-configuration" {
-    description
-      "This augment extends the configuration data of
-       'Cisco-IOS-XR-ifmgr-cfg'";
-    container tunnel-ip {
-      description
-        "IP over GRE encapsulation";
-      container mode {
-        description
-          "Tunnel encapsulation method";
-        leaf value {
-          type uint32;
-          description
-            "GRE IPV4 - 1, GRE IPV6 - 2, MGRE IPV4 - 3,
-             MGRE IPV6 -4. IPV4 - 5, IPV6 - 6";
-        }
-        leaf mode-direction {
-          type Tunnel-mode-direction;
-          description
-            "Tunnel Mode Direction";
-        }
-      }
-      container source {
-        description
-          "Configure source of tunnel";
-        leaf type {
-          type uint32;
-          description
-            "1 for Interface Name, 2 for IPv4 Address, 3
-             for IPv6 Address";
-        }
-        leaf address {
-          type inet:ipv4-address-no-zone;
-          description
-            "IPV4 address of the tunnel source";
-        }
-        leaf interface-name {
-          type xr:Interface-name;
-          description
-            "Name of tunnel source interface";
-        }
-        leaf ipv6-address {
-          type string;
-          description
-            "IPV6 address of the tunnel source";
-        }
-      }
-      container key {
-        description
-          "Configure the key value for packets sent over
-           this tunnel";
-        leaf entropy {
-          type empty;
-          description
-            "Always set to true";
-        }
-        leaf value {
-          type uint32 {
-            range "0..4294967295";
-          }
-          description
-            "Enter the KEY value";
-        }
-      }
-      container keepalive {
-        description
-          "Enable keepalive packets on this tunnel";
-        leaf keep-alive-period {
-          type uint32 {
-            range "1..32767";
-          }
-          description
-            "Keepalive period in seconds (default 10
-             seconds)";
-        }
-        leaf keep-alive-retries {
-          type uint32 {
-            range "1..255";
-          }
-          description
-            "Number of retries (default 3)";
-        }
-      }
-      container bfd {
-        description
-          "Configure BFD for tunnel";
-        container destination {
-          description
-            "Configure BFD destination for tunnel";
-          leaf type {
-            type uint32;
-            description
-              "1 for IPv4 Address, 2 for IPv6 Address";
-          }
-          leaf address {
-            type inet:ipv4-address-no-zone;
-            description
-              "IPV4 address of the BFD destination";
-          }
-          leaf ipv6-address {
-            type string;
-            description
-              "IPV6 address of the BFD destination";
-          }
-        }
-        leaf minimum-interval {
-          type uint32 {
-            range "150..30000";
-          }
-          description
-            "Configure minimum interval for BFD";
-        }
-        leaf keepalive-period {
-          type uint32 {
-            range "1..32767";
-          }
-          description
-            "Keepalive period in seconds";
-        }
-        leaf retry {
-          type uint32 {
-            range "1..255";
-          }
-          description
-            "Configure Number of retries for BFD Keepalive";
-        }
-        leaf multiplier {
-          type uint32 {
-            range "3..50";
-          }
-          description
-            "Configure BFD multiplier";
-        }
-      }
-      container destination {
-        description
-          "Configure destination of tunnel";
-        leaf type {
-          type uint32;
-          description
-            "1 for IPv4 Address, 2 for IPv6 Address";
-        }
-        leaf address {
-          type inet:ipv4-address-no-zone;
-          description
-            "IPV4 address of the tunnel destination";
-        }
-        leaf ipv6-address {
-          type string;
-          description
-            "IPV6 address of the tunnel destination";
-        }
-        leaf address-mask {
-          type inet:ipv4-address-no-zone;
-          description
-            "IPv4 prefix length of the tunnel destination";
-        }
-        leaf prefix-list-name {
-          type xr:Cisco-ios-xr-string {
-            length "1..64";
-          }
-          description
-            "Prefix-list to validate destination's
-             resolving prefix";
-        }
-      }
-      leaf allow-key {
-        type empty;
-        description
-          "Enable flag bit to allow packets with GRE key";
-      }
-      leaf ttl {
-        type uint32 {
-          range "1..255";
-        }
-        description
-          "Configure the time-to-live for packets sent
-           over this tunnel";
-      }
-      leaf tunnel-vrf {
-        type xr:Cisco-ios-xr-string {
-          length "1..32";
-        }
-        description
-          "Tunnel vrf label name";
-      }
-      leaf tos {
-        type uint32 {
-          range "0..255";
-        }
-        description
-          "Configure Type of Service bits for this tunnel";
-      }
-      leaf disable {
-        type uint32;
-        description
-          "Disable DF bit (i.e. allow fragmentation)";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-types.yang b/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-types.yang
deleted file mode 100644
index 810f3e724..000000000
--- a/profiles/bundles/yang/cisco-iosxr/Cisco-IOS-XR-types.yang
+++ /dev/null
@@ -1,763 +0,0 @@
-module Cisco-IOS-XR-types {
-  namespace "http://cisco.com/ns/yang/cisco-xr-types";
-  prefix xr;
-
-  import cisco-semver {
-    prefix semver;
-  }
-  import ietf-inet-types {
-    prefix inet;
-  }
-
-  organization
-    "Cisco Systems, Inc.";
-  contact
-    "Cisco Systems, Inc.
-     Customer Service
-     
-     Postal: 170 W Tasman Drive
-     San Jose, CA 95134
-     
-     Tel: +1 1800 553-NETS
-     
-     E-mail: cs-yang@cisco.com";
-  description
-    "This module contains a collection of IOS-XR derived YANG data
-     types.
-     
-     Copyright (c) 2013-2020 by Cisco Systems, Inc.
-     All rights reserved.";
-
-  revision 2019-12-03 {
-    description
-      "Modified string match pattern of Interface-name";
-    semver:module-version "2.0.0";
-  }
-  revision 2019-04-05 {
-    description
-      "Establish semantic version baseline.";
-    semver:module-version "1.0.0";
-  }
-  revision 2019-01-18 {
-    description
-      "This revision adds the following new data types:
-       - Type10-password";
-  }
-  revision 2018-06-29 {
-    description
-      "Modified string match pattern of Interface-name";
-  }
-  revision 2017-12-01 {
-    description
-      "Modified string match pattern of Tty-escape-char-num";
-  }
-  revision 2017-03-07 {
-    description
-      "This revision adds the following new data types:
-       - Type8-password
-       - Type9-password";
-  }
-  revision 2015-06-29 {
-    description
-      "This revision adds the following new data types:
-       - Rpl-policy
-       - Rpl-set";
-  }
-  revision 2015-05-18 {
-    description
-      "Updated Node-id string pattern to match also shorter ncs4k
-       node names.";
-  }
-  revision 2015-01-19 {
-    description
-      "This revision adds the following new data types:
-       - Bgp-ipv4-flowspec-address
-       - Bgp-ipv6-flowspec-address";
-  }
-  revision 2013-07-22 {
-    description
-      "Initial revision.";
-  }
-
-  extension xr-cli-map {
-    argument cli-command;
-    description
-      "The xr-cli-map statement takes as an argument
-       relevant CLI configuration command.";
-  }
-
-  extension xr-xml-map {
-    argument xr-xml-node;
-    description
-      "The xr-xml-map statement takes as an argument
-       relevant Cisco XML Schema node name.";
-  }
-
-  extension cli-command {
-    argument command;
-    description
-      "Corresponding CLI command for this RPC node";
-  }
-
-  extension cli-name {
-    argument keyword;
-    description
-      "Corresponding CLI keyword for this node";
-  }
-
-  extension xr-task {
-    argument task;
-    description
-      "XR task-id required for operating the yang node";
-  }
-
-  extension event-telemetry {
-    argument description;
-    description
-      "Node eligible for telemetry event subscription";
-  }
-
-  typedef Route-dist {
-    type string {
-      pattern "[a-fA-F0-9]{16}";
-    }
-    description
-      "Route distinguisher in hexadecimal notation.";
-  }
-
-  typedef Bgp-l2vpn-evpn-addrs {
-    type string {
-      pattern "[a-fA-F0-9]{58}";
-    }
-    description
-      "L2VPN EVPN Address in hexadecimal notation.";
-  }
-
-  typedef Bgp-ls-addr {
-    type string {
-      pattern "[a-fA-F0-9]+";
-    }
-    description
-      "BGP link state unicast address in hexadecimal
-       notation.";
-  }
-
-  typedef Bgp-ipv6-mvpn-addr {
-    type string {
-      pattern "[a-fA-F0-9]{104}";
-    }
-    description
-      "An IPV6 MVPN address in hexadecimal notation.";
-  }
-
-  typedef Bgp-ipv4-mvpn-addr {
-    type string {
-      pattern "[a-fA-F0-9]{56}";
-    }
-    description
-      "An IPV4 MVPN address in hexadecimal notation.";
-  }
-
-  typedef Bgp-rt-constrt-addr {
-    type string {
-      pattern "[a-fA-F0-9]{24}";
-    }
-    description
-      "An IPV4 RTConstraint address in hexadecimal notation.";
-  }
-
-  typedef Bgp-ipv4-mdt-addr {
-    type string {
-      pattern "(([a-f0-9]{16}-)(([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))";
-    }
-    description
-      "An IPV4 MDT address in dotted decimal notation.
-       An IPv4 MDT address should be of the form
-       0000006400000065-129.29.83.45. This datatype
-       restricts the value of each field 16 digits in
-       hexadecimal for RD field and between 0 and 255
-       for IPv4 address field, i.e.
-       [0000000000000000-ffffffffffffffff]-
-       [0-255].[0-255].[0-255].[0-255].";
-  }
-
-  typedef Bgp-ipv4-tunnel-addr {
-    type string {
-      pattern "((0:|[1-9][0-9]{0,4}:)(([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))";
-    }
-    description
-      "An IPV4 tunnel address in dotted decimal notation.
-       An IPv4 tunnel address should be of the form
-       65535:129.29.83.45. This datatype restricts the
-       value of each field between 0 and 65535 for prefix
-       field and 0 and 255 for IPv4 address field, i.e.
-       [0-65535]:[0-255].[0-255].[0-255].[0-255]";
-  }
-
-  typedef Cisco-ios-xr-port-number {
-    type uint16 {
-      range "1..65535";
-    }
-    description
-      "Port number of range from 1 to 65535";
-  }
-
-  typedef Interface-name {
-    type string {
-      pattern "[a-zA-Z0-9.:_/-]+";
-    }
-    description
-      "An interface name specifying an interface type and
-       instance.
-       Interface represents a string defining an interface
-       type and instance, e.g. MgmtEth0/4/CPU1/0 or
-       TenGigE0/2/0/0.2 or Bundle-Ether9 or
-       Bundle-Ether9.98 or Serial0/0/0/0/3/1:1";
-  }
-
-  typedef Cisco-ios-xr-string {
-    type string {
-      pattern "[\\w\\-\\.:,_@#%$\\+=\\|;]+";
-    }
-    description
-      "Special characters are not allowed.";
-  }
-
-  typedef Ipv4-prefix-length {
-    type uint8 {
-      range "0..32";
-    }
-    description
-      "An IPv4 address prefix length.
-       Must lie between 0 and 32 inclusive.";
-  }
-
-  typedef Ipv6-prefix-length {
-    type uint8 {
-      range "0..128";
-    }
-    description
-      "An IPv6 address prefix length.
-       Must lie between 0 and 32 inclusive.";
-  }
-
-  typedef Rack-id {
-    type string {
-      pattern "[a-zA-Z0-9_]*\\d+";
-    }
-    description
-      "Names the rack portion of a NodeID
-       Rack/Slot/Instance triple";
-  }
-
-  typedef Slot-id {
-    type string {
-      pattern "[a-zA-Z0-9_]*\\d+";
-    }
-    description
-      "Names the slot portion of a NodeID
-       Rack/Slot/Instance triple";
-  }
-
-  typedef Instance-id {
-    type string {
-      pattern "[a-zA-Z0-9_]*\\d+";
-    }
-    description
-      "Names the instance portion of a NodeID
-       Rack/Slot/Instance triple";
-  }
-
-  typedef Sub-instance-id {
-    type string {
-      pattern "[a-zA-Z0-9_]*\\d+";
-    }
-    description
-      "Names the sub-instance portion of an extended
-       NodeID Rack/Slot/Instance/SubInstance";
-  }
-
-  typedef Encryption-type {
-    type enumeration {
-      enum "none" {
-        value 0;
-        description
-          "The password string is clear text.";
-      }
-      enum "md5" {
-        value 1;
-        description
-          "The password is encrypted to an MD5 digest.";
-      }
-      enum "proprietary" {
-        value 2;
-        description
-          "The password is encrypted using Cisco type 7
-           password encryption.";
-      }
-      enum "type6" {
-        value 3;
-        description
-          "The password is encrypted using Cisco type 6
-           password encryption.";
-      }
-    }
-    description
-      "The type of encryption used on a password string.";
-  }
-
-  typedef Hex-integer {
-    type string {
-      pattern "[0-9a-fA-F]{1,8}";
-    }
-    description
-      "An unsigned 32-bit integer represented in
-       hexadecimal format.";
-  }
-
-  typedef Hex-integer-16 {
-    type string {
-      pattern "[0-9a-fA-F]{1,4}";
-    }
-    description
-      "An unsigned 16-bit integer represented in
-       hexadecimal format.";
-  }
-
-  typedef Osi-system-id {
-    type string {
-      pattern "[a-fA-F0-9]{4}(\\.[a-fA-F0-9]{4}){2}";
-    }
-    description
-      "An OSI system ID should be of the form
-       0123.4567.89ab. This data type restricts each
-       character to a hex character.";
-  }
-
-  typedef Osi-area-address {
-    type string {
-      pattern "[a-fA-F0-9]{2}(\\.[a-fA-F0-9]{4}){0,6}";
-    }
-    description
-      "An OSI area address should consist of an odd number
-       of octets, and be of the form 01 or 01.2345 etc up
-       to 01.2345.6789.abcd.ef01.2345.6789. This data type
-       restricts each character to a hex character.";
-  }
-
-  typedef Isis-node-id {
-    type string {
-      pattern "[a-fA-F0-9]{4}(\\.[a-fA-F0-9]{4}){2}\\.[a-fA-F0-9]{2}";
-    }
-    description
-      "An ISIS node ID should be of the form
-       0123.4567.89ab.cd. This data type restricts each
-       character to a hex character.";
-  }
-
-  typedef Isis-snpa {
-    type string {
-      pattern "[a-fA-F0-9]{4}(\\.[a-fA-F0-9]{4}){2}";
-    }
-    description
-      "String representation of a SNPA, 802.2 MAC address
-       in canonical format, e.g. 0123.4567.89ab";
-  }
-
-  typedef Isis-lsp-id {
-    type string {
-      pattern "[a-fA-F0-9]{4}(\\.[a-fA-F0-9]{4}){2}\\.[a-fA-F0-9]{2}\\-[a-fA-F0-9]{2}";
-    }
-    description
-      "An ISIS LSP ID should be of the form
-       0123.4567.89ab.cd-ef. This data type restricts each
-       character to a hex character.";
-  }
-
-  typedef Osi-net {
-    type string {
-      pattern "[a-fA-F0-9]{2}(\\.[a-fA-F0-9]{4}){3,9}\\.[a-fA-F0-9]{2}";
-    }
-    description
-      "An OSI NET should consist of an even number of
-       octets, and be of the form 01.2345.6789.abcd.ef etc
-       up to
-       01.2345.6789.abcd.ef01.2345.6789.abcd.ef01.2345.67.
-       This data type restricts each character to a hex
-       character.";
-  }
-
-  typedef String-identifier {
-    type string {
-      pattern "[a-zA-Z0-9_\\-]+";
-    }
-    description
-      "A string for specifying identifier.";
-  }
-
-  typedef Char-num {
-    type union {
-      type string {
-        pattern "(0x[0-9A-Fa-f]{1,2}|\\p{IsBasicLatin}|\\p{IsLatin-1Supplement})";
-      }
-      type uint8;
-    }
-    description
-      "Takes a character or its ASCII decimal equivalent
-       (0-255).";
-  }
-
-  typedef Tty-escape-char-num {
-    type union {
-      type string {
-        pattern "(0x[0-9A-Fa-f]{1,2}|\\p{IsBasicLatin}|\\p{IsLatin-1Supplement}|DEFAULT|BREAK|NONE)";
-      }
-      type uint8;
-    }
-    description
-      "Escape character or its ASCII decimal equivalent
-       (0-255) or one of the three string DEFAULT, BREAK,
-       NONE.";
-  }
-
-  typedef Extended-node-id {
-    type string {
-      pattern "([a-zA-Z0-9_]*\\d+/){3}([a-zA-Z0-9_]*\\d+)";
-    }
-    description
-      "A location used as value information and specified
-       as a Rack/Slot/Instance/SubInstance, e.g.
-       0/1/CPU0/NPU0";
-  }
-
-  typedef Node-id {
-    type string {
-      pattern "([a-zA-Z0-9_]*\\d+/){1,2}([a-zA-Z0-9_]*\\d+)";
-    }
-    description
-      "A location used as value information and specified
-       as a Rack/Slot/Instance triple, e.g. F0/SC1/0.";
-  }
-
-  typedef Pq-node-id {
-    type string {
-      pattern "((([a-zA-Z0-9_]*\\d+)|(\\*))/){2}(([a-zA-Z0-9_]*\\d+)|(\\*))";
-    }
-    description
-      "Partially qualified location which is used for
-       wildcarding location specifications, e.g. 1/*/*";
-  }
-
-  typedef Md5-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Md5-password type is used to store password using the MD5
-       hash function.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Type8-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Type8-password type is used to store password using the
-       SHA-256 encryption.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Type9-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Type9-password type is used to store password using the
-       Script algorithmic encryption.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Type10-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Type10-password type is used to store password using the
-       Script algorithmic encryption.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Proprietary-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Proprietary-password type is used to store password
-       using the Cisco proprietary hash function.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Type6-password {
-    type string {
-      pattern "(!.+)|([^!].+)";
-    }
-    description
-      "The Type6-password type is used to store password
-       using the Cisco type 6 hash function.
-       When a clear text value is set to a leaf of this type, the
-       server calculates a password hash and stores the result
-       in the datastore. The password is never stored in clear text.
-       
-       When a leaf of this type is read, the stored password hash is
-       returned.
-       
-       A value of this type matches one of the forms:
-       
-         !<clear text password>
-         <password hash>
-       
-       The '!' prefix signals that the value is clear text. When
-       such a value is received by the server, a hash value is
-       calculated. This value is stored in the configuration data
-       store.
-       
-       If a value starting without '!' is received, the server knows
-       that the value already represents a hashed value, and stores
-       it as is in the data store.";
-  }
-
-  typedef Bgp-ipv4-flowspec-address {
-    type string {
-      pattern "[a-fA-F0-9]{4096}";
-    }
-    description
-      "An IPV4 Flowspec address in hexadecimal notation.";
-  }
-
-  typedef Bgp-ipv6-flowspec-address {
-    type string {
-      pattern "[a-fA-F0-9]{4096}";
-    }
-    description
-      "An IPV6 Flowspec address in hexadecimal notation.";
-  }
-
-  typedef Rpl-policy {
-    type string;
-    description
-      "RPL Policy info";
-  }
-
-  typedef Rpl-set {
-    type string;
-    description
-      "RPL Set info";
-  }
-
-  typedef Physical-allowed-node-id {
-    type uint32;
-    description
-      "A physical location encoded as a 32-bit value.";
-  }
-
-  typedef Physical-allowed-node-id-string {
-    type string;
-    description
-      "A physical location which is represented internallyusing string format (eg: 0_6_CPU0).";
-  }
-
-  typedef Bgp-as-number {
-    type union {
-      type uint32 {
-        range "1..65535" {
-          description
-            "2-byte AS number";
-        }
-      }
-      type string {
-        pattern "([1-9][0-9]{0,4}).([0-9]{1,5})" {
-          description
-            "4-byte AS number in asdot (X.Y) format";
-        }
-      }
-      type uint32 {
-        range "65536..4294967295" {
-          description
-            "4-byte AS number in asplain format";
-        }
-      }
-    }
-    description
-      "BGP AS number type";
-  }
-
-  typedef Route-policy-name {
-    type string {
-      length "1..255";
-    }
-    description
-      "Datatype for route policy name";
-  }
-
-  typedef Ospf-area-id {
-    type union {
-      type uint32 {
-        range "0..4294967295";
-      }
-      type inet:ip-address;
-    }
-    description
-      "OSPF area ID. Either OSPF area ID as a decimal value or OSPF area ID in IP address format";
-  }
-
-  typedef Vpn-id {
-    type string {
-      pattern "([0-9a-f]{1,8}):([0-9a-f]{1,8})" {
-        description
-          "VPN ID format (OUI:VPN-Index in hex integer)";
-      }
-    }
-    description
-      "VPN ID format (OUI:VPN-Index in hex integer)";
-  }
-
-  typedef Mpls-label-space-id {
-    type string {
-      pattern "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]):0" {
-        description
-          "<IPv4 address>:0";
-      }
-    }
-    description
-      "MPLS-LDP labe-space ID format";
-  }
-
-  typedef Bgp-route-distinguisher {
-    type union {
-      type string {
-        pattern "([0-9]{1,5}):([0-9]{1,10})" {
-          description
-            "2-byte AS number:nn (<1-65535>:<0-4294967295>)";
-        }
-      }
-      type string {
-        pattern "([0-9]{5,10}):([0-9]{1,10})" {
-          description
-            "4-byte AS number:nn (<65536-4294967295>:<0-4294967295>)";
-        }
-      }
-      type string {
-        pattern "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]):([0-9]{1,10})" {
-          description
-            "IP address:nn (A.B.C.D:<0-4294967295>)";
-        }
-      }
-    }
-    description
-      "BGP route distinguisher number format";
-  }
-
-  typedef Evpn-esi-value {
-    type string {
-      pattern "[0-9a-f]{1,2}(\\.[0-9a-f]{1,2}){8}";
-    }
-    description
-      "EVPN 9-octet ESI value";
-  }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/cisco-semver.yang b/profiles/bundles/yang/cisco-iosxr/cisco-semver.yang
deleted file mode 100644
index e21442b23..000000000
--- a/profiles/bundles/yang/cisco-iosxr/cisco-semver.yang
+++ /dev/null
@@ -1,87 +0,0 @@
-module cisco-semver {
-    namespace "http://cisco.com/ns/yang/cisco-semver";
-
-    prefix cisco-semver;
-
-    organization
-        "Cisco Systems
-     170 West Tasman Drive
-     San Jose, CA 95134-1706
-     USA";
-
-    contact
-        "Mailing list: <cs-yang@cisco.com>";
-
-    description
-        "This YANG module defines semantic version for Cisco defined YANG models.
-     Copyright (c) 2019 by Cisco Systems, Inc.
-     All rights reserved.";
-
-    revision 2019-03-13 {
-        description
-            "Initial Version.";
-
-        reference "draft-verdt-netmod-yang-solutions-00";
-    }
-
-    extension module-version {
-        argument "semver";
-        description
-            "The version number for the module. This is
-      expressed as a semantic version number of the form:
-      major.minor.patch(x)
-      where:
-        * major corresponds to the major version.
-        * minor corresponds to a minor version.
-        * patch corresponds to a patch version. It is updated only for
-          'editorial' changes that do not change the API semantics in
-          any way. In addition to 'editorial' changes that do not
-          change the YANG module semantics, the patch field can
-          also be used in a limited way to indicate major and minor
-          version changes as well. The patch version may be incremented for
-          a major or minor change if that change is happening on a
-          non-HEAD or non-latest branch. If the patch field is incremented
-          for a minor version change then it is appended with the
-          suffix '(m)', if the patch field is incremented for a major
-          version change then it is appended with the suffix '(M)',
-          replacing '(m)', if present.
-
-      This version number should be specified as a child of revision
-      statement to indicate that a specific revision had a specific
-      semantic version number. Where several modules are used to build
-      up a single block of functionality, the same module version is
-      specified across each file that makes up the module.
-
-      Following a release of major version 1, all modules will
-      update 'major.minor.patch' version number as follows:
-
-      1.  if one or more non-backwards-compatible change is made then
-          either the major version number MUST be updated (resetting the
-          minor and patch version numbers to 0) or only the patch version
-          number MUST be updated and appended with '(M)', replacing '(m)'
-          if present.
-
-      2.  if one or more backwards-compatible change is made then either
-          the minor version number MUST be updated (resetting the patch
-          version numbers to 0) or only the patch version number MUST be
-          updated and appended with '(m)' unless the previous patch version
-          number already had '(M)' appended, in which case the '(M)' suffix
-          is retained for the new patch version.
-
-      3.  if one or more editorial change is made then the patch version
-          number MUST be updated. If the previous patch version number
-          already had either an '(m') or '(M)' suffix then it is retained
-          for the new patch version regardless of whether the subsequent
-          changes are backwards-compatible, non-backwards-compatible,
-          or editorial changes.
-
-      When a field in the version number is incremented, all following
-      fields are reset back to 0.  Major version number 0 indicates that
-      the module is not yet stable and allows non-backwards-compatible
-      changes without requiring the major version number to be incremented
-
-      Where possible, the version number should be updated using the
-      standard semantic versioning rules, relying on the '(m)' and '(M)'
-      suffixes only used where strictly necessary.";
-    }
-}
diff --git a/profiles/bundles/yang/cisco-iosxr/ietf-yang-types.yang b/profiles/bundles/yang/cisco-iosxr/ietf-yang-types.yang
deleted file mode 100644
index ee58fa3ab..000000000
--- a/profiles/bundles/yang/cisco-iosxr/ietf-yang-types.yang
+++ /dev/null
@@ -1,474 +0,0 @@
-module ietf-yang-types {
-
-  namespace "urn:ietf:params:xml:ns:yang:ietf-yang-types";
-  prefix "yang";
-
-  organization
-   "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-  contact
-   "WG Web:   <http://tools.ietf.org/wg/netmod/>
-    WG List:  <mailto:netmod@ietf.org>
-
-    WG Chair: David Kessens
-              <mailto:david.kessens@nsn.com>
-
-    WG Chair: Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>
-
-    Editor:   Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>";
-
-  description
-   "This module contains a collection of generally useful derived
-    YANG data types.
-
-    Copyright (c) 2013 IETF Trust and the persons identified as
-    authors of the code.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-    without modification, is permitted pursuant to, and subject
-    to the license terms contained in, the Simplified BSD License
-    set forth in Section 4.c of the IETF Trust's Legal Provisions
-    Relating to IETF Documents
-    (http://trustee.ietf.org/license-info).
-
-    This version of this YANG module is part of RFC 6991; see
-    the RFC itself for full legal notices.";
-
-  revision 2013-07-15 {
-    description
-     "This revision adds the following new data types:
-      - yang-identifier
-      - hex-string
-      - uuid
-      - dotted-quad";
-    reference
-     "RFC 6991: Common YANG Data Types";
-  }
-
-  revision 2010-09-24 {
-    description
-     "Initial revision.";
-    reference
-     "RFC 6021: Common YANG Data Types";
-  }
-
-  /*** collection of counter and gauge types ***/
-
-  typedef counter32 {
-    type uint32;
-    description
-     "The counter32 type represents a non-negative integer
-      that monotonically increases until it reaches a
-      maximum value of 2^32-1 (4294967295 decimal), when it
-      wraps around and starts increasing again from zero.
-
-      Counters have no defined 'initial' value, and thus, a
-      single value of a counter has (in general) no information
-      content.  Discontinuities in the monotonically increasing
-      value normally occur at re-initialization of the
-      management system, and at other times as specified in the
-      description of a schema node using this type.  If such
-      other times can occur, for example, the creation of
-      a schema node of type counter32 at times other than
-      re-initialization, then a corresponding schema node
-      should be defined, with an appropriate type, to indicate
-      the last discontinuity.
-
-      The counter32 type should not be used for configuration
-      schema nodes.  A default statement SHOULD NOT be used in
-      combination with the type counter32.
-
-      In the value set and its semantics, this type is equivalent
-      to the Counter32 type of the SMIv2.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2
-                (SMIv2)";
-  }
-
-  typedef zero-based-counter32 {
-    type yang:counter32;
-    default "0";
-    description
-     "The zero-based-counter32 type represents a counter32
-      that has the defined 'initial' value zero.
-
-      A schema node of this type will be set to zero (0) on creation
-      and will thereafter increase monotonically until it reaches
-      a maximum value of 2^32-1 (4294967295 decimal), when it
-      wraps around and starts increasing again from zero.
-
-      Provided that an application discovers a new schema node
-      of this type within the minimum time to wrap, it can use the
-      'initial' value as a delta.  It is important for a management
-      station to be aware of this minimum time and the actual time
-      between polls, and to discard data if the actual time is too
-      long or there is no defined minimum time.
-
-      In the value set and its semantics, this type is equivalent
-      to the ZeroBasedCounter32 textual convention of the SMIv2.";
-    reference
-      "RFC 4502: Remote Network Monitoring Management Information
-                 Base Version 2";
-  }
-
-  typedef counter64 {
-    type uint64;
-    description
-     "The counter64 type represents a non-negative integer
-      that monotonically increases until it reaches a
-      maximum value of 2^64-1 (18446744073709551615 decimal),
-      when it wraps around and starts increasing again from zero.
-
-      Counters have no defined 'initial' value, and thus, a
-      single value of a counter has (in general) no information
-      content.  Discontinuities in the monotonically increasing
-      value normally occur at re-initialization of the
-      management system, and at other times as specified in the
-      description of a schema node using this type.  If such
-      other times can occur, for example, the creation of
-      a schema node of type counter64 at times other than
-      re-initialization, then a corresponding schema node
-      should be defined, with an appropriate type, to indicate
-      the last discontinuity.
-
-      The counter64 type should not be used for configuration
-      schema nodes.  A default statement SHOULD NOT be used in
-      combination with the type counter64.
-
-      In the value set and its semantics, this type is equivalent
-      to the Counter64 type of the SMIv2.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2
-                (SMIv2)";
-  }
-
-  typedef zero-based-counter64 {
-    type yang:counter64;
-    default "0";
-    description
-     "The zero-based-counter64 type represents a counter64 that
-      has the defined 'initial' value zero.
-
-      A schema node of this type will be set to zero (0) on creation
-      and will thereafter increase monotonically until it reaches
-      a maximum value of 2^64-1 (18446744073709551615 decimal),
-      when it wraps around and starts increasing again from zero.
-
-      Provided that an application discovers a new schema node
-      of this type within the minimum time to wrap, it can use the
-      'initial' value as a delta.  It is important for a management
-      station to be aware of this minimum time and the actual time
-      between polls, and to discard data if the actual time is too
-      long or there is no defined minimum time.
-
-      In the value set and its semantics, this type is equivalent
-      to the ZeroBasedCounter64 textual convention of the SMIv2.";
-    reference
-     "RFC 2856: Textual Conventions for Additional High Capacity
-                Data Types";
-  }
-
-  typedef gauge32 {
-    type uint32;
-    description
-     "The gauge32 type represents a non-negative integer, which
-      may increase or decrease, but shall never exceed a maximum
-      value, nor fall below a minimum value.  The maximum value
-      cannot be greater than 2^32-1 (4294967295 decimal), and
-      the minimum value cannot be smaller than 0.  The value of
-      a gauge32 has its maximum value whenever the information
-      being modeled is greater than or equal to its maximum
-      value, and has its minimum value whenever the information
-      being modeled is smaller than or equal to its minimum value.
-      If the information being modeled subsequently decreases
-      below (increases above) the maximum (minimum) value, the
-      gauge32 also decreases (increases).
-
-      In the value set and its semantics, this type is equivalent
-      to the Gauge32 type of the SMIv2.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2
-                (SMIv2)";
-  }
-
-  typedef gauge64 {
-    type uint64;
-    description
-     "The gauge64 type represents a non-negative integer, which
-      may increase or decrease, but shall never exceed a maximum
-      value, nor fall below a minimum value.  The maximum value
-      cannot be greater than 2^64-1 (18446744073709551615), and
-      the minimum value cannot be smaller than 0.  The value of
-      a gauge64 has its maximum value whenever the information
-      being modeled is greater than or equal to its maximum
-      value, and has its minimum value whenever the information
-      being modeled is smaller than or equal to its minimum value.
-      If the information being modeled subsequently decreases
-      below (increases above) the maximum (minimum) value, the
-      gauge64 also decreases (increases).
-
-      In the value set and its semantics, this type is equivalent
-      to the CounterBasedGauge64 SMIv2 textual convention defined
-      in RFC 2856";
-    reference
-     "RFC 2856: Textual Conventions for Additional High Capacity
-                Data Types";
-  }
-
-  /*** collection of identifier-related types ***/
-
-  typedef object-identifier {
-    type string {
-      pattern '(([0-1](\.[1-3]?[0-9]))|(2\.(0|([1-9]\d*))))'
-            + '(\.(0|([1-9]\d*)))*';
-    }
-    description
-     "The object-identifier type represents administratively
-      assigned names in a registration-hierarchical-name tree.
-
-      Values of this type are denoted as a sequence of numerical
-      non-negative sub-identifier values.  Each sub-identifier
-      value MUST NOT exceed 2^32-1 (4294967295).  Sub-identifiers
-      are separated by single dots and without any intermediate
-      whitespace.
-
-      The ASN.1 standard restricts the value space of the first
-      sub-identifier to 0, 1, or 2.  Furthermore, the value space
-      of the second sub-identifier is restricted to the range
-      0 to 39 if the first sub-identifier is 0 or 1.  Finally,
-      the ASN.1 standard requires that an object identifier
-      has always at least two sub-identifiers.  The pattern
-      captures these restrictions.
-
-      Although the number of sub-identifiers is not limited,
-      module designers should realize that there may be
-      implementations that stick with the SMIv2 limit of 128
-      sub-identifiers.
-
-      This type is a superset of the SMIv2 OBJECT IDENTIFIER type
-      since it is not restricted to 128 sub-identifiers.  Hence,
-      this type SHOULD NOT be used to represent the SMIv2 OBJECT
-      IDENTIFIER type; the object-identifier-128 type SHOULD be
-      used instead.";
-    reference
-     "ISO9834-1: Information technology -- Open Systems
-      Interconnection -- Procedures for the operation of OSI
-      Registration Authorities: General procedures and top
-      arcs of the ASN.1 Object Identifier tree";
-  }
-
-  typedef object-identifier-128 {
-    type object-identifier {
-      pattern '\d*(\.\d*){1,127}';
-    }
-    description
-     "This type represents object-identifiers restricted to 128
-      sub-identifiers.
-
-      In the value set and its semantics, this type is equivalent
-      to the OBJECT IDENTIFIER type of the SMIv2.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2
-                (SMIv2)";
-  }
-
-  typedef yang-identifier {
-    type string {
-      length "1..max";
-      pattern '[a-zA-Z_][a-zA-Z0-9\-_.]*';
-      pattern '.|..|[^xX].*|.[^mM].*|..[^lL].*';
-    }
-    description
-      "A YANG identifier string as defined by the 'identifier'
-       rule in Section 12 of RFC 6020.  An identifier must
-       start with an alphabetic character or an underscore
-       followed by an arbitrary sequence of alphabetic or
-       numeric characters, underscores, hyphens, or dots.
-
-       A YANG identifier MUST NOT start with any possible
-       combination of the lowercase or uppercase character
-       sequence 'xml'.";
-    reference
-      "RFC 6020: YANG - A Data Modeling Language for the Network
-                 Configuration Protocol (NETCONF)";
-  }
-
-  /*** collection of types related to date and time***/
-
-  typedef date-and-time {
-    type string {
-      pattern '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?'
-            + '(Z|[\+\-]\d{2}:\d{2})';
-    }
-    description
-     "The date-and-time type is a profile of the ISO 8601
-      standard for representation of dates and times using the
-      Gregorian calendar.  The profile is defined by the
-      date-time production in Section 5.6 of RFC 3339.
-
-      The date-and-time type is compatible with the dateTime XML
-      schema type with the following notable exceptions:
-
-      (a) The date-and-time type does not allow negative years.
-
-      (b) The date-and-time time-offset -00:00 indicates an unknown
-          time zone (see RFC 3339) while -00:00 and +00:00 and Z
-          all represent the same time zone in dateTime.
-
-      (c) The canonical format (see below) of data-and-time values
-          differs from the canonical format used by the dateTime XML
-          schema type, which requires all times to be in UTC using
-          the time-offset 'Z'.
-
-      This type is not equivalent to the DateAndTime textual
-      convention of the SMIv2 since RFC 3339 uses a different
-      separator between full-date and full-time and provides
-      higher resolution of time-secfrac.
-
-      The canonical format for date-and-time values with a known time
-      zone uses a numeric time zone offset that is calculated using
-      the device's configured known offset to UTC time.  A change of
-      the device's offset to UTC time will cause date-and-time values
-      to change accordingly.  Such changes might happen periodically
-      in case a server follows automatically daylight saving time
-      (DST) time zone offset changes.  The canonical format for
-      date-and-time values with an unknown time zone (usually
-      referring to the notion of local time) uses the time-offset
-      -00:00.";
-    reference
-     "RFC 3339: Date and Time on the Internet: Timestamps
-      RFC 2579: Textual Conventions for SMIv2
-      XSD-TYPES: XML Schema Part 2: Datatypes Second Edition";
-  }
-
-  typedef timeticks {
-    type uint32;
-    description
-     "The timeticks type represents a non-negative integer that
-      represents the time, modulo 2^32 (4294967296 decimal), in
-      hundredths of a second between two epochs.  When a schema
-      node is defined that uses this type, the description of
-      the schema node identifies both of the reference epochs.
-
-      In the value set and its semantics, this type is equivalent
-      to the TimeTicks type of the SMIv2.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2
-                (SMIv2)";
-  }
-
-  typedef timestamp {
-    type yang:timeticks;
-    description
-     "The timestamp type represents the value of an associated
-      timeticks schema node at which a specific occurrence
-      happened.  The specific occurrence must be defined in the
-      description of any schema node defined using this type.  When
-      the specific occurrence occurred prior to the last time the
-      associated timeticks attribute was zero, then the timestamp
-      value is zero.  Note that this requires all timestamp values
-      to be reset to zero when the value of the associated timeticks
-      attribute reaches 497+ days and wraps around to zero.
-
-      The associated timeticks schema node must be specified
-      in the description of any schema node using this type.
-
-      In the value set and its semantics, this type is equivalent
-      to the TimeStamp textual convention of the SMIv2.";
-    reference
-     "RFC 2579: Textual Conventions for SMIv2";
-  }
-
-  /*** collection of generic address types ***/
-
-  typedef phys-address {
-    type string {
-      pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-    }
-
-    description
-     "Represents media- or physical-level addresses represented
-      as a sequence octets, each octet represented by two hexadecimal
-      numbers.  Octets are separated by colons.  The canonical
-      representation uses lowercase characters.
-
-      In the value set and its semantics, this type is equivalent
-      to the PhysAddress textual convention of the SMIv2.";
-    reference
-     "RFC 2579: Textual Conventions for SMIv2";
-  }
-
-  typedef mac-address {
-    type string {
-      pattern '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}';
-    }
-    description
-     "The mac-address type represents an IEEE 802 MAC address.
-      The canonical representation uses lowercase characters.
-
-      In the value set and its semantics, this type is equivalent
-      to the MacAddress textual convention of the SMIv2.";
-    reference
-     "IEEE 802: IEEE Standard for Local and Metropolitan Area
-                Networks: Overview and Architecture
-      RFC 2579: Textual Conventions for SMIv2";
-  }
-
-  /*** collection of XML-specific types ***/
-
-  typedef xpath1.0 {
-    type string;
-    description
-     "This type represents an XPATH 1.0 expression.
-
-      When a schema node is defined that uses this type, the
-      description of the schema node MUST specify the XPath
-      context in which the XPath expression is evaluated.";
-    reference
-     "XPATH: XML Path Language (XPath) Version 1.0";
-  }
-
-  /*** collection of string types ***/
-
-  typedef hex-string {
-    type string {
-      pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-    }
-    description
-     "A hexadecimal string with octets represented as hex digits
-      separated by colons.  The canonical representation uses
-      lowercase characters.";
-  }
-
-  typedef uuid {
-    type string {
-      pattern '[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-'
-            + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
-    }
-    description
-     "A Universally Unique IDentifier in the string representation
-      defined in RFC 4122.  The canonical representation uses
-      lowercase characters.
-
-      The following is an example of a UUID in string representation:
-      f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-      ";
-    reference
-     "RFC 4122: A Universally Unique IDentifier (UUID) URN
-                Namespace";
-  }
-
-  typedef dotted-quad {
-    type string {
-      pattern
-        '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-      + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
-    }
-    description
-      "An unsigned 32-bit number expressed in the dotted-quad
-       notation, i.e., four octets written as decimal numbers
-       and separated with the '.' (full stop) character.";
-  }
-}
diff --git a/profiles/bundles/yang/ietf/0.1.2/iana-crypt-hash.yang b/profiles/bundles/yang/ietf/0.1.2/iana-crypt-hash.yang
new file mode 100755
index 000000000..eaf6258c1
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/iana-crypt-hash.yang
@@ -0,0 +1,124 @@
+module iana-crypt-hash {
+  namespace "urn:ietf:params:xml:ns:yang:iana-crypt-hash";
+  prefix ianach;
+
+  organization "IANA";
+  contact
+    "        Internet Assigned Numbers Authority
+
+     Postal: ICANN
+             4676 Admiralty Way, Suite 330
+             Marina del Rey, CA 90292
+
+     Tel:    +1 310 823 9358
+     E-Mail: iana&iana.org";
+  description
+    "This YANG module defines a typedef for storing passwords
+     using a hash function, and features to indicate which hash
+     functions are supported by an implementation.
+
+     The latest revision of this YANG module can be obtained from
+     the IANA web site.
+
+     Requests for new values should be made to IANA via
+     email (iana&iana.org).
+
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     The initial version of this YANG module is part of RFC XXXX;
+     see the RFC itself for full legal notices.";
+  // RFC Ed.: replace XXXX with actual RFC number and remove this
+  // note.
+
+  // RFC Ed.: update the date below with the date of RFC publication
+  // and remove this note.
+  revision 2014-04-04 {
+    description
+      "Initial revision.";
+    reference
+      "RFC XXXX: A YANG Data Model for System Management";
+  }
+
+  typedef crypt-hash {
+    type string {
+      pattern
+        '$0$.*'
+      + '|$1$[a-zA-Z0-9./]{1,8}$[a-zA-Z0-9./]{22}'
+      + '|$5$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{43}'
+      + '|$6$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{86}';
+    }
+    description
+      "The crypt-hash type is used to store passwords using
+       a hash function.  The algorithms for applying the hash
+       function and encoding the result are implemented in
+       various UNIX systems as the function crypt(3).
+
+       A value of this type matches one of the forms:
+
+         $0$<clear text password>
+         $<id>$<salt>$<password hash>
+         $<id>$<parameter>$<salt>$<password hash>
+
+       The '$0$' prefix signals that the value is clear text.  When
+       such a value is received by the server, a hash value is
+       calculated, and the string '$<id>$<salt>$' or
+       $<id>$<parameter>$<salt>$ is prepended to the result.  This
+       value is stored in the configuration data store.
+
+       If a value starting with '$<id>$', where <id> is not '0', is
+       received, the server knows that the value already represents a
+       hashed value, and stores it as is in the data store.
+
+       When a server needs to verify a password given by a user, it
+       finds the stored password hash string for that user, extracts
+       the salt, and calculates the hash with the salt and given
+       password as input.  If the calculated hash value is the same
+       as the stored value, the password given by the client is
+       accepted.
+
+       This type defines the following hash functions:
+
+         id | hash function | feature
+         ---+---------------+-------------------
+          1 | MD5           | crypt-hash-md5
+          5 | SHA-256       | crypt-hash-sha-256
+          6 | SHA-512       | crypt-hash-sha-512
+
+       The server indicates support for the different hash functions
+       by advertising the corresponding feature.";
+    reference
+      "IEEE Std 1003.1-2008 - crypt() function
+       RFC 1321: The MD5 Message-Digest Algorithm
+       FIPS.180-3.2008: Secure Hash Standard";
+  }
+
+  feature crypt-hash-md5 {
+    description
+      "Indicates that the device supports the MD5
+       hash function in 'crypt-hash' values";
+    reference "RFC 1321: The MD5 Message-Digest Algorithm";
+  }
+
+  feature crypt-hash-sha-256 {
+    description
+      "Indicates that the device supports the SHA-256
+       hash function in 'crypt-hash' values";
+    reference "FIPS.180-3.2008: Secure Hash Standard";
+  }
+
+  feature crypt-hash-sha-512 {
+    description
+      "Indicates that the device supports the SHA-512
+       hash function in 'crypt-hash' values";
+    reference "FIPS.180-3.2008: Secure Hash Standard";
+  }
+
+}
diff --git a/profiles/bundles/yang/cisco-ios-xe/iana-if-type.yang b/profiles/bundles/yang/ietf/0.1.2/iana-if-type.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-ios-xe/iana-if-type.yang
rename to profiles/bundles/yang/ietf/0.1.2/iana-if-type.yang
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-action.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-action.yang
new file mode 100755
index 000000000..18773e638
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-action.yang
@@ -0,0 +1,486 @@
+module ietf-diffserv-action {
+    namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-action";
+    prefix action;
+
+    import ietf-inet-types { prefix inet; }
+    import ietf-diffserv-classifier { prefix classifier; }
+    import ietf-diffserv-policy { prefix policy; }
+    import policy-types { prefix policy-types; }
+    organization "IETF NETMOD (Netmod Working Group) Working Group";
+    contact
+        "WG Web: <http://tools.ietf.org/wg/netmod/> WG List: <mailto:netmod@ietf.org>
+        WG Chair: Jurgen Schonwalder <mailto:j.schoenwaelder@jacobs-university.de>
+        WG Chair: Tom Nadeau <mailto:tnadeau@lucidvision.com> Editor:
+        Aseem Choudhary <mailto:asechoud@cisco.com> Editor: Shitanshu
+        Shah <mailto:svshah@cisco.com>";
+    description
+        "This module contains a collection of YANG definitions for configuring
+        diffserv specification implementations. Copyright (c) 2014 IETF
+        Trust and the persons identified as authors of the code. All rights
+        reserved. Redistribution and use in source and binary forms, with
+        or without modification, is permitted pursuant to, and subject
+        to the license terms contained in, the Simplified BSD License
+        set forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents (http://trustee.ietf.org/license-info).
+        This version of this YANG module is part of RFC XXXX; see the
+        RFC itself for full legal notices.";
+
+    revision 2015-04-07 {
+        description
+                "Latest revision for diffserv actions";
+        reference "RFC XXXX";
+    }
+
+    feature hierarchial-policy-support {
+        description
+                " This feature allows hierarchial policy to be configured";
+    }
+
+    feature aqm-red-support {
+        description
+                " This feature allows AQM RED to be configured";
+    }
+
+   feature priority-rate-burst-support {
+        description "support rate and burst in priority";
+    }
+
+    grouping dscp-range {
+        description
+                "dscp range definition";
+        leaf dscp-min {
+            type inet:dscp;
+            description
+                        "Minimum of dscp range";
+        }
+        leaf dscp-max {
+            type inet:dscp;
+            description
+                        "Maximum of dscp range";
+        }
+    }
+
+    grouping burst {
+        description
+                "burst size or interval configuration";
+        choice burst-type {
+            case size {
+                leaf burst-size {
+                    type uint64;
+                    units "bytes";
+                    description
+                                        "burst size";
+                }
+            }
+            case interval {
+                leaf burst-interval {
+                    type uint64;
+                    units "microsecond";
+                    description
+                                        "burst interval";
+                }
+            }
+            description
+                        "Choice of burst type";
+        }
+    }
+
+    grouping threshold {
+        description
+                "Threshold Parameters";
+        container threshold {
+            description
+                        "threshold";
+            choice threshold-type {
+                case size {
+                    leaf threshold-size {
+                        type uint64;
+                        units "bytes";
+                        description
+                                                "Threshold size";
+                    }
+                }
+                case interval {
+                    leaf threshold-interval {
+                        type uint64;
+                        units "microsecond";
+                        description
+                                                "Threshold interval";
+                    }
+                }
+                description
+                                "Choice of threshold type";
+            }
+        }
+    }
+
+    identity marking {
+        base policy:action-type;
+        description
+                "marking action type";
+    }
+
+    identity meter {
+        base policy:action-type;
+        description
+                "meter action type";
+    }
+
+    identity priority {
+        base policy:action-type;
+        description
+                "priority action type";
+    }
+
+    identity min-rate {
+        base policy:action-type;
+        description
+                "min-rate action type";
+    }
+
+    identity max-rate {
+        base policy:action-type;
+        description
+                "max-rate action type";
+    }
+
+    identity algorithmic-drop {
+        base policy:action-type;
+        description
+                "algorithmic-drop action type";
+    }
+
+    identity drop-type {
+        description
+                "drop algorithm";
+    }
+
+    identity always-drop {
+        base drop-type;
+        description
+                "always drop algorithm";
+    }
+
+    identity tail-drop {
+        base drop-type;
+        description
+                "tail drop algorithm";
+    }
+
+    identity random-detect {
+        base drop-type;
+        description
+                "random detect algorithm";
+    }
+
+    identity meter-action-type {
+        description
+                "action type in a meter";
+    }
+
+    identity meter-action-drop {
+        base meter-action-type;
+        description
+                "drop action type in a meter";
+    }
+
+    identity meter-action-set {
+        base meter-action-type;
+        description
+                "mark action type in a meter";
+    }
+
+    grouping drop {
+        leaf drop-action {
+            type empty;
+            description
+                        "always drop algorithm";
+        }
+        description
+                "the drop action";
+    }
+    grouping queuelimit {
+        list qlimit-dscp-thresh {
+            key "dscp-min dscp-max";
+            uses dscp-range;
+            uses threshold;
+            description
+                        "the queue limit per dscp range";
+        }
+        description
+                "the queue limit beyond which queue will not hold any packet";
+    }
+
+    grouping meter-action-params {
+        leaf meter-action-type {
+            type identityref {
+                base meter-action-type;
+            }
+            description
+                        "meter action type";
+        }
+        leaf next-meter-id {
+            type uint16;
+            description
+                        "next meter identifier";
+        }
+        choice val {
+            case meter-action-mark {
+                uses marking;
+                description
+                                "meter action: mark";
+            }
+            case meter-action-drop {
+                description
+                                "meter action: drop";
+                uses drop;
+            }
+            description
+                        " meter action based on choice of meter action type";
+        }
+        description
+                "meter action parameters";
+    }
+
+    grouping meter {
+        leaf meter-id {
+            type uint16;
+            description
+                        "meter identifier";
+        }
+        leaf meter-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "meter rate";
+        }
+        uses burst;
+        container color {
+            uses classifier:classifier-entry-generic-attr;
+            description
+                        "color aware & color blind attributes container";
+        }
+        container succeed-action {
+            uses meter-action-params;
+            description
+                        "confirm action";
+        }
+        container fail-action {
+            uses meter-action-params;
+            description
+                        "exceed action";
+        }
+        description
+                "meter attributes";
+    }
+
+    grouping priority {
+        leaf priority-level {
+            type uint8;
+            description
+                        "priority level";
+        }
+        description
+                "priority attributes";
+    }
+
+    grouping min-rate {
+        leaf min-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "minimum rate";
+        }
+        description
+                "minimum rate grouping";
+    }
+    grouping marking {
+        leaf dscp {
+            type inet:dscp;
+            description
+                        "dscp marking";
+        }
+        description
+                "marking grouping";
+    }
+
+    grouping max-rate {
+        leaf absolute-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "rate in bits per second";
+        }
+        uses burst;
+        description
+                "maximum rate attributes";
+    }
+
+    grouping red-threshold {
+        container red-min-thresh {
+            uses threshold;
+            description
+                        "Minimum threshold";
+        }
+        container red-max-thresh {
+            uses threshold;
+            description
+                        "Maximum threshold";
+        }
+        leaf mark-probability {
+            type uint32 {
+                range "1..1000";
+            }
+            description
+                        "Mark probability";
+        }
+        description
+                "RED threshold attributes";
+    }
+
+    grouping randomdetect {
+        leaf exp-weighting-const {
+            type uint32;
+            description
+                        "Exponential weighting constant factor for red profile ";
+        }
+        uses red-threshold;
+        description
+                "Random detect attributes";
+    }
+
+   typedef percent-value-1to100 {
+        type uint8 {
+            range "1..100";
+        }
+
+        description "Percent range from 1 to 100";
+    }
+
+   grouping RATE-OPER {
+        leaf rate {
+            type uint64;
+            units "bits-per-second";
+            description "Rate value";
+        }
+
+        uses RATE-UNIT;
+        description "Rate value and units operator";
+    }
+
+   grouping RATE-UNIT {
+        leaf absolute-rate-metric {
+            type policy-types:metric;
+            default none;
+            description "Metric";
+        }
+        leaf absolute-rate-units {
+            type policy-types:rate-unit;
+            description "Rate basic units";
+        }
+        
+        leaf rate-percent {
+            type percent-value-1to100;
+            description "percent";
+        }
+        
+        leaf rate-ratio {
+            type uint32 {range "1..65532";}
+        }
+        description "Rate units";
+    } 
+
+    augment "/policy:policies/policy:policy-entry" +
+        "/policy:classifier-entry" +
+        "/policy:classifier-action-entry-cfg" +
+        "/policy:action-cfg-params" {
+        case marking {
+            container marking-cfg {
+                uses marking;
+                description
+                                "Marking configuration container";
+            }
+        }
+        case priority {
+            container priority-cfg {
+                uses priority;
+                container rate-burst {
+                if-feature priority-rate-burst-support;
+                uses RATE-OPER;
+                uses burst; 
+                description "absolute priority rate with/without burst rate" + 
+                    "and absolute percent";
+            }
+                description
+                                "priority attributes container";
+            }
+        }
+        case meter {
+            container meter-cfg {
+                list meter-list {
+                    key "meter-id";
+                    uses meter;
+                    description
+                                        "Meter configuration";
+                }
+                description
+                                "Meter list configuration container";
+            }
+        }
+        case min-rate {
+            container min-rate-cfg {
+                uses min-rate;
+                uses RATE-UNIT;
+                container bw-excess-share-cfg {
+                 leaf value {
+                    type uint32;
+                    description "percentage or ratio value";
+                 }
+                 uses RATE-UNIT;
+                 
+                 description "share the bandwidth remaming";
+            }
+                description
+                                "min guaranteed bandwidth";
+            }
+        }
+        case max-rate {
+            container max-rate-cfg {
+                uses max-rate;
+                uses RATE-UNIT;
+                description
+                                "maximum rate attributes";
+            }
+        }
+        case algorithmic-drop {
+            choice drop-algorithm {
+                case always-drop {
+                    container drop-cfg {
+                        uses drop;
+                        description
+                                                "Always Drop configuration container";
+                    }
+                }
+                case tail-drop {
+                    container tail-drop-cfg {
+                        uses queuelimit;
+                        description
+                                                "Tail Drop configuration container";
+                    }
+                }
+                case random-detect {
+                    container random-detect-cfg {
+                        if-feature aqm-red-support;
+                        uses randomdetect;
+                        description
+                                                "Random Detect configuration container";
+                    }
+                }
+                description
+                                "Choice of Drop Algorithm";
+            }
+        }
+        description
+                "Augment the actions to policy entry";
+    }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-classifier.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-classifier.yang
new file mode 100755
index 000000000..4ef1785c1
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-classifier.yang
@@ -0,0 +1,323 @@
+module ietf-diffserv-classifier {
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-classifier";
+  prefix classifier;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+     
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision of diffserv based classifier";
+    reference "RFC XXXX";
+  }
+
+  feature policy-inline-classifier-config {
+    description
+      " This feature allows classifier configuration 
+        directly under policy.";
+  }
+
+  identity filter-type {
+    description
+      " This is identity of base filter-type";
+  }
+
+  identity dscp {
+    base filter-type;
+    description
+      "DSCP filter-type";
+  }
+
+  identity source-ip-address {
+    base filter-type;
+    description
+      "source-ip-address filter-type";
+  }
+
+  identity destination-ip-address {
+    base filter-type;
+    description
+      "destination-ip-address filter-type";
+  }
+
+  identity source-port {
+    base filter-type;
+    description
+      "source-port filter-type";
+  }
+
+  identity destination-port {
+    base filter-type;
+    description
+      "destination-port filter-type";
+  }
+
+  identity protocol {
+    base filter-type;
+    description
+      "protocol filter-type";
+  }
+
+ 
+  identity classifier-entry-filter-operation-type {
+    description
+      "Classifier entry filter logical operation";
+  }
+
+  identity match-any-filter {
+    base classifier-entry-filter-operation-type;
+    description
+      "Classifier entry filter logical OR operation";
+  }
+
+  identity match-all-filter {
+    base classifier-entry-filter-operation-type;
+    description
+      "Classifier entry filter logical AND operation";
+  }
+
+
+  grouping filters {
+    description
+      "Filters in a Classifier entry";
+    leaf filter-type {
+      type identityref {
+        base filter-type;
+      }
+      description
+        "This leaf defines type of the filter";
+    }
+    leaf filter-logical-not {
+      type boolean;
+      description
+        "
+         This is logical-not operator for a filter. When true, it 
+         indicates filter looks for absence of a pattern defined 
+         by the filter
+        ";
+    }
+    choice filter-param {
+      description
+        "Choice of filter types";
+       case dscp {
+        list dscp-cfg {
+          key "dscp-min dscp-max";
+          description
+            "list of dscp ranges";
+          leaf dscp-min {
+            type inet:dscp;
+            description
+              "Minimum value of dscp range";
+          }
+          leaf dscp-max {
+            type inet:dscp;
+            description
+              "maximum value of dscp range";
+          }
+        }
+        description
+          "Filter containing list of dscp ranges";
+      } 
+
+     
+       case source-ip-address {
+        list source-ip-address-cfg {
+          key "source-ip-addr";
+          description
+            "list of source ip address";
+          leaf source-ip-addr {
+            type inet:ip-prefix;
+            description
+              "source ip prefix";
+          }
+        }
+        description
+          "Filter containing list of source ip addresses";
+      }  
+      
+      case destination-ip-address {
+        list destination-ip-address-cfg {
+          key "destination-ip-addr";
+          description
+            "list of destination ip address";
+          leaf destination-ip-addr {
+            type inet:ip-prefix;
+            description
+              "destination ip prefix";
+          }
+        }
+        description
+          "Filter containing list of destination ip address";
+      }
+      case source-port {
+        list source-port-cfg {
+          key "source-port-min source-port-max";
+          description
+            "list of ranges of source port";
+          leaf source-port-min {
+            type inet:port-number;
+            description
+              "minimum value of source port range";
+          }
+          leaf source-port-max {
+            type inet:port-number;
+            description
+              "maximum value of source port range";
+          }
+        }
+        description
+          "Filter containing list of source-port ranges";
+      }
+      case destination-port {
+        list destination-port-cfg {
+          key "destination-port-min destination-port-max";
+          description
+            "list of ranges of destination port";
+          leaf destination-port-min {
+            type inet:port-number;
+            description
+              "minimum value of destination port range";
+          }
+          leaf destination-port-max {
+            type inet:port-number;
+            description
+              "maximum value of destination port range";
+          }
+        }
+        description
+          "Filter containing list of destination-port ranges";
+      }
+      case protocol {
+        list protocol-cfg {
+          key "protocol-min protocol-max";
+          description
+            "list of ranges of protocol values";
+          leaf protocol-min {
+            type uint8 {
+              range "0..255";
+            }
+            description
+              "minimum value of protocol range";
+          }
+          leaf protocol-max {
+            type uint8 {
+              range "0..255";
+            }
+            description
+              "maximum value of protocol range";
+          }
+        }
+        description
+          "Filter Type Protocol";
+      }
+    }
+  }
+
+  grouping classifier-entry-generic-attr {
+    description
+      "Classifier attributes";
+    leaf classifier-entry-name {
+      type string;
+      description
+        "Diffserv classifier name";
+    }
+    leaf classifier-entry-descr {
+      type string;
+      description
+        "Description of the class template";
+    }
+    leaf classifier-entry-filter-operation {
+      type identityref {
+        base classifier-entry-filter-operation-type;
+      }
+      default "match-any-filter";
+      description
+        "Filters are applicable as any or all filters";
+    }
+  }
+
+  grouping classifier-entry-inline-attr {
+    description
+      "Classifier inline attributes";
+    leaf classifier-entry-inline {
+      type boolean;
+      default "false";
+      description
+        "Indication of inline classifier entry";
+    }
+    leaf classifier-entry-filter-oper {
+      type identityref {
+        base classifier-entry-filter-operation-type;
+      }
+      default "match-any-filter";
+      description
+        "Filters are applicable as any or all filters";
+    }
+    list filter-entry {
+      if-feature policy-inline-classifier-config;
+      must "../classifier-entry-inline = 'true'" {
+        description
+          "For inline filter configuration, inline attribute
+           must be true";
+      }
+      key "filter-type filter-logical-not";
+      uses filters;
+      description
+        "Filters configured inline in a policy";
+    }
+  }
+
+  container classifiers {
+    description
+      "list of classifier entry";
+    list classifier-entry {
+      key "classifier-entry-name";
+      description
+        "classifier entry template";
+      uses classifier-entry-generic-attr;
+      list filter-entry {
+        key "filter-type filter-logical-not";
+        uses filters;
+        description
+          "Filter configuration";
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-policy.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-policy.yang
new file mode 100755
index 000000000..a64df5e4c
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-policy.yang
@@ -0,0 +1,125 @@
+module ietf-diffserv-policy {
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-policy";
+  prefix policy;
+
+  import ietf-diffserv-classifier {
+    prefix classifier;
+  }
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder  
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision of diffserv policy";
+    reference "RFC XXXX";
+  }
+
+  feature policy-template-support {
+    description
+      " This feature allows policy template to be configured";
+  }
+
+  feature hierarchial-policy-support {
+    description
+      " This feature allows hierarchial policy to be configured";
+  }
+
+  grouping policy-generic-attr {
+    description
+      "Policy Attributes";
+    leaf policy-name {
+      type string;
+      description
+        "Diffserv policy name";
+    }
+    leaf policy-descr {
+      type string;
+      description
+        "Diffserv policy description";
+    }
+  }
+
+  identity action-type {
+    description
+      "This base identity type defines action-types";
+  }
+
+  grouping classifier-action-entry-cfg {
+    description
+      "List of Configuration of classifier & associated actions";
+    list classifier-action-entry-cfg {
+      key "action-type";
+      ordered-by user;
+      description
+        "Configuration of classifier & associated actions";
+      leaf action-type {
+        type identityref {
+          base action-type;
+        }
+        description
+          "This defines action type ";
+      }
+      choice action-cfg-params {
+        description
+          "Choice of action types";
+      }
+    }
+  }
+
+  container policies {
+    if-feature policy-template-support;
+    description
+      "list of policy templates";
+    list policy-entry {
+      key "policy-name";
+      description
+        "policy template";
+      uses policy-generic-attr;
+      list classifier-entry {
+        key "classifier-entry-name";
+        ordered-by user;
+        description
+          "Classifier entry configuration in a policy";
+        leaf classifier-entry-name {
+          type string;
+          description
+            "Diffserv classifier entry name";
+        }
+        uses classifier:classifier-entry-inline-attr;
+        uses classifier-action-entry-cfg;
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-target.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-target.yang
new file mode 100755
index 000000000..f03b32e9f
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-diffserv-target.yang
@@ -0,0 +1,261 @@
+module ietf-diffserv-target {
+  
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-target";
+  prefix target;
+
+  import ietf-interfaces {
+    prefix if;
+  }
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder  
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision diffserv based policy applied to a target";
+    reference "RFC XXXX";
+  }
+
+  identity direction {
+    description
+      "This is identity of traffic direction";
+  }
+
+  identity inbound {
+    base direction;
+    description
+      "Direction of traffic coming into the network entry";
+  }
+
+  identity outbound {
+    base direction;
+    description
+      "Direction of traffic going out of the network entry";
+  }
+
+  feature target-inline-policy-config {
+    description
+      "This feature allows the policy configuration 
+       directly under a target.";
+  }
+
+  grouping wred-stats {
+    description
+      "WRED Counters";
+    leaf early-drop-pkts {
+      type uint64;
+      description
+        "Early drop packets ";
+    }
+    leaf early-drop-bytes {
+      type uint64;
+      description
+        "Early drop bytes ";
+    }
+  }
+
+  grouping classifier-entry-stats {
+    description
+      "Classifier Counters";
+    container classifier-entry-statistics {
+      config false;
+      description
+        "
+         This group defines the classifier filter statistics of 
+         each classifier entry
+                
+        ";
+      leaf classified-pkts {
+        type uint64;
+        description
+          " Number of total packets which filtered
+            to the classifier-entry";
+      }
+      leaf classified-bytes {
+        type uint64;
+        description
+          " Number of total bytes which filtered 
+            to the classifier-entry";
+      }
+      leaf classified-rate {
+        type uint64;
+        units "bits-per-second";
+        description
+          " Rate of average data flow through the 
+            classifier-entry";
+      }
+    }
+  }
+
+  grouping queuing-stats {
+    description
+      "Queuing Counters";
+    container queuing-statistics {
+      description
+        "queue related statistics ";
+      leaf output-pkts {
+        type uint64;
+        description
+          "Number of packets transmitted from queue ";
+      }
+      leaf output-bytes {
+        type uint64;
+        description
+          "Number of bytes transmitted from queue ";
+      }
+      leaf queue-size-pkts {
+        type uint64;
+        description
+          "Number of packets currently buffered ";
+      }
+      leaf queue-size-bytes {
+        type uint64;
+        description
+          "Number of bytes currently buffered ";
+      }
+      leaf drop-pkts {
+        type uint64;
+        description
+          "Total number of packets dropped ";
+      }
+      leaf drop-bytes {
+        type uint64;
+        description
+          "Total number of bytes dropped ";
+      }
+      container wred-stats {
+        uses wred-stats;
+        description
+          "Container for WRED statistics";
+      }
+    }
+  }
+
+  grouping meter-stats {
+    description
+      "Metering Counters";
+    list meter-statistics {
+      key "meter-id";
+      description
+        "Meter statistics";
+      leaf meter-id {
+        type uint16;
+        description
+          "Meter Identifier";
+      }
+      leaf meter-succeed-pkts {
+        type uint64;
+        description
+          "Number of packets which succeed the meter";
+      }
+      leaf meter-succeed-bytes {
+        type uint64;
+        description
+          "Bytes of packets which succeed the meter";
+      }
+      leaf meter-failed-pkts {
+        type uint64;
+        description
+          "Number of packets which failed the meter";
+      }
+      leaf meter-failed-bytes {
+        type uint64;
+        description
+          "Bytes of packets which failed the meter";
+      }
+    }
+  }
+
+  augment "/if:interfaces/if:interface" {
+    description
+      "Augments Diffserv Target Entry to Interface module";
+    list diffserv-target-entry {
+      key "direction policy-name";
+      description
+        "policy target for inbound or outbound direction";
+      leaf direction {
+        type identityref {
+          base direction;
+        }
+        description
+          "Direction fo the traffic flow either inbound or outbound";
+      }
+      leaf policy-name {
+        type string;
+        description
+          "Policy entry name";
+      }
+    }
+  }
+
+  augment "/if:interfaces-state/if:interface" {
+    description
+      "Augments Diffserv Target Entry to Interface module";
+    list diffserv-target-entry {
+      key "direction policy-name";
+      description
+        "policy target for inbound or outbound direction";
+      leaf direction {
+        type identityref {
+          base direction;
+        }
+        description
+          "Direction fo the traffic flow either inbound or outbound";
+      }
+      leaf policy-name {
+        type string;
+        description
+          "Policy entry name";
+      }
+      list diffserv-target-classifier-statistics {
+        key "classifier-entry-name parent-path";
+        description
+          "Statistics for each Classifier Entry in a Policy";
+        leaf classifier-entry-name {
+          type string;
+          description
+            "Classifier Entry Name";
+        }
+        leaf parent-path {
+          type string;
+          description
+            "Path of the Classifier Entry in a hierarchial policy ";
+        }
+        uses classifier-entry-stats;
+        uses meter-stats;
+        uses queuing-stats;
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/cisco-ios-xe/ietf-inet-types.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-inet-types.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-ios-xe/ietf-inet-types.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-inet-types.yang
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-interfaces-ext.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-interfaces-ext.yang
new file mode 100644
index 000000000..39f1044ec
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-interfaces-ext.yang
@@ -0,0 +1,70 @@
+module ietf-interfaces-ext {
+
+	namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces-ext";
+	prefix if-ext;
+	import ietf-yang-types {
+		prefix yang;
+	}
+	 import ietf-interfaces {
+		prefix if;
+	 }
+	organization
+		"IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+	contact
+		"WG Web:   <http://tools.ietf.org/wg/netmod/>
+		WG List:  <mailto:netmod@ietf.org>
+
+		WG Chair: David Kessens
+		<mailto:david.kessens@nsn.com>
+
+		WG Chair: Juergen Schoenwaelder
+		<mailto:j.schoenwaelder@jacobs-university.de>
+
+
+		Editor:   Martin Bjorklund
+		<mailto:mbj@tail-f.com>";
+	description
+		"augments needed for IOS-XE platform show interface command";
+
+	augment "/if:interfaces-state/if:interface/if:statistics" {
+		description
+		"this adds a leaf called total input packets as we have no way of doing arithmetic in RPL";
+
+		leaf in-pkts {
+			type yang:counter64;
+			description
+				"total packets input";
+		}
+
+		leaf out-pkts {
+			type yang:counter64;
+			description
+				"total packets output";
+		}
+	}
+
+        augment "/if:interfaces-state/if:interface" {
+                description
+                "This augment adds a container which describes the bandwidth information of an interface.";
+
+                container bandwidth {
+                        description
+                                "Bandwidth data for an interface.";
+
+                        leaf value {
+                                type uint64;
+                                description
+                                        "Raw value for the bandwidth.";
+                        }
+
+                        leaf units {
+                                type string;
+                                description
+                                        "Units of the bandwidth.";
+                        }
+
+                }
+        }
+
+}
diff --git a/profiles/bundles/yang/cisco-ios-xe/ietf-interfaces.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-interfaces.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-ios-xe/ietf-interfaces.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-interfaces.yang
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ip-devs.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ip-devs.yang
new file mode 100755
index 000000000..6e253462d
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ip-devs.yang
@@ -0,0 +1,110 @@
+module ietf-ip-devs {
+  namespace "http://cisco.com/ns/ietf-ip/devs";
+
+  prefix ip-devs;
+
+  import ietf-interfaces {
+     prefix if;
+  }
+
+  import ietf-ip {
+     prefix ip;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    "Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com";
+
+  description
+    "This module defines deviation statements for ietf-ip module.";
+
+  revision 2016-08-10 {
+    description
+      "Updated deviation statements for 16.3.2 release.";
+  }
+
+  revision 2015-09-11 {
+    description
+      "Initial Revision";
+
+    reference
+      "RFC 6020: YANG - A Data Modeling Language for the
+       Network Configuration Protocol (NETCONF)";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv4/ip:enabled {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv4/ip:forwarding {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv4/ip:mtu {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  /* deviation "/if:interfaces/if:interface/ip:ipv4/ip:address" +
+            "/ip:subnet/ip:prefix-length" {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  } */
+
+  deviation /if:interfaces/if:interface/ip:ipv4/ip:neighbor {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:enabled {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:forwarding {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:mtu {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:dup-addr-detect-transmits {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:autoconf {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces/if:interface/ip:ipv6/ip:neighbor {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /if:interfaces-state/if:interface/ip:ipv4 {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 16.3.2 release";
+  }
+
+  deviation /if:interfaces-state/if:interface/ip:ipv6 {
+      deviate not-supported;
+      description  "Not supported in IOS-XE 16.3.2 release";
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ip.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ip.yang
new file mode 100755
index 000000000..f012728b9
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ip.yang
@@ -0,0 +1,642 @@
+module ietf-ip {
+ namespace "urn:ietf:params:xml:ns:yang:ietf-ip";
+ prefix ip;
+ import ietf-interfaces {
+   prefix if;
+ }
+ import ietf-inet-types {
+   prefix inet;
+ }
+ import ietf-yang-types {
+   prefix yang;
+ }
+ organization
+   "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+ contact
+   "WG Web:   <http://tools.ietf.org/wg/netmod/>
+    WG List:  <mailto:netmod@ietf.org>
+    WG Chair: Thomas Nadeau
+              <mailto:tnadeau@lucidvision.com>
+    WG Chair: Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>
+    Editor:   Martin Bjorklund
+              <mailto:mbj@tail-f.com>";
+ description
+   "This module contains a collection of YANG definitions for
+    configuring IP implementations.
+    Copyright (c) 2014 IETF Trust and the persons identified as
+    authors of the code.  All rights reserved.
+    Redistribution and use in source and binary forms, with or
+    without modification, is permitted pursuant to, and subject
+    to the license terms contained in, the Simplified BSD License
+    set forth in Section 4.c of the IETF Trust's Legal Provisions
+    Relating to IETF Documents
+    (http://trustee.ietf.org/license-info).
+    This version of this YANG module is part of RFC 7277; see
+    the RFC itself for full legal notices.";
+ revision 2014-06-16 {
+   description
+     "Initial revision.";
+   reference
+     "RFC 7277: A YANG Data Model for IP Management";
+ }
+ /*
+  * Features
+  */
+ feature ipv4-non-contiguous-netmasks {
+   description
+     "Indicates support for configuring non-contiguous
+      subnet masks.";
+ }
+ feature ipv6-privacy-autoconf {
+   description
+     "Indicates support for Privacy Extensions for Stateless Address
+      Autoconfiguration in IPv6.";
+   reference
+     "RFC 4941: Privacy Extensions for Stateless Address
+                Autoconfiguration in IPv6";
+ }
+ /*
+  * Typedefs
+  */
+ typedef ip-address-origin {
+   type enumeration {
+     enum other {
+       description
+         "None of the following.";
+     }
+     enum static {
+       description
+         "Indicates that the address has been statically
+          configured - for example, using NETCONF or a Command Line
+          Interface.";
+     }
+     enum dhcp {
+       description
+         "Indicates an address that has been assigned to this
+          system by a DHCP server.";
+     }
+     enum link-layer {
+       description
+         "Indicates an address created by IPv6 stateless
+          autoconfiguration that embeds a link-layer address in its
+          interface identifier.";
+     }
+     enum random {
+       description
+         "Indicates an address chosen by the system at
+          random, e.g., an IPv4 address within 169.254/16, an
+          RFC 4941 temporary address, or an RFC 7217 semantically
+          opaque address.";
+       reference
+         "RFC 4941: Privacy Extensions for Stateless Address
+                    Autoconfiguration in IPv6
+          RFC 7217: A Method for Generating Semantically Opaque
+                    Interface Identifiers with IPv6 Stateless
+                    Address Autoconfiguration (SLAAC)";
+     }
+   }
+   description
+     "The origin of an address.";
+ }
+ typedef neighbor-origin {
+   type enumeration {
+     enum other {
+       description
+         "None of the following.";
+     }
+     enum static {
+       description
+         "Indicates that the mapping has been statically
+          configured - for example, using NETCONF or a Command Line
+          Interface.";
+     }
+     enum dynamic {
+       description
+         "Indicates that the mapping has been dynamically resolved
+          using, e.g., IPv4 ARP or the IPv6 Neighbor Discovery
+          protocol.";
+     }
+   }
+   description
+     "The origin of a neighbor entry.";
+ }
+ /*
+  * Configuration data nodes
+  */
+ augment "/if:interfaces/if:interface" {
+   description
+     "Parameters for configuring IP on interfaces.
+      If an interface is not capable of running IP, the server
+      must not allow the client to configure these parameters.";
+   container ipv4 {
+     presence
+       "Enables IPv4 unless the 'enabled' leaf
+        (which defaults to 'true') is set to 'false'";
+     description
+       "Parameters for the IPv4 address family.";
+     leaf enabled {
+       type boolean;
+       default true;
+       description
+         "Controls whether IPv4 is enabled or disabled on this
+          interface.  When IPv4 is enabled, this interface is
+          connected to an IPv4 stack, and the interface can send
+          and receive IPv4 packets.";
+     }
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Controls IPv4 packet forwarding of datagrams received by,
+          but not addressed to, this interface.  IPv4 routers
+          forward datagrams.  IPv4 hosts do not (except those
+          source-routed via the host).";
+     }
+     leaf mtu {
+       type uint16 {
+         range "68..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv4 packet that the
+          interface will send and receive.
+          The server may restrict the allowed values for this leaf,
+          depending on the interface's type.
+          If this leaf is not configured, the operationally used MTU
+          depends on the interface's type.";
+       reference
+         "RFC 791: Internet Protocol";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of configured IPv4 addresses on the interface.";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address on the interface.";
+       }
+       choice subnet {
+         mandatory true;
+         description
+           "The subnet can be specified as a prefix-length, or,
+            if the server supports non-contiguous netmasks, as
+            a netmask.";
+         leaf prefix-length {
+           type uint8 {
+             range "0..32";
+           }
+           description
+             "The length of the subnet prefix.";
+         }
+         leaf netmask {
+           if-feature ipv4-non-contiguous-netmasks;
+           type yang:dotted-quad;
+           description
+             "The subnet specified as a netmask.";
+         }
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv4 addresses to
+          link-layer addresses.
+          Entries in this list are used as static entries in the
+          ARP Cache.";
+       reference
+         "RFC 826: An Ethernet Address Resolution Protocol";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         mandatory true;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+     }
+   }
+   container ipv6 {
+     presence
+       "Enables IPv6 unless the 'enabled' leaf
+        (which defaults to 'true') is set to 'false'";
+     description
+       "Parameters for the IPv6 address family.";
+     leaf enabled {
+       type boolean;
+       default true;
+       description
+         "Controls whether IPv6 is enabled or disabled on this
+          interface.  When IPv6 is enabled, this interface is
+          connected to an IPv6 stack, and the interface can send
+          and receive IPv6 packets.";
+     }
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Controls IPv6 packet forwarding of datagrams received by,
+          but not addressed to, this interface.  IPv6 routers
+          forward datagrams.  IPv6 hosts do not (except those
+          source-routed via the host).";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                    Section 6.2.1, IsRouter";
+     }
+     leaf mtu {
+       type uint32 {
+         range "1280..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv6 packet that the
+          interface will send and receive.
+          The server may restrict the allowed values for this leaf,
+          depending on the interface's type.
+          If this leaf is not configured, the operationally used MTU
+          depends on the interface's type.";
+       reference
+         "RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
+                    Section 5";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of configured IPv6 addresses on the interface.";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address on the interface.";
+       }
+       leaf prefix-length {
+         type uint8 {
+           range "0..128";
+         }
+         mandatory true;
+         description
+           "The length of the subnet prefix.";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv6 addresses to
+          link-layer addresses.
+          Entries in this list are used as static entries in the
+          Neighbor Cache.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         mandatory true;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+     }
+     leaf dup-addr-detect-transmits {
+       type uint32;
+       default 1;
+       description
+         "The number of consecutive Neighbor Solicitation messages
+          sent while performing Duplicate Address Detection on a
+          tentative address.  A value of zero indicates that
+          Duplicate Address Detection is not performed on
+          tentative addresses.  A value of one indicates a single
+          transmission with no follow-up retransmissions.";
+       reference
+         "RFC 4862: IPv6 Stateless Address Autoconfiguration";
+     }
+     container autoconf {
+       description
+         "Parameters to control the autoconfiguration of IPv6
+          addresses, as described in RFC 4862.";
+       reference
+         "RFC 4862: IPv6 Stateless Address Autoconfiguration";
+       leaf create-global-addresses {
+         type boolean;
+         default true;
+         description
+           "If enabled, the host creates global addresses as
+            described in RFC 4862.";
+         reference
+           "RFC 4862: IPv6 Stateless Address Autoconfiguration
+                      Section 5.5";
+       }
+       leaf create-temporary-addresses {
+         if-feature ipv6-privacy-autoconf;
+         type boolean;
+         default false;
+         description
+           "If enabled, the host creates temporary addresses as
+            described in RFC 4941.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6";
+       }
+       leaf temporary-valid-lifetime {
+         if-feature ipv6-privacy-autoconf;
+         type uint32;
+         units "seconds";
+         default 604800;
+         description
+           "The time period during which the temporary address
+            is valid.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6
+                      - TEMP_VALID_LIFETIME";
+       }
+       leaf temporary-preferred-lifetime {
+         if-feature ipv6-privacy-autoconf;
+         type uint32;
+         units "seconds";
+         default 86400;
+         description
+           "The time period during which the temporary address is
+            preferred.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6
+                      - TEMP_PREFERRED_LIFETIME";
+       }
+     }
+   }
+ }
+ /*
+  * Operational state data nodes
+  */
+ augment "/if:interfaces-state/if:interface" {
+   description
+     "Data nodes for the operational state of IP on interfaces.";
+   container ipv4 {
+     presence "Present if IPv4 is enabled on this interface";
+     config false;
+     description
+       "Interface-specific parameters for the IPv4 address family.";
+     leaf forwarding {
+       type boolean;
+       description
+         "Indicates whether IPv4 packet forwarding is enabled or
+          disabled on this interface.";
+     }
+     leaf mtu {
+       type uint16 {
+         range "68..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv4 packet that the
+          interface will send and receive.";
+       reference
+         "RFC 791: Internet Protocol";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of IPv4 addresses on the interface.";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address on the interface.";
+       }
+       choice subnet {
+         description
+           "The subnet can be specified as a prefix-length, or,
+            if the server supports non-contiguous netmasks, as
+            a netmask.";
+         leaf prefix-length {
+           type uint8 {
+             range "0..32";
+           }
+           description
+             "The length of the subnet prefix.";
+         }
+         leaf netmask {
+           if-feature ipv4-non-contiguous-netmasks;
+           type yang:dotted-quad;
+           description
+             "The subnet specified as a netmask.";
+         }
+       }
+       leaf origin {
+         type ip-address-origin;
+         description
+           "The origin of this address.";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv4 addresses to
+          link-layer addresses.
+          This list represents the ARP Cache.";
+       reference
+         "RFC 826: An Ethernet Address Resolution Protocol";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+       leaf origin {
+         type neighbor-origin;
+         description
+           "The origin of this neighbor entry.";
+       }
+     }
+   }
+   container ipv6 {
+     presence "Present if IPv6 is enabled on this interface";
+     config false;
+     description
+       "Parameters for the IPv6 address family.";
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Indicates whether IPv6 packet forwarding is enabled or
+          disabled on this interface.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                    Section 6.2.1, IsRouter";
+     }
+     leaf mtu {
+       type uint32 {
+         range "1280..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv6 packet that the
+          interface will send and receive.";
+       reference
+         "RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
+                    Section 5";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of IPv6 addresses on the interface.";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address on the interface.";
+       }
+       leaf prefix-length {
+         type uint8 {
+           range "0..128";
+         }
+         mandatory true;
+         description
+           "The length of the subnet prefix.";
+       }
+       leaf origin {
+         type ip-address-origin;
+         description
+           "The origin of this address.";
+       }
+       leaf status {
+         type enumeration {
+           enum preferred {
+             description
+               "This is a valid address that can appear as the
+                destination or source address of a packet.";
+           }
+           enum deprecated {
+             description
+               "This is a valid but deprecated address that should
+                no longer be used as a source address in new
+                communications, but packets addressed to such an
+                address are processed as expected.";
+           }
+           enum invalid {
+             description
+               "This isn't a valid address, and it shouldn't appear
+                as the destination or source address of a packet.";
+           }
+           enum inaccessible {
+             description
+               "The address is not accessible because the interface
+                to which this address is assigned is not
+                operational.";
+           }
+           enum unknown {
+             description
+               "The status cannot be determined for some reason.";
+           }
+           enum tentative {
+             description
+               "The uniqueness of the address on the link is being
+                verified.  Addresses in this state should not be
+                used for general communication and should only be
+                used to determine the uniqueness of the address.";
+           }
+           enum duplicate {
+             description
+               "The address has been determined to be non-unique on
+                the link and so must not be used.";
+           }
+           enum optimistic {
+             description
+               "The address is available for use, subject to
+                restrictions, while its uniqueness on a link is
+                being verified.";
+           }
+         }
+         description
+           "The status of an address.  Most of the states correspond
+            to states from the IPv6 Stateless Address
+            Autoconfiguration protocol.";
+         reference
+           "RFC 4293: Management Information Base for the
+                      Internet Protocol (IP)
+                      - IpAddressStatusTC
+            RFC 4862: IPv6 Stateless Address Autoconfiguration";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv6 addresses to
+          link-layer addresses.
+          This list represents the Neighbor Cache.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+       leaf origin {
+         type neighbor-origin;
+         description
+           "The origin of this neighbor entry.";
+       }
+       leaf is-router {
+         type empty;
+         description
+           "Indicates that the neighbor node acts as a router.";
+       }
+       leaf state {
+         type enumeration {
+           enum incomplete {
+             description
+               "Address resolution is in progress, and the link-layer
+                address of the neighbor has not yet been
+                determined.";
+           }
+           enum reachable {
+             description
+               "Roughly speaking, the neighbor is known to have been
+                reachable recently (within tens of seconds ago).";
+           }
+           enum stale {
+             description
+               "The neighbor is no longer known to be reachable, but
+                until traffic is sent to the neighbor no attempt
+                should be made to verify its reachability.";
+           }
+           enum delay {
+             description
+               "The neighbor is no longer known to be reachable, and
+                traffic has recently been sent to the neighbor.
+                Rather than probe the neighbor immediately, however,
+                delay sending probes for a short while in order to
+                give upper-layer protocols a chance to provide
+                reachability confirmation.";
+           }
+           enum probe {
+             description
+               "The neighbor is no longer known to be reachable, and
+                unicast Neighbor Solicitation probes are being sent
+                to verify reachability.";
+           }
+         }
+         description
+           "The Neighbor Unreachability Detection state of this
+            entry.";
+         reference
+           "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                      Section 7.3.2";
+       }
+     }
+   }
+ }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing-devs.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing-devs.yang
new file mode 100755
index 000000000..c91355f75
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing-devs.yang
@@ -0,0 +1,48 @@
+module ietf-ipv4-unicast-routing-devs {
+  namespace "http://cisco.com/ns/ietf-ipv4-unicast-routing/devs";
+
+  prefix v4ur-devs;
+
+  import ietf-routing {
+    prefix rt;
+  }
+
+  import ietf-ipv4-unicast-routing {
+    prefix v4ur;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    " Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com";
+
+  description
+    "This module defines deviation statements for ietf-ipv6-unicast-routing
+     module.";
+
+  revision 2015-09-11 {
+    description
+      "Initial Revision";
+
+    reference
+      "RFC 6020: YANG - A Data Modeling Language for the
+       Network Configuration Protocol (NETCONF)";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/rt:static-routes/v4ur:ipv4" +
+            "/v4ur:route/v4ur:description" {
+    deviate not-supported;
+    description  "Not supported in IOS-XE 3.17 release.";
+  }
+}
+
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing.yang
new file mode 100755
index 000000000..b0ae65ae1
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv4-unicast-routing.yang
@@ -0,0 +1,194 @@
+   module ietf-ipv4-unicast-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing";
+
+     prefix "v4ur";
+
+     import ietf-routing {
+       prefix "rt";
+     }
+
+     import ietf-inet-types {
+       prefix "inet";
+     }
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module augments the 'ietf-routing' module with basic
+        configuration and state data for IPv4 unicast routing.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Identities */
+     identity ipv4-unicast {
+       base rt:ipv4;
+       description
+         "This identity represents the IPv4 unicast address family.";
+     }
+
+     /* State data */
+
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route" {
+       when "../../rt:address-family = 'v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments an IPv4 unicast route.";
+       leaf destination-prefix {
+         type inet:ipv4-prefix;
+         description
+           "IPv4 destination prefix.";
+       }
+     }*/
+
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route/rt:next-hop/rt:next-hop-options/"
+           + "rt:simple-next-hop" {
+       when "../../../rt:address-family = 'v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case of IPv4 unicast
+          routes.";
+       leaf next-hop-address {
+         type inet:ipv4-address;
+         description
+           "IPv4 address of the next-hop.";
+       }
+     }*/
+
+     /* Configuration data */
+
+     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+           + "rt:routing-protocol/rt:static-routes" {
+       description
+         "This augment defines the configuration of the 'static'
+          pseudo-protocol with data specific to IPv4 unicast.";
+       container ipv4 {
+         description
+           "Configuration of a 'static' pseudo-protocol instance
+            consists of a list of routes.";
+         list route {
+           key "destination-prefix";
+           ordered-by "user";
+           description
+             "A user-ordered list of static routes.";
+           leaf destination-prefix {
+             type inet:ipv4-prefix;
+             mandatory "true";
+             description
+               "IPv4 destination prefix.";
+           }
+           leaf description {
+             type string;
+             description
+               "Textual description of the route.";
+           }
+           container next-hop {
+             description
+               "Configuration of next-hop.";
+             uses rt:next-hop-content {
+               augment "next-hop-options" {
+                 description
+                   "Add next-hop address case.";
+                 leaf next-hop-address {
+                   type inet:ipv4-address;
+                   description
+                     "IPv4 address of the next-hop.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     augment "/rt:fib-route/rt:input/rt:destination-address" {
+       when "rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'rt:destination-address' parameter of
+          the 'rt:fib-route' operation.";
+       leaf address {
+         type inet:ipv4-address;
+         description
+           "IPv4 destination address.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route" {
+       when "rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the reply to the 'rt:fib-route'
+          operation.";
+       leaf destination-prefix {
+         type inet:ipv4-prefix;
+         description
+           "IPv4 destination prefix.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
+           + "rt:next-hop-options/rt:simple-next-hop" {
+       when "../rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case in the reply to
+          the 'rt:fib-route' operation.";
+       leaf next-hop-address {
+         type inet:ipv4-address;
+         description
+           "IPv4 address of the next-hop.";
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing-devs.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing-devs.yang
new file mode 100755
index 000000000..cef745c21
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing-devs.yang
@@ -0,0 +1,47 @@
+module ietf-ipv6-unicast-routing-devs {
+  namespace "http://cisco.com/ns/ietf-ipv6-unicast-routing/devs";
+
+  prefix v6ur-devs;
+
+  import ietf-routing {
+    prefix rt;
+  }
+
+  import ietf-ipv6-unicast-routing {
+    prefix v6ur;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    " Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com";
+
+  description
+    "This module defines deviation statements for ietf-ipv6-unicast-routing
+     module.";
+
+  revision 2015-09-11 {
+    description
+      "Initial Revision";
+
+    reference
+      "RFC 6020: YANG - A Data Modeling Language for the
+       Network Configuration Protocol (NETCONF)";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/rt:static-routes/v6ur:ipv6" +
+            "/v6ur:route/v6ur:description" {
+    deviate not-supported;
+    description  "Not supported in IOS-XE 3.17 release.";
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing.yang
new file mode 100755
index 000000000..d03a237c0
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ipv6-unicast-routing.yang
@@ -0,0 +1,596 @@
+   module ietf-ipv6-unicast-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing";
+
+     prefix "v6ur";
+
+     import ietf-routing {
+       prefix "rt";
+     }
+
+     import ietf-inet-types {
+       prefix "inet";
+     }
+
+     import ietf-interfaces {
+       prefix "if";
+     }
+
+     import ietf-ip {
+       prefix "ip";
+     }
+
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module augments the 'ietf-routing' module with basic
+        configuration and state data for IPv6 unicast routing.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Identities */
+
+     identity ipv6-unicast {
+       base rt:ipv6;
+       description
+         "This identity represents the IPv6 unicast address family.";
+     }
+
+     /* State data */
+/*  Oper data not available causes REST interface timeout Mark Collins 11.5.15
+     augment "/if:interfaces-state/if:interface/ip:ipv6" {
+       description
+         "Augment interface state data with IPv6-specific parameters of
+          router interfaces.";
+       container ipv6-router-advertisements {
+         description
+           "Parameters of IPv6 Router Advertisements.";
+         leaf send-advertisements {
+           type boolean;
+           description
+             "A flag indicating whether or not the router sends periodic
+              Router Advertisements and responds to Router
+              Solicitations.";
+         }
+         leaf max-rtr-adv-interval {
+           type uint16 {
+             range "4..1800";
+           }
+           units "seconds";
+           description
+             "The maximum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+         }
+         leaf min-rtr-adv-interval {
+           type uint16 {
+             range "3..1350";
+           }
+           units "seconds";
+           description
+             "The minimum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+         }
+         leaf managed-flag {
+           type boolean;
+           description
+             "The value that is placed in the 'Managed address
+              configuration' flag field in the Router Advertisement.";
+         }
+         leaf other-config-flag {
+           type boolean;
+           description
+             "The value that is placed in the 'Other configuration' flag
+              field in the Router Advertisement.";
+         }
+         leaf link-mtu {
+           type uint32;
+           description
+             "The value that is placed in MTU options sent by the
+              router. A value of zero indicates that no MTU options are
+              sent.";
+         }
+         leaf reachable-time {
+           type uint32 {
+             range "0..3600000";
+           }
+           units "milliseconds";
+           description
+             "The value that is placed in the Reachable Time field in
+              the Router Advertisement messages sent by the router. A
+              value of zero means unspecified (by this router).";
+         }
+         leaf retrans-timer {
+           type uint32;
+           units "milliseconds";
+           description
+             "The value that is placed in the Retrans Timer field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+         }
+         leaf cur-hop-limit {
+           type uint8;
+           description
+             "The value that is placed in the Cur Hop Limit field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+         }
+         leaf default-lifetime {
+           type uint16 {
+             range "0..9000";
+           }
+           units "seconds";
+           description
+             "The value that is placed in the Router Lifetime field of
+              Router Advertisements sent from the interface, in seconds.
+              A value of zero indicates that the router is not to be
+              used as a default router.";
+         }
+         container prefix-list {
+           description
+             "A list of prefixes that are placed in Prefix Information
+              options in Router Advertisement messages sent from the
+              interface.
+
+              By default, these are all prefixes that the router
+              advertises via routing protocols as being on-link for the
+              interface from which the advertisement is sent.";
+           list prefix {
+             key "prefix-spec";
+             description
+               "Advertised prefix entry and its parameters.";
+             leaf prefix-spec {
+               type inet:ipv6-prefix;
+               description
+                 "IPv6 address prefix.";
+             }
+             leaf valid-lifetime {
+               type uint32;
+               units "seconds";
+               description
+                 "The value that is placed in the Valid Lifetime in the
+                  Prefix Information option. The designated value of all
+                  1's (0xffffffff) represents infinity.
+
+                  An implementation SHOULD keep this value constant in
+                  consecutive advertisements except when it is
+                  explicitly changed in configuration.";
+             }
+             leaf on-link-flag {
+               type boolean;
+               description
+                 "The value that is placed in the on-link flag ('L-bit')
+                  field in the Prefix Information option.";
+             }
+             leaf preferred-lifetime {
+               type uint32;
+               units "seconds";
+               description
+                 "The value that is placed in the Preferred Lifetime in
+                  the Prefix Information option, in seconds. The
+                  designated value of all 1's (0xffffffff) represents
+                  infinity.
+
+                  An implementation SHOULD keep this value constant in
+                  consecutive advertisements except when it is
+                  explicitly changed in configuration.";
+             }
+             leaf autonomous-flag {
+               type boolean;
+               description
+                 "The value that is placed in the Autonomous Flag field
+                  in the Prefix Information option.";
+             }
+           }
+         }
+       }
+     }
+*/
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route" {
+       when "../../rt:address-family = 'v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments an IPv6 unicast route.";
+       leaf destination-prefix {
+         type inet:ipv6-prefix;
+         description
+           "IPv6 destination prefix.";
+       }
+     }*/
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route/rt:next-hop/rt:next-hop-options/"
+           + "rt:simple-next-hop" {
+       when "../../../rt:address-family = 'v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case of IPv6 unicast
+          routes.";
+       leaf next-hop-address {
+         type inet:ipv6-address;
+         description
+           "IPv6 address of the next-hop.";
+       }
+     }*/
+
+     /* Configuration data */
+
+     augment "/if:interfaces/if:interface/ip:ipv6" {
+       description
+         "Augment interface configuration with IPv6-specific parameters
+          of router interfaces.";
+       container ipv6-router-advertisements {
+         description
+           "Configuration of IPv6 Router Advertisements.";
+         leaf send-advertisements {
+           type boolean;
+           default "false";
+           description
+             "A flag indicating whether or not the router sends periodic
+              Router Advertisements and responds to Router
+              Solicitations.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvSendAdvertisements.";
+         }
+         leaf max-rtr-adv-interval {
+           type uint16 {
+             range "4..1800";
+           }
+           units "seconds";
+           default "600";
+           description
+             "The maximum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              MaxRtrAdvInterval.";
+         }
+         leaf min-rtr-adv-interval {
+           type uint16 {
+             range "3..1350";
+           }
+           units "seconds";
+           must ". <= 0.75 * ../max-rtr-adv-interval" {
+             description
+               "The value MUST NOT be greater than 75 % of
+                'max-rtr-adv-interval'.";
+           }
+           description
+             "The minimum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.
+
+              The default value to be used operationally if this leaf is
+              not configured is determined as follows:
+
+              - if max-rtr-adv-interval >= 9 seconds, the default value
+                is 0.33 * max-rtr-adv-interval;
+
+              - otherwise it is 0.75 * max-rtr-adv-interval.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              MinRtrAdvInterval.";
+         }
+         leaf managed-flag {
+           type boolean;
+           default "false";
+           description
+             "The value to be placed in the 'Managed address
+              configuration' flag field in the Router Advertisement.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvManagedFlag.";
+         }
+         leaf other-config-flag {
+           type boolean;
+           default "false";
+           description
+             "The value to be placed in the 'Other configuration' flag
+              field in the Router Advertisement.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvOtherConfigFlag.";
+         }
+         leaf link-mtu {
+           type uint32;
+           default "0";
+           description
+             "The value to be placed in MTU options sent by the router.
+              A value of zero indicates that no MTU options are sent.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvLinkMTU.";
+         }
+         leaf reachable-time {
+           type uint32 {
+             range "0..3600000";
+           }
+           units "milliseconds";
+           default "0";
+           description
+             "The value to be placed in the Reachable Time field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvReachableTime.";
+         }
+         leaf retrans-timer {
+           type uint32;
+           units "milliseconds";
+           default "0";
+           description
+             "The value to be placed in the Retrans Timer field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvRetransTimer.";
+         }
+         leaf cur-hop-limit {
+           type uint8;
+           description
+             "The value to be placed in the Cur Hop Limit field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).
+
+              If this parameter is not configured, the device SHOULD use
+              the value specified in IANA Assigned Numbers that was in
+              effect at the time of implementation.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvCurHopLimit.
+              IANA: IP Parameters,
+              http://www.iana.org/assignments/ip-parameters";
+         }
+         leaf default-lifetime {
+           type uint16 {
+             range "0..9000";
+           }
+           units "seconds";
+           description
+             "The value to be placed in the Router Lifetime field of
+              Router Advertisements sent from the interface, in seconds.
+              It MUST be either zero or between max-rtr-adv-interval and
+              9000 seconds. A value of zero indicates that the router is
+              not to be used as a default router. These limits may be
+              overridden by specific documents that describe how IPv6
+              operates over different link layers.
+
+              If this parameter is not configured, the device SHOULD use
+              a value of 3 * max-rtr-adv-interval.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvDefaultLifeTime.";
+         }
+         container prefix-list {
+           description
+             "Configuration of prefixes to be placed in Prefix
+              Information options in Router Advertisement messages sent
+              from the interface.
+
+              Prefixes that are advertised by default but do not have
+              their entries in the child 'prefix' list are advertised
+              with the default values of all parameters.
+
+              The link-local prefix SHOULD NOT be included in the list
+              of advertised prefixes.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvPrefixList.";
+           list prefix {
+             key "prefix-spec";
+             description
+               "Configuration of an advertised prefix entry.";
+             leaf prefix-spec {
+               type inet:ipv6-prefix;
+               description
+                 "IPv6 address prefix.";
+             }
+             choice control-adv-prefixes {
+               default "advertise";
+               description
+                 "The prefix either may be explicitly removed from the
+                  set of advertised prefixes, or parameters with which
+                  it is advertised may be specified (default case).";
+               leaf no-advertise {
+                 type empty;
+                 description
+                   "The prefix will not be advertised.
+
+                    This can be used for removing the prefix from the
+                    default set of advertised prefixes.";
+               }
+               case advertise {
+                 leaf valid-lifetime {
+                   type uint32;
+                   units "seconds";
+                   default "2592000";
+                   description
+                     "The value to be placed in the Valid Lifetime in
+                      the Prefix Information option. The designated
+                      value of all 1's (0xffffffff) represents
+                      infinity.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvValidLifetime.";
+                 }
+                 leaf on-link-flag {
+                   type boolean;
+                   default "true";
+                   description
+                     "The value to be placed in the on-link flag
+                      ('L-bit') field in the Prefix Information
+                      option.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvOnLinkFlag.";
+                 }
+                 leaf preferred-lifetime {
+                   type uint32;
+                   units "seconds";
+                   must ". <= ../valid-lifetime" {
+                     description
+                       "This value MUST NOT be greater than
+                        valid-lifetime.";
+                   }
+                   default "604800";
+                   description
+                     "The value to be placed in the Preferred Lifetime
+                      in the Prefix Information option. The designated
+                      value of all 1's (0xffffffff) represents
+                      infinity.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvPreferredLifetime.";
+                 }
+                 leaf autonomous-flag {
+                   type boolean;
+                   default "true";
+                   description
+                     "The value to be placed in the Autonomous Flag
+                      field in the Prefix Information option.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvAutonomousFlag.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+           + "rt:routing-protocol/rt:static-routes" {
+       description
+         "This augment defines the configuration of the 'static'
+          pseudo-protocol with data specific to IPv6 unicast.";
+       container ipv6 {
+         description
+           "Configuration of a 'static' pseudo-protocol instance
+            consists of a list of routes.";
+         list route {
+           key "destination-prefix";
+           ordered-by "user";
+           description
+             "A user-ordered list of static routes.";
+           leaf destination-prefix {
+             type inet:ipv6-prefix;
+             mandatory "true";
+             description
+               "IPv6 destination prefix.";
+           }
+           leaf description {
+             type string;
+             description
+               "Textual description of the route.";
+           }
+           container next-hop {
+             description
+               "Configuration of next-hop.";
+             uses rt:next-hop-content {
+               augment "next-hop-options" {
+                 description
+                   "Add next-hop address case.";
+                 leaf next-hop-address {
+                   type inet:ipv6-address;
+                   description
+                     "IPv6 address of the next-hop.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     augment "/rt:fib-route/rt:input/rt:destination-address" {
+       when "rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'rt:destination-address' parameter of
+          the 'rt:fib-route' operation.";
+       leaf address {
+         type inet:ipv6-address;
+         description
+           "IPv6 destination address.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route" {
+       when "rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the reply to the 'rt:fib-route'
+          operation.";
+       leaf destination-prefix {
+         type inet:ipv6-prefix;
+         description
+           "IPv6 destination prefix.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
+           + "rt:next-hop-options/rt:simple-next-hop" {
+       when "../rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case in the reply to
+          the 'rt:fib-route' operation.";
+       leaf next-hop-address {
+         type inet:ipv6-address;
+         description
+           "IPv6 address of the next-hop.";
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-key-chain.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-key-chain.yang
new file mode 100755
index 000000000..bbe394ba5
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-key-chain.yang
@@ -0,0 +1,260 @@
+module ietf-key-chain {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-key-chain";
+  // replace with IANA namespace when assigned
+  prefix "key-chain";
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+  
+  organization
+    "Cisco Systems
+     170 West Tasman Drive
+     San Jose, CA 95134-1706
+     USA";
+  contact
+    "Acee Lindem - acee@cisco.com";
+
+  description
+    "This YANG module defines the generic configuration
+     data for key-chain. It is intended that the module
+     will be extended by vendors to define vendor-specific
+     key-chain configuration parameters.
+    ";
+  
+  revision 2015-02-24 {
+    description
+      "Initial revision.";
+    reference
+      "RFC XXXX: A YANG Data Model for key-chain";
+  }
+
+  typedef key-chain-ref {
+     type leafref {
+       path "/key-chain:key-chains/key-chain:name";
+     }
+     description 
+       "This type is used by data models that need to reference
+        configured key-chains.";
+  }           
+
+  feature hex-key-string {
+    description
+      "Support hexadecimal key string.";
+  }
+
+  feature accept-tolerance {
+    description
+      "To specify the tolerance or acceptance limit.";
+  }
+
+  feature independent-send-accept-lifetime {
+    description
+      "Support for independent send and accept key lifetimes.";
+  }
+
+  grouping lifetime {
+    description 
+      "Key lifetime specification.";
+    choice lifetime {
+      default always;
+      description 
+        "Options for specifying key accept or send lifetimes";
+      case always {
+        leaf always {
+          type empty;
+            description
+              "Indicates key lifetime is always valid.";
+        }
+      }
+      case start-end-time {
+        leaf start-date-time {
+          type yang:date-and-time;
+          description "Start time.";
+        }
+        choice end-time {
+          default infinite;
+          description
+            "End-time setting.";
+          case infinite {
+	    leaf no-end-time {
+              type empty;
+            description
+              "Indicates key lifetime end-time in infinite.";
+            } 
+          }
+          case duration {
+            leaf duration {
+              type uint32 {
+                range "1..2147483646";
+              }
+              units seconds;
+              description "Key lifetime duration, in seconds";
+            }  
+          }
+          case end-date-time {
+            leaf end-date-time {
+              type yang:date-and-time;
+              description "End time.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+ grouping crypto-algorithm-types {
+     description "Cryptographic algorithm types.";
+   choice algorithm {
+     description
+         "Options for crytographic algorithm specification.";
+     case hmac-sha1-12 {
+         leaf hmac-sha1-12 {
+             type empty;
+             description "The HMAC-SHA1-12 algorithm.";
+         }
+     }
+     case hmac-sha1-20 {
+         leaf hmac-sha1-20 {
+             type empty;
+             description "The HMAC-SHA1-20 algorithm.";
+         }
+     }
+     case md5 {
+         leaf md5 {
+             type empty;
+             description "The MD5 algorithm.";
+         }
+     }
+     case sha-1 {
+         leaf sha-1 {
+             type empty;
+             description "The SHA-1 algorithm.";
+         }
+     }
+     case hmac-sha-1 {
+         leaf hmac-sha-1 {
+             type empty;
+             description "HMAC-SHA-1 authentication algorithm.";
+         }
+     }
+     case hmac-sha-256 {
+         leaf hmac-sha-256 {
+             type empty;
+             description "HMAC-SHA-256 authentication algorithm.";
+         }
+     }
+     case hmac-sha-384 {
+         leaf hmac-sha-384 {
+             type empty;
+             description "HMAC-SHA-384 authentication algorithm.";
+         }
+     }
+     case hmac-sha-512 {
+         leaf hmac-sha-512 {
+             type empty;
+             description "HMAC-SHA-512 authentication algorithm.";
+         }
+     }
+   }
+ }
+  
+  grouping key-chain {
+    description 
+      "key-chain specification grouping.";    
+    leaf name {
+      type string;
+      description "Name of the key-chain.";
+    }
+
+    container accept-tolerance {
+      if-feature accept-tolerance;
+      description 
+        "Tolerance for key lifetime acceptance (seconds).";
+      leaf duration {
+        type uint32;
+        units seconds;
+        default "0";
+        description
+          "Tolerance range, in seconds.";
+      } 
+    }
+
+    list key {
+      key "key-id";
+      description "One key.";
+      leaf key-id {
+        type uint64;
+        description "Key id.";
+      }
+      container key-string {
+        description "The key string.";
+        choice key-string-style {
+           description
+             "Key string styles";
+           case keystring {
+             leaf keystring {
+               type string;
+               description "Key string in ASCII format.";
+             } 
+           }
+           case hexadecimal {
+             if-feature hex-key-string;
+             leaf hexadecimal-string {
+               type yang:hex-string;
+               description
+                 "Key in hexadecimal string format.";
+             }
+           }
+         }
+      }
+      container lifetime {
+        description "Specify a key's lifetime.";
+        choice lifetime {
+          description  
+            "Options for specification of send and accept
+             lifetimes.";
+          case send-and-accept-lifetime {
+            description
+              "Send and accept key have the same lifetime.";
+            container send-accept-lifetime {
+              uses lifetime;
+              description
+                "Single lifetime specification for both send and
+                 accept lifetimes.";
+            }
+          }
+          case independent-send-accept-lifetime {
+            if-feature independent-send-accept-lifetime;
+            description
+              "Independent send and accept key lifetimes.";
+            container send-lifetime {
+              uses lifetime;
+              description
+                "Separate lifetime specification for send
+                 lifetime.";
+            }
+            container accept-lifetime {
+              uses lifetime;
+              description
+                "Separate lifetime specification for accept
+                 lifetime.";
+            }
+          }
+        }
+      }
+      container crypto-algorithm {
+        uses crypto-algorithm-types;
+        description "Cryptographic algorithm associated with key.";
+      } 
+    }
+  }
+
+  list key-chains {
+    key "name";
+    description
+      "A key-chain is a sequence of keys that are collectively
+      managed for authentication.";
+    uses key-chain;
+  }
+} 
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf-acm.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-acm.yang
old mode 100644
new mode 100755
similarity index 75%
rename from profiles/bundles/yang/ietf/0.1.6/ietf-netconf-acm.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-netconf-acm.yang
index bf4855faf..19ab8345f
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf-acm.yang
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-acm.yang
@@ -2,7 +2,7 @@ module ietf-netconf-acm {
 
   namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-acm";
 
-  prefix nacm;
+  prefix "nacm";
 
   import ietf-yang-types {
     prefix yang;
@@ -12,43 +12,40 @@ module ietf-netconf-acm {
     "IETF NETCONF (Network Configuration) Working Group";
 
   contact
-    "WG Web:   <https://datatracker.ietf.org/wg/netconf/>
+    "WG Web:   <http://tools.ietf.org/wg/netconf/>
      WG List:  <mailto:netconf@ietf.org>
 
-     Author:   Andy Bierman
+     WG Chair: Mehmet Ersue
+               <mailto:mehmet.ersue@nsn.com>
+
+     WG Chair: Bert Wijnen
+               <mailto:bertietf@bwijnen.net>
+
+     Editor:   Andy Bierman
                <mailto:andy@yumaworks.com>
 
-     Author:   Martin Bjorklund
+     Editor:   Martin Bjorklund
                <mailto:mbj@tail-f.com>";
 
   description
-    "Network Configuration Access Control Model.
+    "NETCONF Access Control Model.
 
-     Copyright (c) 2012 - 2018 IETF Trust and the persons
-     identified as authors of the code.  All rights reserved.
+     Copyright (c) 2012 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
 
      Redistribution and use in source and binary forms, with or
      without modification, is permitted pursuant to, and subject
      to the license terms contained in, the Simplified BSD
      License set forth in Section 4.c of the IETF Trust's
      Legal Provisions Relating to IETF Documents
-     (https://trustee.ietf.org/license-info).
+     (http://trustee.ietf.org/license-info).
 
-     This version of this YANG module is part of RFC 8341; see
+     This version of this YANG module is part of RFC 6536; see
      the RFC itself for full legal notices.";
 
-  revision "2018-02-14" {
-    description
-      "Added support for YANG 1.1 actions and notifications tied to
-       data nodes.  Clarified how NACM extensions can be used by
-       other data models.";
-    reference
-      "RFC 8341: Network Configuration Access Control Model";
-  }
-
   revision "2012-02-22" {
     description
-      "Initial version.";
+      "Initial version";
     reference
       "RFC 6536: Network Configuration Protocol (NETCONF)
                  Access Control Model";
@@ -63,13 +60,11 @@ module ietf-netconf-acm {
       "Used to indicate that the data model node
        represents a sensitive security system parameter.
 
-       If present, the NETCONF server will only allow the designated
-       'recovery session' to have write access to the node.  An
-       explicit access control rule is required for all other users.
-
-       If the NACM module is used, then it must be enabled (i.e.,
-       /nacm/enable-nacm object equals 'true'), or this extension
-       is ignored.
+       If present, and the NACM module is enabled (i.e.,
+       /nacm/enable-nacm object equals 'true'), the NETCONF server
+       will only allow the designated 'recovery session' to have
+       write access to the node.  An explicit access control rule is
+       required for all other users.
 
        The 'default-deny-write' extension MAY appear within a data
        definition statement.  It is ignored otherwise.";
@@ -80,14 +75,11 @@ module ietf-netconf-acm {
       "Used to indicate that the data model node
        controls a very sensitive security system parameter.
 
-       If present, the NETCONF server will only allow the designated
-       'recovery session' to have read, write, or execute access to
-       the node.  An explicit access control rule is required for all
-       other users.
-
-       If the NACM module is used, then it must be enabled (i.e.,
-       /nacm/enable-nacm object equals 'true'), or this extension
-       is ignored.
+       If present, and the NACM module is enabled (i.e.,
+       /nacm/enable-nacm object equals 'true'), the NETCONF server
+       will only allow the designated 'recovery session' to have
+       read, write, or execute access to the node.  An explicit
+       access control rule is required for all other users.
 
        The 'default-deny-all' extension MAY appear within a data
        definition statement, 'rpc' statement, or 'notification'
@@ -103,7 +95,7 @@ module ietf-netconf-acm {
       length "1..max";
     }
     description
-      "General-purpose username string.";
+      "General Purpose Username string.";
   }
 
   typedef matchall-string-type {
@@ -143,7 +135,7 @@ module ietf-netconf-acm {
       }
     }
     description
-      "Access operation.";
+      "NETCONF Access Operation.";
   }
 
   typedef group-name-type {
@@ -176,34 +168,29 @@ module ietf-netconf-acm {
     type yang:xpath1.0;
     description
       "Path expression used to represent a special
-       data node, action, or notification instance-identifier
-       string.
+       data node instance identifier string.
 
        A node-instance-identifier value is an
        unrestricted YANG instance-identifier expression.
-       All the same rules as an instance-identifier apply,
-       except that predicates for keys are optional.  If a key
+       All the same rules as an instance-identifier apply
+       except predicates for keys are optional.  If a key
        predicate is missing, then the node-instance-identifier
        represents all possible server instances for that key.
 
-       This XML Path Language (XPath) expression is evaluated in the
-       following context:
-
-          o  The set of namespace declarations are those in scope on
-             the leaf element where this type is used.
+       This XPath expression is evaluated in the following context:
 
-          o  The set of variable bindings contains one variable,
-             'USER', which contains the name of the user of the
-             current session.
+        o  The set of namespace declarations are those in scope on
+           the leaf element where this type is used.
 
-          o  The function library is the core function library, but
-             note that due to the syntax restrictions of an
-             instance-identifier, no functions are allowed.
+        o  The set of variable bindings contains one variable,
+           'USER', which contains the name of the user of the current
+            session.
 
-          o  The context node is the root node in the data tree.
+        o  The function library is the core function library, but
+           note that due to the syntax restrictions of an
+           instance-identifier, no functions are allowed.
 
-       The accessible tree includes actions and notifications tied
-       to data nodes.";
+        o  The context node is the root node in the data tree.";
   }
 
   /*
@@ -214,11 +201,11 @@ module ietf-netconf-acm {
     nacm:default-deny-all;
 
     description
-      "Parameters for NETCONF access control model.";
+      "Parameters for NETCONF Access Control Model.";
 
     leaf enable-nacm {
       type boolean;
-      default "true";
+      default true;
       description
         "Enables or disables all NETCONF access control
          enforcement.  If 'true', then enforcement
@@ -254,7 +241,7 @@ module ietf-netconf-acm {
 
     leaf enable-external-groups {
       type boolean;
-      default "true";
+      default true;
       description
         "Controls whether the server uses the groups reported by the
          NETCONF transport layer when it assigns the user to a set of
@@ -294,13 +281,13 @@ module ietf-netconf-acm {
 
     container groups {
       description
-        "NETCONF access control groups.";
+        "NETCONF Access Control Groups.";
 
       list group {
         key name;
 
         description
-          "One NACM group entry.  This list will only contain
+          "One NACM Group Entry.  This list will only contain
            configured entries, not any entries learned from
            any transport protocols.";
 
@@ -321,7 +308,7 @@ module ietf-netconf-acm {
     }
 
     list rule-list {
-      key name;
+      key "name";
       ordered-by user;
       description
         "An ordered collection of access control rules.";
@@ -348,7 +335,7 @@ module ietf-netconf-acm {
       }
 
       list rule {
-        key name;
+        key "name";
         ordered-by user;
         description
           "One access control rule.
@@ -356,8 +343,8 @@ module ietf-netconf-acm {
            Rules are processed in user-defined order until a match is
            found.  A rule matches if 'module-name', 'rule-type', and
            'access-operations' match the request.  If a rule
-           matches, the 'action' leaf determines whether or not
-           access is granted.";
+           matches, the 'action' leaf determines if access is granted
+           or not.";
 
         leaf name {
           type string {
@@ -408,20 +395,18 @@ module ietf-netconf-acm {
                  value equals the requested notification name.";
             }
           }
-
           case data-node {
             leaf path {
               type node-instance-identifier;
               mandatory true;
               description
-                "Data node instance-identifier associated with the
-                 data node, action, or notification controlled by
-                 this rule.
+                "Data Node Instance Identifier associated with the
+                 data node controlled by this rule.
 
-                 Configuration data or state data
-                 instance-identifiers start with a top-level
-                 data node.  A complete instance-identifier is
-                 required for this type of path value.
+                 Configuration data or state data instance
+                 identifiers start with a top-level data node.  A
+                 complete instance identifier is required for this
+                 type of path value.
 
                  The special value '/' refers to all possible
                  datastore contents.";
@@ -447,7 +432,7 @@ module ietf-netconf-acm {
           mandatory true;
           description
             "The access control action associated with the
-             rule.  If a rule has been determined to match a
+             rule.  If a rule is determined to match a
              particular request, then this object is used
              to determine whether to permit or deny the
              request.";
diff --git a/profiles/bundles/yang/cisco-ios-xe/ietf-netconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-monitoring.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-ios-xe/ietf-netconf-monitoring.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-netconf-monitoring.yang
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-notifications.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-notifications.yang
new file mode 100755
index 000000000..a9083b2c6
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-notifications.yang
@@ -0,0 +1,334 @@
+module ietf-netconf-notifications {
+
+  namespace
+    "urn:ietf:params:xml:ns:yang:ietf-netconf-notifications";
+
+  prefix ncn;
+
+  import ietf-inet-types { prefix inet; }
+  import ietf-netconf { prefix nc; }
+
+  organization
+    "IETF NETCONF (Network Configuration Protocol) Working Group";
+
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netconf/>
+     WG List:  <mailto:netconf@ietf.org>
+
+     WG Chair: Bert Wijnen
+               <mailto:bertietf@bwijnen.net>
+
+     WG Chair: Mehmet Ersue
+               <mailto:mehmet.ersue@nsn.com>
+
+     Editor:   Andy Bierman
+               <mailto:andy@netconfcentral.org>";
+
+  description
+    "This module defines a YANG data model for use with the
+     NETCONF protocol that allows the NETCONF client to
+     receive common NETCONF base event notifications.
+
+     Copyright (c) 2012 IETF Trust and the persons identified as
+     the document authors.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 6470; see
+     the RFC itself for full legal notices.";
+
+  revision "2012-02-06" {
+    description
+      "Initial version.";
+    reference
+      "RFC 6470: NETCONF Base Notifications";
+  }
+
+  grouping common-session-parms {
+    description
+      "Common session parameters to identify a
+       management session.";
+
+    leaf username {
+      type string;
+      mandatory true;
+      description
+        "Name of the user for the session.";
+    }
+
+    leaf session-id {
+      type nc:session-id-or-zero-type;
+      mandatory true;
+      description
+        "Identifier of the session.
+         A NETCONF session MUST be identified by a non-zero value.
+         A non-NETCONF session MAY be identified by the value zero.";
+    }
+
+    leaf source-host {
+      type inet:ip-address;
+      description
+        "Address of the remote host for the session.";
+    }
+  }
+
+  grouping changed-by-parms {
+    description
+      "Common parameters to identify the source
+       of a change event, such as a configuration
+       or capability change.";
+
+    container changed-by {
+      description
+        "Indicates the source of the change.
+         If caused by internal action, then the
+         empty leaf 'server' will be present.
+         If caused by a management session, then
+         the name, remote host address, and session ID
+         of the session that made the change will be reported.";
+      choice server-or-user {
+        mandatory true;
+        leaf server {
+          type empty;
+          description
+            "If present, the change was caused
+             by the server.";
+        }
+
+        case by-user {
+          uses common-session-parms;
+        }
+      } // choice server-or-user
+    } // container changed-by-parms
+  }
+
+  notification netconf-config-change {
+    description
+      "Generated when the NETCONF server detects that the
+       <running> or <startup> configuration datastore
+       has been changed by a management session.
+       The notification summarizes the edits that
+       have been detected.
+
+       The server MAY choose to also generate this
+       notification while loading a datastore during the
+       boot process for the device.";
+
+    uses changed-by-parms;
+
+    leaf datastore {
+      type enumeration {
+        enum running {
+          description "The <running> datastore has changed.";
+        }
+        enum startup {
+          description "The <startup> datastore has changed";
+        }
+      }
+      default "running";
+      description
+        "Indicates which configuration datastore has changed.";
+    }
+
+    list edit {
+      description
+        "An edit record SHOULD be present for each distinct
+         edit operation that the server has detected on
+         the target datastore.  This list MAY be omitted
+         if the detailed edit operations are not known.
+         The server MAY report entries in this list for
+         changes not made by a NETCONF session (e.g., CLI).";
+
+      leaf target {
+        type instance-identifier;
+        description
+          "Topmost node associated with the configuration change.
+           A server SHOULD set this object to the node within
+           the datastore that is being altered.  A server MAY
+           set this object to one of the ancestors of the actual
+           node that was changed, or omit this object, if the
+           exact node is not known.";
+      }
+
+      leaf operation {
+        type nc:edit-operation-type;
+        description
+          "Type of edit operation performed.
+           A server MUST set this object to the NETCONF edit
+           operation performed on the target datastore.";
+      }
+    } // list edit
+  } // notification netconf-config-change
+
+  notification netconf-capability-change {
+    description
+      "Generated when the NETCONF server detects that
+       the server capabilities have changed.
+       Indicates which capabilities have been added, deleted,
+       and/or modified.  The manner in which a server
+       capability is changed is outside the scope of this
+       document.";
+
+    uses changed-by-parms;
+
+    leaf-list added-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been added.";
+    }
+
+    leaf-list deleted-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been deleted.";
+    }
+
+    leaf-list modified-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been modified.
+         A capability is considered to be modified if the
+         base URI for the capability has not changed, but
+         one or more of the parameters encoded at the end of
+         the capability URI have changed.
+         The new modified value of the complete URI is returned.";
+    }
+  } // notification netconf-capability-change
+
+  notification netconf-session-start {
+    description
+      "Generated when a NETCONF server detects that a
+       NETCONF session has started.  A server MAY generate
+       this event for non-NETCONF management sessions.
+       Indicates the identity of the user that started
+       the session.";
+    uses common-session-parms;
+  } // notification netconf-session-start
+
+  notification netconf-session-end {
+    description
+      "Generated when a NETCONF server detects that a
+       NETCONF session has terminated.
+       A server MAY optionally generate this event for
+       non-NETCONF management sessions.  Indicates the
+       identity of the user that owned the session,
+       and why the session was terminated.";
+
+    uses common-session-parms;
+
+    leaf killed-by {
+      when "../termination-reason = 'killed'";
+      type nc:session-id-type;
+      description
+        "The ID of the session that directly caused this session
+         to be abnormally terminated.  If this session was abnormally
+         terminated by a non-NETCONF session unknown to the server,
+         then this leaf will not be present.";
+    }
+
+    leaf termination-reason {
+      type enumeration {
+        enum "closed" {
+          description
+            "The session was terminated by the client in normal
+             fashion, e.g., by the NETCONF <close-session>
+             protocol operation.";
+        }
+        enum "killed" {
+          description
+            "The session was terminated in abnormal
+             fashion, e.g., by the NETCONF <kill-session>
+             protocol operation.";
+        }
+        enum "dropped" {
+          description
+            "The session was terminated because the transport layer
+             connection was unexpectedly closed.";
+        }
+        enum "timeout" {
+          description
+            "The session was terminated because of inactivity,
+             e.g., waiting for the <hello> message or <rpc>
+             messages.";
+        }
+        enum "bad-hello" {
+          description
+            "The client's <hello> message was invalid.";
+        }
+        enum "other" {
+          description
+            "The session was terminated for some other reason.";
+        }
+      }
+      mandatory true;
+      description
+        "Reason the session was terminated.";
+    }
+  } // notification netconf-session-end
+
+  notification netconf-confirmed-commit {
+    description
+      "Generated when a NETCONF server detects that a
+       confirmed-commit event has occurred.  Indicates the event
+       and the current state of the confirmed-commit procedure
+       in progress.";
+    reference
+      "RFC 6241, Section 8.4";
+
+    uses common-session-parms {
+      when "confirm-event != 'timeout'";
+    }
+
+    leaf confirm-event {
+      type enumeration {
+        enum "start" {
+          description
+            "The confirmed-commit procedure has started.";
+        }
+        enum "cancel" {
+          description
+            "The confirmed-commit procedure has been canceled,
+             e.g., due to the session being terminated, or an
+             explicit <cancel-commit> operation.";
+        }
+        enum "timeout" {
+          description
+            "The confirmed-commit procedure has been canceled
+             due to the confirm-timeout interval expiring.
+             The common session parameters will not be present
+             in this sub-mode.";
+        }
+        enum "extend" {
+          description
+            "The confirmed-commit timeout has been extended,
+             e.g., by a new <confirmed-commit> operation.";
+        }
+        enum "complete" {
+          description
+            "The confirmed-commit procedure has been completed.";
+        }
+      }
+      mandatory true;
+      description
+        "Indicates the event that caused the notification.";
+    }
+
+    leaf timeout {
+      when
+        "../confirm-event = 'start' or ../confirm-event = 'extend'";
+      type uint32;
+      units "seconds";
+      description
+        "The configured timeout value if the event type
+         is 'start' or 'extend'.  This value represents
+         the approximate number of seconds from the event
+         time when the 'timeout' event might occur.";
+    }
+  } // notification netconf-confirmed-commit
+
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-with-defaults.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-with-defaults.yang
new file mode 100755
index 000000000..e19d2b32c
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-netconf-with-defaults.yang
@@ -0,0 +1,140 @@
+module ietf-netconf-with-defaults {
+
+   namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-with-defaults";
+
+   prefix ncwd;
+
+   import ietf-netconf { prefix nc; }
+
+   organization
+    "IETF NETCONF (Network Configuration Protocol) Working Group";
+
+   contact
+    "WG Web:   <http://tools.ietf.org/wg/netconf/>
+
+     WG List:  <netconf@ietf.org>
+
+     WG Chair: Bert Wijnen
+               <bertietf@bwijnen.net>
+
+     WG Chair: Mehmet Ersue
+               <mehmet.ersue@nsn.com>
+
+     Editor: Andy Bierman
+             <andy.bierman@brocade.com>
+
+     Editor: Balazs Lengyel
+             <balazs.lengyel@ericsson.com>";
+
+   description
+    "This module defines an extension to the NETCONF protocol
+     that allows the NETCONF client to control how default
+     values are handled by the server in particular NETCONF
+     operations.
+
+     Copyright (c) 2011 IETF Trust and the persons identified as
+     the document authors.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 6243; see
+     the RFC itself for full legal notices.";
+
+   revision 2011-06-01 {
+     description
+       "Initial version.";
+     reference
+      "RFC 6243: With-defaults Capability for NETCONF";
+   }
+
+   typedef with-defaults-mode {
+      description
+        "Possible modes to report default data.";
+      reference
+         "RFC 6243; Section 3.";
+      type enumeration {
+         enum report-all {
+             description
+               "All default data is reported.";
+             reference
+               "RFC 6243; Section 3.1";
+         }
+         enum report-all-tagged {
+             description
+               "All default data is reported.
+                Any nodes considered to be default data
+                will contain a 'default' XML attribute,
+                set to 'true' or '1'.";
+             reference
+               "RFC 6243; Section 3.4";
+         }
+         enum trim {
+             description
+               "Values are not reported if they contain the default.";
+             reference
+               "RFC 6243; Section 3.2";
+         }
+         enum explicit {
+             description
+               "Report values that contain the definition of
+                explicitly set data.";
+             reference
+               "RFC 6243; Section 3.3";
+         }
+     }
+   }
+
+   grouping with-defaults-parameters {
+     description
+       "Contains the <with-defaults> parameter for control
+        of defaults in NETCONF retrieval operations.";
+
+     leaf with-defaults {
+       description
+         "The explicit defaults processing mode requested.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       type with-defaults-mode;
+     }
+   }
+
+   // extending the get-config operation
+   augment /nc:get-config/nc:input {
+       description
+         "Adds the <with-defaults> parameter to the
+          input of the NETCONF <get-config> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+   // extending the get operation
+   augment /nc:get/nc:input {
+       description
+         "Adds the <with-defaults> parameter to
+          the input of the NETCONF <get> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+   // extending the copy-config operation
+   augment /nc:copy-config/nc:input {
+       description
+         "Adds the <with-defaults> parameter to
+          the input of the NETCONF <copy-config> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ospf-devs.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ospf-devs.yang
new file mode 100755
index 000000000..d96309118
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ospf-devs.yang
@@ -0,0 +1,411 @@
+module ietf-ospf-devs {
+  namespace "http://cisco.com/ns/ietf-ospf/devs";
+
+  prefix ospf-devs;
+
+  import ietf-routing {
+    prefix rt;
+  }
+
+  import ietf-ospf {
+    prefix ospf;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    " Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com";
+
+  description
+    "This module defines deviation statements for ietf-ospf
+     module.";
+
+  revision 2015-09-11 {
+    description
+      "Initial Revision";
+
+    reference
+      "RFC 6020: YANG - A Data Modeling Language for the
+       Network Configuration Protocol (NETCONF)";
+  }
+
+  deviation "/ospf:if-state-change" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:if-config-error" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:nbr-state-change" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:nbr-restart-helper-status-change" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:lsdb-approaching-overflow" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:lsdb-overflow" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:nssa-translator-status-change" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:restart-status-change" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/ospf:rx-bad-packet" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:operation-mode" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:all-instances-inherit" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:admin-distance/ospf:granularity/ospf:coarse" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:graceful-restart" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:mpls/ospf:te-rid/ospf:source/ospf:explicit" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:mpls/ospf:ldp" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:fast-reroute" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:all-areas-inherit" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:area-type" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:summary" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:range" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:all-interfaces-inherit" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:mtu-ignore" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:cost" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:lls" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:prefix-suppression" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:bfd" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:ttl-security/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:virtual-link/ospf:authentication" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:hello-interval" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:dead-interval" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:retransmit-interval" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:transmit-delay" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:mtu-ignore" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:lls" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:prefix-suppression" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:bfd" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:ttl-security/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:sham-link/ospf:authentication" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:network-type" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:passive" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:demand-circuit" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:static-neighbors" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:node-flag" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:fast-reroute" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:mtu-ignore" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:lls" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:prefix-suppression" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:bfd" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:ttl-security" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:enable" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:authentication" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:area/ospf:interface/ospf:topology" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/ospf:ospf/ospf:instance" +
+            "/ospf:topology" {
+    deviate not-supported;
+    description "Not supported in IOS-XE 3.17 release.";
+  }
+}
\ No newline at end of file
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-ospf.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-ospf.yang
new file mode 100755
index 000000000..0c3164f7a
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-ospf.yang
@@ -0,0 +1,2888 @@
+
+
+module ietf-ospf {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-ospf";
+
+  prefix ospf;
+
+  import ietf-inet-types {
+    prefix "inet";
+  }
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+
+  import ietf-interfaces {
+    prefix "if";
+  }
+
+  import ietf-routing {
+    prefix "rt";
+  }
+
+  import ietf-key-chain {
+    prefix "key-chain";
+  }
+
+  organization
+    "Cisco Systems
+     170 West Tasman Drive
+     San Jose, CA 95134-1706
+     USA";
+
+  contact
+     "WG Web:   <http://tools.ietf.org/wg/ospf/>
+      WG List:  <mailto:ospf@ietf.org>
+
+      WG Chair: Acee Lindem
+                <mailto:acee@cisco.com>
+
+      WG Chair: Abhay Roy
+                <mailto:akr@cisco.com>
+
+      Editor:   Derek Yeung
+                <myeung@cisco.com>
+      Author:   Derek Yeung
+                <myeung@cisco.com>
+      Author:   Yingzhen Qu
+                <yiqu@cisco.com>
+      Author:   Dean Bogdanovic
+                <deanb@juniper.net>
+      Author:   Jeffrey Zhang
+                <zzhang@juniper.net>
+      Author:   Kiran Agrahara Sreenivasa
+                <kkoushik@Brocade.com>";
+
+  description
+    "This YANG module defines the generic configuration
+     data for OSPF, which is common across all of the vendor
+     implementations of the protocol. It is intended that the module
+     will be extended by vendors to define vendor-specific
+     OSPF configuration parameters and policies,
+     for example route maps or route policies.
+
+     Terms and Acronyms
+
+     OSPF (ospf): Open Shortest Path First
+
+     IP (ip): Internet Protocol
+
+     IPv4 (ipv4):Internet Protocol Version 4
+
+     IPv6 (ipv6): Internet Protocol Version 6
+
+     MTU (mtu) Maximum Transmission Unit
+    ";
+
+  revision 2015-03-09 {
+    description
+      "Initial revision.
+       Remove protocol-centric
+       Replace admin-control
+       Add IPFRR
+       Max-path etc reorg
+       SR
+       Align config/operation field";
+    reference
+      "RFC XXXX: A YANG Data Model for OSPF";
+  }
+
+  identity ospf {
+    base "rt:routing-protocol";
+    description "OSPF Protocol";
+  }
+
+  identity ospfv2 {
+    base "rt:routing-protocol";
+    description "OSPFv2";
+  }
+
+  identity ospfv3 {
+    base "rt:routing-protocol";
+    description "OSPFv3";
+  }
+
+  identity operation-mode {
+    description
+      "OSPF operation mode.";
+  }
+
+  identity ships-in-the-night {
+    base operation-mode;
+    description
+      "Ships-in-the-night operation mode in which
+      each OSPF instance carries only one address family";
+  }
+
+  identity area-type {
+    description "Base identity for OSPF area type.";
+  }
+
+  identity normal {
+    base area-type;
+    description "OSPF normal area.";
+  }
+
+  identity stub {
+    base area-type;
+    description "OSPF stub area.";
+  }
+
+  identity nssa {
+    base area-type;
+    description "OSPF NSSA area.";
+  }
+
+  typedef rib-ref {
+    type leafref {
+      path "/rt:routing/rt:routing-instance/rt:ribs/rt:rib/rt:name";
+    }
+    description
+      "This type is used for leafs that reference a RIB
+       configuration.";
+  }
+
+  typedef uint24 {
+    type uint32 {
+      range "0 .. 16777215";
+    }
+    description
+      "24-bit unsigned integer.";
+  }
+
+  typedef area-id-type {
+    type union {
+      type uint32;
+      type yang:dotted-quad;
+    }
+    description
+      "Area ID type.";
+  }
+
+  typedef if-state-type {
+    type enumeration {
+      enum Down {
+        value "1";
+        description
+          "Interface down state";
+      }
+      enum Loopback {
+        value "2";
+        description
+          "Interface loopback state";
+      }
+      enum Waiting {
+        value "3";
+        description
+          "Interface waiting state";
+      }
+      enum Point-to-Point {
+        value "4";
+        description
+          "Interface point-to-point state";
+      }
+      enum DR {
+        value "5";
+        description
+          "Interface Designated Router (DR) state";
+      }
+      enum BDR {
+        value "6";
+        description
+          "Interface Backup Designated Router (BDR) state";
+      }
+      enum DR-Other {
+        value "7";
+        description
+          "Interface Other Designated Router state";
+      }
+    }
+    description
+      "OSPF interface state type.";
+  }
+
+  typedef nbr-state-type {
+    type enumeration {
+      enum Down {
+        value "1";
+        description
+          "Neighbor down state";
+      }
+      enum Attempt {
+        value "2";
+        description
+          "Neighbor attempt state";
+      }
+      enum Init {
+        value "3";
+        description
+          "Neighbor init state";
+      }
+      enum 2-Way {
+        value "4";
+        description
+          "Neighbor 2-Way state";
+      }
+      enum ExStart {
+        value "5";
+        description
+          "Neighbor exchange start state";
+      }
+      enum Exchange {
+        value "6";
+        description
+          "Neighbor exchange state";
+      }
+      enum Loading {
+        value "7";
+        description
+          "Neighbor loading state";
+      }
+      enum Full {
+        value "8";
+        description
+          "Neighbor full state";
+      }
+    }
+    description
+      "OSPF neighbor state type.";
+  }
+
+  typedef restart-helper-status-type {
+    type enumeration {
+      enum Not-Helping {
+        value "1";
+        description
+          "Restart helper status not helping.";
+      }
+      enum Helping {
+        value "2";
+        description
+          "Restart helper status helping.";
+      }
+    }
+    description
+      "Restart helper status type.";
+  }
+
+  typedef restart-exit-reason-type {
+    type enumeration {
+      enum None {
+        value "1";
+        description
+          "Not attempted.";
+      }
+      enum InProgress {
+        value "2";
+        description
+          "Restart in progress.";
+      }
+      enum Completed {
+        value "3";
+        description
+          "Successfully completed.";
+      }
+      enum TimedOut {
+        value "4";
+        description
+          "Timed out.";
+      }
+      enum TopologyChanged {
+        value "5";
+        description
+          "Aborted due to topology change.";
+      }
+    }
+    description
+      "Describes the outcome of the last attempt at a
+      graceful restart, either by itself or acting
+      as a helper.";
+  }
+
+  typedef packet-type {
+    type enumeration {
+      enum Hello {
+        value "1";
+        description
+          "OSPF hello packet.";
+      }
+      enum Database-Descripton {
+        value "2";
+        description
+          "OSPF database description packet.";
+      }
+      enum Link-State-Request {
+        value "3";
+        description
+          "OSPF link state request packet.";
+      }
+      enum Link-State-Update {
+        value "4";
+        description
+          "OSPF link state update packet.";
+      }
+      enum Link-State-Ack {
+        value "5";
+        description
+          "OSPF link state acknowlegement packet.";
+      }
+    }
+    description
+      "OSPF packet type.";
+  }
+
+  typedef nssa-translator-state-type {
+    type enumeration {
+      enum Enabled {
+        value "1";
+        description
+          "NSSA translator enabled state.";
+      }
+      enum Elected {
+        description
+          "NSSA translator elected state.";
+      }
+      enum Disabled {
+        value "3";
+        description
+          "NSSA translator disabled state.";
+      }
+    }
+    description
+      "OSPF NSSA translator state type.";
+  }
+
+  typedef restart-status-type {
+    type enumeration {
+      enum Not-Restarting {
+        value "1";
+        description
+          "Router is not restarting.";
+      }
+      enum Planned-Restart {
+        description
+          "Router is going through planned restart.";
+      }
+      enum Unplanned-Restart {
+        value "3";
+        description
+          "Router is going through unplanned restart.";
+      }
+    }
+    description
+      "OSPF graceful restart status type.";
+  }
+
+  feature multi-topology {
+    description
+      "Support MTR.";
+  }
+
+  feature multi-area-adj {
+    description
+      "OSPF multi-area adjacency support as in RFC 5185.";
+  }
+
+  feature router-id {
+    description
+      "Set router ID per instance.";
+  }
+
+  feature demand-circuit {
+    description
+      "OSPF demand circuit support as in RFC 1793.";
+  }
+
+  feature mtu-ignore {
+    description
+      "Disable OSPF MTU mismatch detection on receiving
+       DBD packets.";
+  }
+
+  feature lls {
+    description
+      "OSPF link-local signaling (LLS) as in RFC 5613.";
+  }
+
+  feature prefix-suppression {
+    description
+      "OSPF prefix suppression support as in RFC 6860.";
+  }
+
+  feature bfd {
+    description
+      "OSPF BFD support.";
+  }
+
+  feature ttl-security {
+    description
+      "OSPF ttl security check.";
+  }
+
+  feature nsr {
+    description
+      "Non-Stop-Routing (NSR).";
+  }
+
+  feature graceful-restart {
+    description
+      "Graceful OSPF Restart as defined in RFC3623 and RFC5187.";
+  }
+
+  feature admin-control {
+    description
+      "Administrative control of the protocol state.";
+  }
+
+  feature auto-cost {
+    description
+      "Calculate OSPF interface cost according to
+       reference bandwidth.";
+  }
+
+  feature max-ecmp {
+    description
+      "Setting maximum number of ECMP paths.";
+  }
+
+  feature max-lsa {
+    description
+      "Setting maximum number of LSAs OSPF will receive.";
+  }
+
+  feature te-rid {
+    description
+      "TE router-id.";
+  }
+
+  feature ldp-igp-sync {
+    description
+      "LDP IGP synchronization.";
+  }
+
+  feature ldp-igp-autoconfig {
+    description
+      "LDP IGP auto-config.";
+  }
+
+  feature ospfv3-authentication-ipsec {
+    description
+      "Use IPsec for OSPFv3 authentication.";
+  }
+
+  feature fast-reroute {
+   description
+     "Support of IPFRR.";
+  }
+
+  feature node-flag {
+   description
+     "Support of node flag.";
+  }
+
+  feature lfa {
+   description
+     "Support of Loop Free Alternates.";
+  }
+
+  feature remote-lfa {
+   description
+     "Support of remote Loop Free Alternates.";
+  }
+
+  feature instance-inheritance {
+    description
+      "Support instance inheritance";
+  }
+
+  feature area-inheritance {
+    description
+      "Support area inheritance";
+  }
+
+  feature interface-inheritance {
+    description
+      "Support interface inheritance";
+  }
+
+  grouping instance-fast-reroute-config {
+    description
+      "This group defines global configuration of IPFRR.";
+    container fast-reroute {
+      if-feature fast-reroute;
+      description
+        "This container may be augmented with global
+         parameters for IPFRR.";
+      container lfa {
+        if-feature lfa;
+        description
+          "This container may be augmented with
+           global parameters for LFA.
+           Creating the container has no effect on
+           LFA activation.";
+      }
+    }
+  }
+
+  grouping interface-fast-reroute-config {
+    description
+      "This group defines interface configuration of IPFRR.";
+    container fast-reroute {
+      if-feature fast-reroute;
+
+      container lfa {
+        if-feature lfa;
+
+        leaf candidate-disabled {
+          type boolean;
+          description
+            "Prevent the interface to be used as backup.";
+        }
+        leaf enabled {
+          type boolean;
+          description
+            "Activates LFA.
+            This model assumes activation of per-prefix LFA.";
+        }
+        container remote-lfa {
+          if-feature remote-lfa;
+          leaf enabled {
+            type boolean;
+            description
+            "Activates remote LFA.";
+          }
+          description
+            "Remote LFA configuration.";
+        }
+        description
+          "LFA configuration.";
+      }
+      description
+        "Fast-reroute configuration.";
+    }
+  }
+
+  grouping interface-common-config {
+    description "Common configuration for all types of interfaces,
+                 including virtual link and sham link";
+
+    leaf cost {
+      type uint16 {
+        range "1..65535";
+      }
+      description
+        "Interface cost.";
+    }
+
+    leaf hello-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Time between hello packets.";
+    }
+
+    leaf dead-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      must "../dead-interval > ../hello-interval" {
+        error-message "The dead interval must be "
+                    + "larger than the hello interval";
+        description
+          "The value MUST be greater than 'hello-internval'.";
+      }
+      description
+        "Interval after which a neighbor is declared dead.";
+    }
+
+    leaf retransmit-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Time between retransmitting unacknowledged Link State
+         Advertisements (LSAs).";
+    }
+
+    leaf transmit-delay {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Estimated time needed to send link-state update.";
+    }
+
+    leaf mtu-ignore {
+      if-feature mtu-ignore;
+      type boolean;
+      description
+        "Enable/Disable ignoring of MTU in DBD packets.";
+    }
+
+    leaf lls {
+      if-feature lls;
+      type boolean;
+      description
+        "Enable/Disable link-local signaling (LLS) support.";
+    }
+
+    leaf prefix-suppression {
+      if-feature prefix-suppression;
+      type boolean;
+      description
+        "Suppress advertisement of the prefixes.";
+    }
+
+    leaf bfd {
+      if-feature bfd;
+      type boolean;
+      description
+        "Enable/disable bfd.";
+    }
+
+    container ttl-security {
+      if-feature ttl-security;
+      description "TTL security check.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable TTL security check.";
+      }
+      leaf hops {
+        type uint8 {
+          range "1..254";
+        }
+        description
+          "Maximum number of hops that a OSPF packet may
+           have traveled.";
+      }
+    }
+    leaf enable {
+      if-feature admin-control;
+      type boolean;
+      default true;
+      description
+        "Enable/disable protocol on the interface.";
+    }
+
+    container authentication {
+      description "Authentication configuration.";
+      choice auth-type-selection {
+        description
+          "Options for expressing authentication setting";
+        case auth-ipsec {
+          when "../../../../../rt:type = 'ospfv3'" {
+            description "Applied to OSPFv3 only";
+          }
+          if-feature ospfv3-authentication-ipsec;
+          leaf sa {
+              type string;
+              description
+                "SA name";
+          }
+        }
+        case auth-trailer-key-chain {
+          leaf key-chain {
+            type key-chain:key-chain-ref;
+             description
+              "key-chain name";
+            }
+          }
+        case auth-trailer-key {
+          leaf key {
+            type string;
+            description
+              "Key string in ASCII format.";
+          }
+          container crypto-algorithm {
+            uses key-chain:crypto-algorithm-types;
+            description
+              "Cryptographic algorithm associated with key.";
+          }
+        }
+      }
+    }
+  } // interface-common-config
+
+  grouping interface-config {
+    description "Configuration for real interfaces.";
+
+    leaf network-type {
+      type enumeration {
+        enum "broadcast" {
+          description
+            "Specify OSPF broadcast multi-access network.";
+        }
+        enum "non-broadcast" {
+          description
+            "Specify OSPF Non-Broadcast Multi-Access
+            (NBMA) network.";
+        }
+        enum "point-to-multipoint" {
+          description
+            "Specify OSPF point-to-multipoint network.";
+        }
+        enum "point-to-point" {
+          description
+            "Specify OSPF point-to-point network.";
+        }
+      }
+      description
+        "Network type.";
+    }
+
+    leaf passive {
+      type boolean;
+      description
+        "Enable/Disable passive.";
+    }
+
+    leaf demand-circuit {
+      if-feature demand-circuit;
+      type boolean;
+      description
+        "Enable/Disable demand circuit.";
+    }
+
+    container multi-area {
+      if-feature multi-area-adj;
+      description
+        "Configure ospf multi-area.";
+      leaf multi-area-id {
+        type area-id-type;
+        description
+          "Multi-area ID";
+      }
+      leaf cost {
+        type uint16;
+        description
+          "Interface cost for multi-area.";
+      }
+    }
+
+    container static-neighbors {
+      description "Static configured neighbors.";
+
+      list neighbor {
+        key "address";
+        description
+          "Specify a neighbor router.";
+
+        leaf address {
+          type inet:ip-address;
+          description "Neighbor IP address.";
+        }
+
+        leaf cost {
+          type uint16 {
+            range "1..65535";
+          }
+          description "Neighbor cost.";
+        }
+        leaf poll-interval {
+          type uint16 {
+            range "1..65535";
+          }
+          units seconds;
+          description "Neighbor poll interval.";
+        }
+        leaf priority {
+          type uint8 {
+            range "1..255";
+          }
+          description "Neighbor priority for DR election.";
+        }
+      }
+    }
+
+    leaf node-flag {
+      if-feature node-flag;
+      type boolean;
+      default false;
+      description
+        "Set prefix as a node representative prefix.";
+    }
+    uses interface-fast-reroute-config;
+    uses interface-common-config;
+  } // grouping interface-config
+
+  grouping tlv {
+    description
+      "TLV";
+    leaf type {
+      type uint16;
+      description "TLV type.";
+    }
+    leaf length {
+      type uint16;
+      description "TLV length.";
+    }
+    leaf value {
+      type yang:hex-string;
+      description "TLV value.";
+    }
+  }
+
+  grouping ospfv2-lsa-body {
+    description "OSPFv2 LSA body.";
+    container router {
+      when "../../header/type = 1" {
+        description
+          "Only apply to Router-LSA.";
+      }
+      description
+        "Router LSA.";
+      leaf flags {
+        //type string;
+        type bits {
+          bit V {
+            description
+              "When set, the router is an endpoint of one or
+              more virtual links.";
+          }
+          bit E {
+            description
+              "When set, the router is an AS Boundary Router
+              (ASBR).";
+          }
+          bit B {
+            description
+              "When set, the router is an Area Border
+              Router (ABR).";
+          }
+        }
+        description "Flags";
+      }
+      leaf num-of-links {
+        type uint16;
+        description "Number of links.";
+      }
+      list link {
+        key "link-id link-data";
+        description "Router LSA link.";
+        leaf link-id {
+          type union {
+            type inet:ipv4-address;
+            type yang:dotted-quad;
+          }
+          description "Link ID";
+        }
+        leaf link-data {
+          type union {
+            type inet:ipv4-address;
+            type uint32;
+          }
+          description "Link data.";
+        }
+        leaf type {
+          type uint8;
+          description "Link type.";
+        }
+        list topology {
+          key "mt-id";
+          description
+            "Topology specific information.";
+          leaf mt-id {
+            type uint8;
+            description
+              "The MT-ID for topology enabled on the link.";
+          }
+          leaf metric {
+            type uint16;
+            description "Metric for the topology.";
+          }
+        }
+      }
+    }
+    container network {
+      when "../../header/type = 2" {
+        description
+          "Only apply to network LSA.";
+      }
+      description
+        "Network LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      leaf-list attached-router {
+        type yang:dotted-quad;
+        description
+          "List of the routers attached to the network.";
+      }
+    }
+    container summary {
+      when "../../header/type = 3 or "
+         + "../../header/type = 4" {
+        description
+          "Only apply to Summary-LSA.";
+      }
+      description
+        "Summary LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      list topology {
+        key "mt-id";
+        description
+          "Topology specific information.";
+        leaf mt-id {
+          type uint8;
+          description
+            "The MT-ID for topology enabled on the link.";
+        }
+        leaf metric {
+          type uint24;
+          description "Metric for the topology.";
+        }
+      }
+    }
+    container external {
+      when "../../header/type = 5 or "
+         + "../../header/type = 7" {
+        description
+          "Only apply to AS-external-LSA and NSSA-LSA.";
+      }
+      description
+        "External LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      list topology {
+        key "mt-id";
+        description
+          "Topology specific information.";
+        leaf mt-id {
+          type uint8;
+          description
+            "The MT-ID for topology enabled on the link.";
+        }
+        leaf flags {
+          //type string;
+          type bits {
+            bit E {
+              description
+                "When set, the metric specified is a Type 2
+                external metric.";
+            }
+          }
+          description "Flags.";
+        }
+        leaf metric {
+          type uint24;
+          description "Metric for the topology.";
+        }
+        leaf forwarding-address {
+          type inet:ipv4-address;
+          description
+            "Forwarding address.";
+        }
+        leaf external-route-tag {
+          type uint32;
+          description
+            "Route tag.";
+        }
+      }
+    }
+    container opaque {
+      when "../../header/type = 9 or "
+         + "../../header/type = 10 or "
+         + "../../header/type = 11" {
+        description
+          "Only apply to opaque LSA.";
+      }
+      description
+        "Opaque LSA.";
+
+      list unknown-tlv {
+        key "type";
+        description "Unknown TLV.";
+        uses tlv;
+      }
+
+      container router-address-tlv {
+        leaf router-address {
+          type inet:ipv4-address;
+          description
+            "Router address.";
+        }
+        description
+          "Router address TLV.";
+      }
+
+      container link-tlv {
+        leaf link-type {
+          type uint8;
+          mandatory true;
+          description "Link type.";
+        }
+        leaf link-id {
+          type union {
+            type inet:ipv4-address;
+            type yang:dotted-quad;
+          }
+          mandatory true;
+          description "Link ID.";
+        }
+        leaf-list local-if-ipv4-addr {
+          type inet:ipv4-address;
+          description
+            "List of local interface IPv4 addresses.";
+        }
+        leaf-list local-remote-ipv4-addr {
+          type inet:ipv4-address;
+          description
+            "List of remote interface IPv4 addresses.";
+        }
+        leaf te-metric {
+          type uint32;
+          description "TE metric.";
+        }
+        leaf max-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Maximum bandwidth.";
+        }
+        leaf max-reservable-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Maximum reservable bandwidth.";
+        }
+        leaf unreserved-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Unreserved bandwidth.";
+        }
+        leaf admin-group {
+          type uint32;
+          description "Administrative group/Resource class/Color.";
+        }
+        list unknown-subtlv {
+          key "type";
+          description "Unknown sub-TLV.";
+          uses tlv;
+        }
+        description
+          "Link TLV.";
+      }
+    }
+  }
+
+  grouping ospfv3-lsa-options {
+    description "OSPFv3 LSA options";
+    leaf options {
+      //type string;
+      type bits {
+        bit DC {
+          description
+            "When set, the router support demand circuits.";
+        }
+        bit R {
+          description
+            "When set, the originator is an active router.";
+        }
+        bit N {
+          description
+            "If set, the router is attached to an NSSA";
+        }
+        bit E {
+          description
+            "This bit describes the way AS-external-LSAs
+            are flooded";
+        }
+        bit V6 {
+          description
+            "If clear, the router/link should be excluded
+             from IPv6 routing calculaton";
+        }
+        bit AF {
+        }
+      }
+      mandatory true;
+      description "OSPFv3 LSA options.";
+    }
+  }
+
+  grouping ospfv3-lsa-prefix {
+    description
+      "OSPFv3 LSA prefix.";
+
+    leaf prefix {
+      //type inet:ip-prefix;
+      type string;
+      description
+        "Prefix";
+    }
+    leaf prefix-options {
+      type string;
+      /*type bits {
+        bit NU {
+          description
+            "When set, the prefix should be excluded
+            from IPv6 unicast calculations.";
+        }
+        bit LA {
+          description
+            "When set, the prefix is actually an IPv6 interface
+            address of the Advertising Router.";
+        }
+        bit P {
+          description
+            "When set, the NSSA area prefix should be
+            readvertised by the translating NSSA area border.";
+        }
+        bit DN {
+          description
+            "When set, the inter-area-prefix-LSA or
+            AS-external-LSA prefix has been advertised in a VPN
+            environment.";
+        }
+      }*/
+      mandatory true;
+      description "Prefix options.";
+    }
+  }
+
+  grouping ospfv3-lsa-external {
+    description
+      "AS-External and NSSA LSA.";
+    leaf metric {
+      type uint24;
+      description "Metric";
+    }
+
+    leaf flags {
+      //type string;
+      type bits {
+        bit E {
+          description
+            "When set, the metric specified is a Type 2
+            external metric.";
+        }
+      }
+      description "Flags.";
+    }
+
+    leaf referenced-ls-type {
+      type uint16;
+      description "Referenced Link State type.";
+    }
+
+    uses ospfv3-lsa-prefix;
+
+    leaf forwarding-address {
+      type inet:ipv6-address;
+      description
+        "Forwarding address.";
+    }
+
+    leaf external-route-tag {
+      type uint32;
+      description
+        "Route tag.";
+    }
+    leaf referenced-link-state-id {
+      type uint32;
+      description
+        "Referenced Link State ID.";
+    }
+  }
+
+  grouping ospfv3-lsa-body {
+    description "OSPFv3 LSA body.";
+    container router {
+      when "../../header/type = 8193" { // 0x2001
+        description
+          "Only apply to Router-LSA.";
+      }
+      description "Router LSA.";
+      leaf flags {
+        //type string;
+        type bits {
+          bit V {
+            description
+              "When set, the router is an endpoint of one or
+              more virtual links.";
+          }
+          bit E {
+            description
+              "When set, the router is an AS Boundary Router
+              (ASBR).";
+          }
+          bit B {
+            description
+              "When set, the router is an Area Border
+              Router (ABR).";
+          }
+          bit Nt {
+            description
+              "When set, the router is an NSSA border router
+              that is unconditionally translating NSSA-LSAs
+              into AS-external-LSAs.";
+          }
+        }
+        mandatory true;
+        description "LSA option.";
+      }
+
+      uses ospfv3-lsa-options;
+
+      list link {
+        key "interface-id neighbor-interface-id neighbor-router-id";
+        description "Router LSA link.";
+        leaf interface-id {
+          type uint32;
+          description "Interface ID.";
+        }
+        leaf neighbor-interface-id {
+          type uint32;
+          description "Neighbor Interface ID.";
+        }
+        leaf neighbor-router-id {
+          type yang:dotted-quad;
+          description "Neighbor Router ID";
+        }
+        leaf type {
+          type uint8;
+          description "Link type.";
+        }
+        leaf metric {
+          type uint16;
+            description "Metric.";
+        }
+      }
+    }
+    container network {
+      when "../../header/type = 8194" { // 0x2002
+        description
+          "Only apply to network LSA.";
+      }
+      description "Network LSA.";
+
+      uses ospfv3-lsa-options;
+
+      leaf-list attached-router {
+        type yang:dotted-quad;
+        description
+          "List of the routers attached to the network.";
+      }
+    }
+    container inter-area-prefix {
+      when "../../header/type = 8195" { // 0x2003
+        description
+          "Only apply to inter-area-prefix LSA.";
+      }
+      leaf metric {
+        type uint24;
+        description "Metric";
+      }
+
+      uses ospfv3-lsa-prefix;
+      description "Inter-Area-Prefix LSA.";
+    }
+    container inter-area-router {
+      when "../../header/type = 8196" { // 0x2004
+        description
+          "Only apply to inter-area-router LSA.";
+      }
+      uses ospfv3-lsa-options;
+      leaf metric {
+        type uint24;
+        description "Metric";
+      }
+      leaf destination-router-id {
+        type yang:dotted-quad;
+        description
+          "The Router ID of the router being described by the LSA.";
+      }
+      description "Inter-Area-Router LSA.";
+    }
+    container as-external {
+      when "../../header/type = 16389" { // 0x2007
+        description
+          "Only apply to as-external LSA.";
+      }
+
+      uses ospfv3-lsa-external;
+
+      description "AS-External LSA.";
+    }
+    container nssa {
+      when "../../header/type = 8199" { // 0x2007
+        description
+          "Only apply to nssa LSA.";
+      }
+      uses ospfv3-lsa-external;
+
+      description "NSSA LSA.";
+    }
+    container link {
+      when "../../header/type = 8" { // 0x0008
+        description
+          "Only apply to link LSA.";
+      }
+      leaf rtr-priority {
+        type uint8;
+        description "Router Priority of the interface.";
+      }
+
+      uses ospfv3-lsa-options;
+
+      leaf link-local-interface-address {
+        type inet:ip-address;
+        description
+          "The originating router's link-local
+          interface address on the link.";
+      }
+
+      leaf num-of-prefixes {
+        type uint32;
+        description "Number of prefixes.";
+      }
+
+      list prefix-list {
+        key "prefix";
+        description "List of prefixes associated with the link.";
+        uses ospfv3-lsa-prefix;
+      }
+      description "Link LSA.";
+    }
+    container intra-area-prefix {
+      when "../../header/type = 8201" { // 0x2009
+        description
+          "Only apply to intra-area-prefix LSA.";
+      }
+      description "Intra-Area-Prefix LSA.";
+
+      leaf referenced-ls-type {
+        type uint16;
+        description "Referenced Link State type.";
+      }
+      leaf referenced-link-state-id {
+        type uint32;
+        description
+          "Referenced Link State ID.";
+      }
+      leaf referenced-adv-router {
+        type inet:ipv4-address;
+        description
+          "Referenced Advertising Router.";
+      }
+
+      leaf num-of-prefixes {
+        type uint16;
+        description "Number of prefixes.";
+      }
+      list prefix-list {
+        key "prefix";
+        description "List of prefixes associated with the link.";
+        uses ospfv3-lsa-prefix;
+        leaf metric {
+          type uint24;
+          description "Metric";
+        }
+      }
+    }
+  }
+
+  grouping lsa-header {
+    description
+        "Common LSA for OSPFv2 and OSPFv3";
+    leaf age {
+      type uint16;
+      mandatory true;
+      description "LSA age.";
+    }
+    leaf type {
+      type uint16;
+      mandatory true;
+      description "LSA type.";
+    }
+    leaf adv-router {
+      type yang:dotted-quad;
+      mandatory true;
+      description "LSA advertising router.";
+    }
+    leaf seq-num {
+      type string;
+      mandatory true;
+      description "LSA sequence number.";
+    }
+    leaf checksum {
+      type string;
+      mandatory true;
+      description "LSA checksum.";
+    }
+    leaf length {
+      type uint16;
+      mandatory true;
+      description "LSA length.";
+    }
+  }
+
+  grouping ospfv2-lsa {
+    description
+        "OSPFv2 LSA.";
+    container header {
+      description
+        "Decoded OSPFv2 LSA header data.";
+      leaf options {
+        //type string;
+        type bits {
+          bit DC {
+            description
+              "When set, the router support demand circuits.";
+          }
+          bit P {
+            description
+              "Only used in type-7 LSA. When set, the NSSA
+              border router should translate the type-7 LSA
+              to type-5 LSA.";
+          }
+          bit MC {
+            description
+              "When set, the router support MOSPF.";
+          }
+          bit E {
+            description
+              "This bit describes the way AS-external-LSAs
+              are flooded";
+          }
+          bit Upward {
+          }
+          bit MT {
+          }
+          bit R {
+          }
+          bit AF {
+          }
+        }
+        mandatory true;
+        description "LSA option.";
+      }
+      leaf lsa-id {
+        type inet:ipv4-address;
+        mandatory true;
+        description "LSA ID.";
+      }
+
+      leaf opaque-type {
+        when "../../header/type = 9 or "
+           + "../../header/type = 10 or "
+           + "../../header/type = 11" {
+          description
+            "Only apply to opaque LSA.";
+        }
+        type uint8;
+        mandatory true;
+        description "Opaque type.";
+      }
+
+      leaf opaque-id {
+        when "../../header/type = 9 or "
+           + "../../header/type = 10 or "
+           + "../../header/type = 11" {
+          description
+            "Only apply to opaque LSA.";
+        }
+        type uint24;
+        mandatory true;
+        description "Opaque id.";
+      }
+      uses lsa-header;
+    }
+    container body {
+      description
+        "Decoded OSPFv2 LSA body data.";
+      uses ospfv2-lsa-body;
+    }
+  }
+
+  grouping ospfv3-lsa {
+    description
+        "Decoded OSPFv3 LSA.";
+    container header {
+      description
+        "Decoded OSPFv3 LSA header data.";
+      leaf lsa-id {
+        type uint32;
+        mandatory true;
+        description "LSA ID.";
+      }
+      uses lsa-header;
+      uses ospfv3-lsa-options;
+    }
+    container body {
+      description
+        "Decoded OSPF LSA body data.";
+      uses ospfv3-lsa-body;
+    }
+  }
+
+  grouping lsa-common {
+    description
+        "Common field for OSPF LSA represenation.";
+    leaf decoded-completed {
+      type boolean;
+      description
+        "The OSPF LSA body is fully decoded.";
+    }
+    leaf raw-data {
+      type yang:hex-string;
+      description
+        "The complete LSA in network byte
+        order as received/sent over the wire.";
+    }
+  }
+
+  grouping lsa {
+    description
+        "OSPF LSA.";
+    uses lsa-common;
+    choice version {
+      description
+        "OSPFv2 or OSPFv3 LSA body.";
+     case v2 {
+      container ospfv2 {
+        description "OSPFv2 LSA";
+        uses ospfv2-lsa;
+       }
+      }
+     case v3 {
+      container ospfv3 {
+        description "OSPFv3 LSA";
+        uses ospfv3-lsa;
+      }
+    }
+   }
+  }
+
+  grouping lsa-key {
+    description
+      "OSPF LSA key.";
+    leaf lsa-id {
+      type union {
+        type inet:ipv4-address;
+        type uint32;
+      }
+      description
+        "LSA ID.";
+    }
+    leaf adv-router {
+      type inet:ipv4-address;
+      description
+        "Advertising router.";
+    }
+  }
+
+  grouping af-area-config {
+    description
+      "OSPF address-family specific area config state.";
+    list range {
+      key "prefix";
+      description
+        "Summarize routes matching address/mask (border
+         routers only)";
+      leaf prefix {
+        //type inet:ip-prefix;
+        type string;
+        description
+          "IPv4 or IPv6 prefix";
+      }
+      leaf advertise {
+        type boolean;
+        description
+          "Advertise or hide.";
+      }
+      leaf cost {
+        type uint24 {
+          range "0..16777214";
+        }
+        description
+          "Cost of summary route.";
+      }
+    }
+  }
+
+  grouping area-config {
+    description
+      "OSPF area config state.";
+    leaf area-type {
+      type identityref {
+        base area-type;
+      }
+      default normal;
+      description
+        "Area type.";
+    }
+
+    leaf summary {
+      /* when "../area-type = 'stub' or ../area-type = 'nssa'" {
+        description
+          "Summary generation valid for stub/NSSA area.";
+      } */
+      type boolean;
+      description
+        "Enable/Disable summary generation to the stub or
+        NSSA area.";
+    }
+
+    leaf default-cost {
+      /* when "../area-type = 'stub' or ../area-type = 'nssa'" {
+          description
+            "Default cost for LSA advertised into stub or
+            NSSA area.";
+      } */
+      type uint32 {
+        range "1..16777215";
+      }
+      description
+        "Set the summary default-cost for a stub or NSSA area.";
+    }
+
+    uses af-area-config {
+      /* when "../../operation-mode = 'ospf:ships-in-the-night'" {
+        description
+          "Ships in the night configuration.";
+      } */
+    }
+  }
+
+  grouping instance-config {
+    description
+      "OSPF instance config state.";
+    leaf router-id {
+      if-feature router-id;
+      type yang:dotted-quad;
+      description
+        "Defined in RFC 2328. A 32-bit number
+         that uniquely identifies the router.";
+    }
+
+    container admin-distance {
+      description "Admin distance config state.";
+      choice granularity {
+        description
+          "Options for expressing admin distance
+           for intra-area and inter-area route";
+        case detail {
+          leaf intra-area {
+            type uint8;
+            description
+              "Admin distance for intra-area route.";
+          }
+          leaf inter-area {
+            type uint8;
+            description
+              "Admin distance for inter-area route.";
+          }
+        }
+        case coarse {
+          leaf internal {
+            type uint8;
+            description
+              "Admin distance for both intra-area and
+               inter-area route.";
+          }
+        }
+      }
+      leaf external {
+        type uint8;
+        description
+          "Admin distance for both external route.";
+      }
+    }
+
+    container nsr {
+      if-feature nsr;
+      description
+        "NSR config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable NSR.";
+      }
+    }
+
+    container graceful-restart {
+      if-feature graceful-restart;
+      description
+        "Graceful restart config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable graceful restart as defined in RFC 3623.";
+      }
+      leaf helper-enable {
+        type boolean;
+        description
+          "Enable RestartHelperSupport in RFC 3623 Section B.2.";
+      }
+      leaf restart-interval {
+        type uint16 {
+          range "1..1800";  // Range is defined in RFC 3623.
+        }
+        units seconds;
+        default "120";  // Default is defined in RFC 3623.
+        description
+          "RestartInterval option in RFC 3623 Section B.1.";
+      }
+      leaf helper-strict-lsa-checking {
+        type boolean;
+        description
+          "RestartHelperStrictLSAChecking option in RFC 3623
+          Section B.2.";
+      }
+    }
+
+    leaf enable {
+      if-feature admin-control;
+      type boolean;
+      default true;
+      description
+        "Enable/Disable the protocol.";
+    }
+
+    container auto-cost {
+      if-feature auto-cost;
+      description
+        "Auto cost config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable auto cost.";
+      }
+      leaf reference-bandwidth {
+        type uint32 {
+          range "1..4294967";
+        }
+        units Mbits;
+        description
+          "Configure reference bandwidth in term of Mbits";
+      }
+    }
+
+/*
+    container maximum {
+      leaf paths {
+        if-feature max-ecmp;
+        type uint16 {
+          range "1..32";
+        }
+        description
+          "Maximum number of ECMP paths.";
+      }
+      description
+        "OSPF limits settings.";
+      leaf max-lsa {
+        if-feature max-lsa;
+        type uint32 {
+          range "1..4294967294";
+        }
+        description
+          "Maximum number of LSAs OSPF will receive.";
+      }
+    }
+*/
+
+    container spf-control {
+      leaf paths {
+        if-feature max-ecmp;
+        type uint16 {
+          range "1..32";
+        }
+        description
+          "Maximum number of ECMP paths.";
+      }
+      // timer (augment)
+      description "SPF calculation control.";
+    }
+    container database-control {
+      leaf max-lsa {
+        if-feature max-lsa;
+        type uint32 {
+          range "1..4294967294";
+        }
+        description
+          "Maximum number of LSAs OSPF will receive.";
+      }
+      description "Database maintenance control.";
+    }
+    container reload-control {
+      // max-metric
+      description "Protocol reload control.";
+    }
+
+    container mpls {
+      description
+        "OSPF MPLS config state.";
+      container te-rid {
+        if-feature te-rid;
+        description
+          "Traffic Engineering stable IP address for system.";
+        choice source {
+          description
+            "Different options for specifying TE router ID.";
+          case interface {
+            leaf interface {
+              type if:interface-ref;
+              description
+                "Take the interface's IPv4 address as TE
+                 router ID.";
+            }
+          }
+          case explicit {
+            leaf router-id {
+              type inet:ipv4-address;
+              description
+                "Explicitly configure the TE router ID.";
+            }
+          }
+        }
+      }
+      container ldp {
+        description
+          "OSPF MPLS LDP config state.";
+        leaf igp-sync {
+          if-feature ldp-igp-sync;
+          type boolean;
+          description
+            "Enable LDP IGP synchronization.";
+        }
+        leaf autoconfig {
+          if-feature ldp-igp-autoconfig;
+          type boolean;
+          description
+            "Enable LDP IGP interface auto-configuration.";
+        }
+      }
+    }
+    uses instance-fast-reroute-config;
+  }
+
+  grouping interface-operation {
+    description
+      "OSPF interface operation state.";
+    reference "RFC2328 Section 9";
+    uses interface-config;
+
+    leaf state {
+      //type if-state-type;
+      type string;
+      description "Interface state.";
+    }
+
+    leaf hello-timer {
+      type uint32;
+      units "milliseconds";
+      description "Hello timer.";
+    }
+
+    leaf wait-timer {
+      type uint32;
+      units "milliseconds";
+      description "Wait timer.";
+    }
+
+    leaf dr {
+      type inet:ipv4-address;
+      description "DR.";
+    }
+
+    leaf bdr {
+      type inet:ipv4-address;
+      description "BDR.";
+    }
+  } // interface-operation
+
+  grouping neighbor-operation {
+    description
+      "OSPF neighbor operation data.";
+
+    leaf address {
+      type inet:ip-address;
+      description
+        "Neighbor address.";
+    }
+    leaf dr {
+      type inet:ipv4-address;
+      description
+        "Designated Router.";
+    }
+    leaf bdr {
+      type inet:ipv4-address;
+      description
+        "Backup Designated Router.";
+    }
+    leaf state {
+      type nbr-state-type;
+      description
+        "OSPF neighbor state.";
+    }
+  }
+
+  grouping instance-operation {
+    description
+      "OSPF Address Family operation state.";
+    leaf router-id {
+      type yang:dotted-quad;
+      description
+        "Defined in RFC 2328. A 32-bit number
+         that uniquely identifies the router.";
+    }
+  }
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol" {
+      when "rt:type = 'ospf:ospfv2' or rt:type = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for a routing protocol instance
+         of OSPF (type 'ospfv2' or 'ospfv3').";
+    }
+    description "OSPF augmentation.";
+
+    container ospf {
+      description
+        "OSPF.";
+
+      container all-instances-inherit {
+        if-feature instance-inheritance;
+        description
+          "Inheritance support to all instances.";
+        container area {
+          description
+            "Area config to be inherited by all areas in
+            all instances.";
+        }
+        container interface {
+          description
+            "Interface config to be inherited by all interfaces
+            in all instances.";
+        }
+      }
+
+      leaf operation-mode {
+        type identityref {
+          base operation-mode;
+        }
+        default ospf:ships-in-the-night;
+        description
+          "OSPF operation mode.";
+      }
+
+      list instance {
+        key "af";
+        description
+          "An OSPF routing protocol instance.";
+
+        leaf af {
+          type identityref {
+            base rt:address-family;
+          }
+          description
+            "Address-family of the instance.";
+        }
+
+        uses instance-config;
+
+        container all-areas-inherit {
+          if-feature area-inheritance;
+          description
+            "Inheritance for all areas.";
+          container area {
+            description
+              "Area config to be inherited by all areas.";
+          }
+          container interface {
+            description
+              "Interface config to be inherited by all interfaces
+              in all areas.";
+          }
+        }
+
+        list area {
+          key "area-id";
+          description
+            "List of ospf areas";
+          leaf area-id {
+            type area-id-type;
+            description
+              "Area ID.";
+          }
+
+          uses area-config;
+
+          container all-interfaces-inherit {
+            if-feature interface-inheritance;
+            description
+              "Inheritance for all interfaces";
+            container interface {
+              description
+                "Interface config to be inherited by all
+                interfaces.";
+            }
+          }
+
+          list virtual-link {
+            /* when "../area-id != '0' and "
+               + "../area-type = 'normal'" {
+              description
+                "Transit area must be non-backbone normal area.";
+            } */
+            key "router-id";
+            description
+              "OSPF virtual link";
+            leaf router-id {
+              type yang:dotted-quad;
+              description
+                "Virtual link router ID.";
+            }
+
+            uses interface-common-config;
+          }
+
+          list sham-link {
+            key "local-id remote-id";
+            description
+              "OSPF sham link";
+            leaf local-id {
+              type inet:ip-address;
+              description
+                "Address of the local end-point.";
+            }
+            leaf remote-id {
+              type inet:ip-address;
+              description
+                "Address of the remote end-point.";
+            }
+            uses interface-common-config;
+          }
+
+          list interface {
+            key "interface";
+            description
+              "List of OSPF interfaces.";
+            leaf interface {
+              type if:interface-ref;
+              description
+                "Interface.";
+            }
+            uses interface-config;
+          } // list of interfaces
+        } // list of areas
+      } // list of instance
+    } // container ospf
+  }
+
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol/ospf:ospf/ospf:instance" {
+    /* when "../../rt:type = 'ospf:ospfv2' or
+          ../../rt:type = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for OSPF
+        (type 'ospfv2' or 'ospfv3').";
+    } */
+    if-feature multi-topology;
+    description
+      "OSPF multi-topology routing-protocol augmentation.";
+    list topology {
+      // Topology must be in the same routing-instance
+      //  and of same AF as the container.
+      key "name";
+      description "OSPF topology.";
+      leaf name {
+        type rib-ref;
+        description "RIB";
+      }
+      list area {
+        key "area-id";
+        description
+          "List of ospf areas";
+        leaf area-id {
+          type area-id-type;
+          description
+            "Area ID.";
+        }
+        uses area-config;
+      }
+    }
+  }
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol/ospf:ospf/ospf:instance/"
+        + "ospf:area/ospf:interface" {
+    /* when "../../../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    } */
+    if-feature ospf:multi-topology;
+    description "OSPF multi-topology interface augmentation.";
+    list topology {
+      key "name";
+      description "OSPF interface topology.";
+      leaf name {
+        type rib-ref;
+        description
+          "One of the topology enabled on this interface";
+      }
+      leaf cost {
+         type uint32;
+         description
+           "Interface cost for this topology";
+      }
+    }
+  }
+
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol" {
+    when "rt:type = 'ospf:ospfv2' or rt:type = 'ospf:ospfv3'"  {
+      description
+        "This augment is only valid for a routing protocol instance
+         of type 'ospfv2' or 'ospfv3'.";
+    }
+    description
+         "OSPF operation state.";
+    container ospf {
+      description "OSPF";
+
+      leaf operation-mode {
+        type identityref {
+          base operation-mode;
+        }
+        description
+          "OSPF operation mode.";
+      }
+
+      list instance {
+        key "af";
+        description
+          "An OSPF routing protocol instance.";
+
+        leaf af {
+          type identityref {
+            base rt:address-family;
+          }
+          description
+            "Address-family of the instance.";
+        }
+
+        uses instance-operation;
+
+        list area {
+          key "area-id";
+          description "List of OSPF areas";
+          leaf area-id {
+            type area-id-type;
+            description "Area ID.";
+          }
+          list interfaces {
+            key "interface";
+            description
+              "List of OSPF interfaces.";
+            leaf interface {
+              // Should it refer to config state leaf?
+              //type if:interface-ref;
+              type string;
+              description "Interface.";
+            }
+
+            uses interface-operation;
+
+            list neighbor {
+              key "neighbor-id";
+              description
+                "List of OSPF neighbors.";
+              leaf neighbor-id {
+                type inet:ipv4-address;
+                description
+                  "Neighbor ID.";
+              }
+
+              uses neighbor-operation;
+            } // list of OSPF neighbors
+
+            list link-scope-lsas {
+              when "../../../../../rt:type = 'ospfv3'" {
+                description
+                  "Link scope LSA only exists in OSPFv3.";
+              }
+              key "lsa-type";
+              description "List OSPF link scope LSA databases";
+              leaf lsa-type {
+                type uint8;
+                description "OSPF link scope LSA type.";
+              }
+              list link-scope-lsa {
+                key "lsa-id adv-router";
+                description "List of OSPF link scope LSAs";
+                uses lsa-key;
+                uses lsa {
+                  refine "version/v2/ospfv2" {
+                    must "../../../../../../../rt:type = 'ospfv2'" {
+                      description "OSPFv2 LSA";
+                    }
+                  }
+                  refine "version/v3/ospfv3" {
+                    must "../../../../../../../rt:type = 'ospfv3'" {
+                      description "OSPFv3 LSA";
+                    }
+                  }
+                }
+              }
+            } // list link-scope-lsas
+          } // list of OSPF interfaces
+          list area-scope-lsas {
+            key "lsa-type";
+            description "List OSPF area scope LSA databases";
+            leaf lsa-type {
+              type uint8;
+              description "OSPF area scope LSA type.";
+            }
+            list area-scope-lsa {
+              key "lsa-id adv-router";
+              description "List of OSPF area scope LSAs";
+              uses lsa-key;
+              uses lsa {
+                refine "version/v2/ospfv2" {
+                  must "../../../../../../rt:type = 'ospfv2'" {
+                    description "OSPFv2 LSA";
+                  }
+                }
+                refine "version/v3/ospfv3" {
+                  must "../../../../../../rt:type = 'ospfv3'" {
+                    description "OSPFv3 LSA";
+                  }
+                }
+              }
+            }
+          } // list area-scope-lsas
+        } // list of OSPF areas
+
+        list as-scope-lsas {
+          key "lsa-type";
+          description "List OSPF AS scope LSA databases";
+          leaf lsa-type {
+            type uint8;
+            description "OSPF AS scope LSA type.";
+          }
+          list as-scope-lsa {
+            key "lsa-id adv-router";
+            description "List of OSPF AS scope LSAs";
+            uses lsa-key;
+            uses lsa {
+              refine "version/v2/ospfv2" {
+                must "../../../../../rt:type = 'ospfv2'" {
+                  description "OSPFv2 LSA";
+                }
+              }
+              refine "version/v3/ospfv3" {
+                must "../../../../../rt:type = 'ospfv3'" {
+                  description "OSPFv3 LSA";
+                }
+              }
+            }
+          }
+        } // list as-scope-lsas
+      } // list of instances
+    } // container ospf
+  }
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol/"
+        + "ospf:ospf/ospf:instance" {
+    when "../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    }
+    if-feature multi-topology;
+    description
+      "OSPF multi-topology routing-protocol augmentation.";
+    list topology {
+      // Topology must be in the same routing-instance
+      // and of same AF as the container.
+      key "name";
+      description "OSPF topology.";
+      leaf name {
+        type rib-ref;
+        description "RIB";
+      }
+      list area {
+        key "area-id";
+        description
+          "List of ospf areas";
+        leaf area-id {
+          type area-id-type;
+          description
+            "Area ID.";
+        }
+      }
+    }
+  }
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol/"
+        + "ospf:ospf/ospf:instance/ospf:area/ospf:interfaces" {
+    when "../../../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    }
+    if-feature ospf:multi-topology;
+    description "OSPF multi-topology interface augmentation.";
+    list topology {
+      key "name";
+      description "OSPF interface topology.";
+      leaf name {
+        type rib-ref;
+        description
+          "One of the topology enabled on this interface";
+      }
+    }
+  }
+  grouping route-content {
+    description
+      "This grouping defines OSPF-specific route attributes.";
+    /* moved to ietf-routing
+    leaf metric {
+      type uint32;
+      description "OSPF route metric.";
+    } */
+    leaf tag {
+      type uint32;
+      default "0";
+      description "OSPF route tag.";
+    }
+    leaf route-type {
+      type enumeration {
+        enum intra-area {
+          description "OSPF intra-area route";
+        }
+        enum inter-area {
+          description "OSPF inter-area route";
+        }
+        enum external-1 {
+          description "OSPF external route type 1";
+        }
+        enum external-2 {
+          description "OSPF External route type 2";
+        }
+        enum nssa-1 {
+          description "OSPF NSSA external route type 1";
+        }
+        enum nssa-2 {
+          description "OSPF NSSA external route type 2";
+        }
+      }
+      description "OSPF route type";
+    }
+  }
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:ribs/rt:rib/rt:routes/rt:route" {
+    when "rt:source-protocol = 'ospf:ospfv2' or "
+       + "rt:source-protocol = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for a routes whose source
+         protocol is OSPF.";
+      }
+     description
+       "OSPF-specific route attributes.";
+     uses route-content;
+  }
+
+  identity if-link-type {
+    description "Base identity for OSPF interface link type.";
+  }
+
+  identity if-link-type-normal {
+    base if-link-type;
+    description "OSPF interface link type normal.";
+  }
+
+  identity if-link-type-virtual-link {
+    base if-link-type;
+    description "OSPF interface link type virtual link.";
+  }
+
+  identity if-link-type-sham-link {
+    base if-link-type;
+    description "OSPF interface link type sham link.";
+  }
+
+  grouping notification-instance-hdr {
+    description
+     "This group describes common instance specific
+      data for notifications.";
+
+    leaf routing-instance {
+      type rt:routing-instance-ref;
+      description
+        "Describe the routing instance.";
+    }
+
+    leaf routing-protocol-name {
+      type string;
+      description
+       "Describes the name of the OSPF routing protocol.";
+    }
+
+    container instance-af {
+      leaf af {
+        type identityref {
+          base rt:address-family;
+        }
+        description
+          "Address-family of the instance.";
+      }
+      description
+       "Describes the address family of the OSPF instance.";
+    }
+  }
+
+  notification if-state-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf state {
+      //type if-state-type;
+      type string;
+      description "Interface state.";
+    }
+
+    description
+      "This notification is sent when interface
+      state change is detected.";
+  }
+
+  notification if-config-error {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf packet-source {
+        type yang:dotted-quad;
+        description "Source address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf packet-type {
+      type packet-type;
+      description "OSPF packet type.";
+    }
+
+    leaf error {
+      type enumeration {
+        enum "badVersion" {
+          description "Bad version";
+        }
+        enum "areaMismatch" {
+          description "Area mistmatch";
+        }
+        enum "unknownNbmaNbr" {
+          description "Unknown NBMA neighbor";
+        }
+        enum "unknownVirtualNbr" {
+          description "Unknown virtual link neighbor";
+        }
+        enum "authTypeMismatch" {
+          description "Auth type mismatch";
+        }
+        enum "authFailure" {
+          description "Auth failure";
+        }
+        enum "netMaskMismatch" {
+          description "Network mask mismatch";
+        }
+        enum "helloIntervalMismatch" {
+          description "Hello interval mismatch";
+        }
+        enum "deadIntervalMismatch" {
+          description "Dead interval mismatch";
+        }
+        enum "optionMismatch" {
+          description "Option mismatch";
+        }
+        enum "mtuMismatch" {
+          description "MTU mismatch";
+        }
+        enum "duplicateRouterId" {
+          description "Duplicate router ID";
+        }
+        enum "noError" {
+          description "No error";
+        }
+      }
+      description "Error code.";
+    }
+    description
+      "This notification is sent when interface
+      config error is detected.";
+  }
+
+  notification nbr-state-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+
+    leaf state {
+        type nbr-state-type;
+      description "Neighbor state.";
+    }
+
+    description
+      "This notification is sent when neighbor
+      state change is detected.";
+  }
+
+  notification nbr-restart-helper-status-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    leaf status {
+      type restart-helper-status-type;
+      description "Restart helper status.";
+    }
+
+    leaf age {
+      type uint32;
+      units seconds;
+      description
+        "Remaining time in current OSPF graceful restart
+        interval, if the router is acting as a restart
+        helper for the neighbor.";
+    }
+
+    leaf exit-reason {
+      type restart-exit-reason-type;
+      description
+        "Restart helper exit reason.";
+    }
+    description
+      "This notification is sent when neighbor restart
+      helper status change is detected.";
+  }
+
+  notification rx-bad-packet {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf packet-source {
+        type yang:dotted-quad;
+        description "Source address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf packet-type {
+      type packet-type;
+      description "OSPF packet type.";
+    }
+
+    description
+      "This notification is sent when an OSPF packet
+      has been received on a interface that cannot be parsed.";
+  }
+
+  notification lsdb-approaching-overflow {
+    uses notification-instance-hdr;
+
+    leaf ext-lsdb-limit {
+      type uint32;
+      description
+        "The maximum number of non-default AS-external LSAs
+        entries that can be stored in the link state database.";
+    }
+
+    description
+      "This notification is sent when the number of LSAs
+      in the router's link state database has exceeded
+      ninety percent of the ext-lsdb-limit.";
+  }
+
+  notification lsdb-overflow {
+    uses notification-instance-hdr;
+
+    leaf ext-lsdb-limit {
+      type uint32;
+      description
+        "The maximum number of non-default AS-external LSAs
+        entries that can be stored in the link state database.";
+    }
+
+    description
+      "This notification is sent when the number of LSAs
+      in the router's link state database has exceeded
+      ext-lsdb-limit.";
+  }
+
+  notification nssa-translator-status-change {
+    uses notification-instance-hdr;
+
+    leaf area-id {
+      type uint32;
+      description "Area ID.";
+    }
+
+    leaf status {
+      type nssa-translator-state-type;
+      description
+        "NSSA translator status.";
+    }
+
+    description
+      "This notification is sent when there is a change
+      in the router's ability to translate OSPF NSSA LSAs
+      OSPF AS-External LSAs.";
+  }
+
+  notification restart-status-change {
+    uses notification-instance-hdr;
+
+    leaf status {
+      type restart-status-type;
+      description
+        "Restart status.";
+    }
+
+    leaf restart-interval {
+      type uint16 {
+        range "1..1800";
+      }
+      units seconds;
+      default "120";
+      description
+        "Restart interval.";
+    }
+
+    leaf exit-reason {
+      type restart-exit-reason-type;
+      description
+        "Restart exit reason.";
+    }
+
+    description
+      "This notification is sent when the graceful restart
+      state for the router has changed.";
+  }
+}
+
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-restconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-restconf-monitoring.yang
new file mode 100644
index 000000000..a734f138a
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-restconf-monitoring.yang
@@ -0,0 +1,155 @@
+ module ietf-restconf-monitoring {
+     namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring";
+     prefix "rcmon";
+
+     import ietf-yang-types { prefix yang; }
+     import ietf-inet-types { prefix inet; }
+
+     organization
+       "IETF NETCONF (Network Configuration) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netconf/>
+        WG List:  <mailto:netconf@ietf.org>
+
+        Author:   Andy Bierman
+                  <mailto:andy@yumaworks.com>
+
+        Author:   Martin Bjorklund
+                  <mailto:mbj@tail-f.com>
+
+        Author:   Kent Watsen
+                  <mailto:kwatsen@juniper.net>";
+
+     description
+       "This module contains monitoring information for the
+        RESTCONF protocol.
+
+        Copyright (c) 2016 IETF Trust and the persons identified as
+        authors of the code.  All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject
+        to the license terms contained in, the Simplified BSD License
+        set forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        This version of this YANG module is part of RFC XXXX; see
+        the RFC itself for full legal notices.";
+
+
+     // RFC Ed.: replace XXXX with actual RFC number and remove this
+     // note.
+
+     // RFC Ed.: remove this note
+     // Note: extracted from draft-ietf-netconf-restconf-16.txt
+
+     // RFC Ed.: update the date below with the date of RFC publication
+     // and remove this note.
+     revision 2016-08-15 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: RESTCONF Protocol.";
+     }
+
+     container restconf-state {
+       config false;
+       description
+         "Contains RESTCONF protocol monitoring information.";
+
+       container capabilities {
+         description
+           "Contains a list of protocol capability URIs";
+
+         leaf-list capability {
+           type inet:uri;
+           description "A RESTCONF protocol capability URI.";
+         }
+       }
+
+       container streams {
+         description
+           "Container representing the notification event streams
+            supported by the server.";
+          reference
+            "RFC 5277, Section 3.4, <streams> element.";
+
+         list stream {
+           key name;
+           description
+             "Each entry describes an event stream supported by
+              the server.";
+
+           leaf name {
+             type string;
+             description "The stream name";
+             reference "RFC 5277, Section 3.4, <name> element.";
+           }
+
+           leaf description {
+             type string;
+             description "Description of stream content";
+             reference
+               "RFC 5277, Section 3.4, <description> element.";
+           }
+
+           leaf replay-support {
+             type boolean;
+             default false;
+             description
+               "Indicates if replay buffer supported for this stream.
+                If 'true', then the server MUST support the 'start-time'
+                and 'stop-time' query parameters for this stream.";
+             reference
+               "RFC 5277, Section 3.4, <replaySupport> element.";
+           }
+
+           leaf replay-log-creation-time {
+             when "../replay-support" {
+               description
+                 "Only present if notification replay is supported";
+             }
+             type yang:date-and-time;
+             description
+               "Indicates the time the replay log for this stream
+                was created.";
+             reference
+               "RFC 5277, Section 3.4, <replayLogCreationTime>
+                element.";
+           }
+
+           list access {
+             key encoding;
+             min-elements 1;
+             description
+               "The server will create an entry in this list for each
+                encoding format that is supported for this stream.
+                The media type 'text/event-stream' is expected
+                for all event streams. This list identifies the
+                sub-types supported for this stream.";
+
+             leaf encoding {
+               type string;
+               description
+                 "This is the secondary encoding format within the
+                  'text/event-stream' encoding used by all streams.
+                  The type 'xml' is supported for XML encoding.
+                  The type 'json' is supported for JSON encoding.";
+             }
+
+             leaf location {
+               type inet:uri;
+               mandatory true;
+               description
+                 "Contains a URL that represents the entry point
+                  for establishing notification delivery via server
+                  sent events.";
+             }
+           }
+         }
+       }
+     }
+
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-routing-devs.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-routing-devs.yang
new file mode 100755
index 000000000..23e38a925
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-routing-devs.yang
@@ -0,0 +1,71 @@
+module ietf-routing-devs {
+  namespace "http://cisco.com/ns/ietf-routing/devs";
+
+  prefix rt-devs;
+
+  import ietf-routing {
+    prefix rt;
+  }
+
+  organization
+    "Cisco Systems, Inc.";
+
+  contact
+    " Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com";
+
+  description
+    "This module defines deviation statements for ietf-routing
+     module.";
+
+  revision 2016-07-09 {
+    description
+      "Added deviation to last-updated to change the type from
+      yang:date-and-time to type string.";
+  }
+
+  revision 2015-09-11 {
+    description
+      "Initial Revision";
+
+    reference
+      "RFC 6020: YANG - A Data Modeling Language for the
+       Network Configuration Protocol (NETCONF)";
+
+  }
+
+  deviation /rt:routing/rt:routing-instance/rt:type {
+    deviate not-supported;
+    description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation /rt:routing/rt:routing-instance/rt:enabled {
+    deviate not-supported;
+    description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing/rt:routing-instance/rt:routing-protocols" +
+            "/rt:routing-protocol/rt:description" {
+    deviate not-supported;
+    description  "Not supported in IOS-XE 3.17 release.";
+  }
+
+  deviation "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/rt:routes/rt:route/rt:last-updated" {
+        description
+            "Modifies the usage of yang:date-and-time in itef-routing
+             temporarily to string so that Router's time notation is 
+             passed as it is without conversion to yang:date-and-time format.";
+
+        deviate replace {
+            type string;
+        }
+
+    }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-routing.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-routing.yang
new file mode 100755
index 000000000..727652545
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-routing.yang
@@ -0,0 +1,718 @@
+   module ietf-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
+
+     prefix "rt";
+
+     import ietf-yang-types {
+       prefix "yang";
+     }
+
+     import ietf-interfaces {
+       prefix "if";
+     }
+
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module defines essential components for the management
+        of a routing subsystem.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Features */
+
+     feature multiple-ribs {
+       description
+         "This feature indicates that the server supports user-defined
+          RIBs.
+
+          Servers that do not advertise this feature SHOULD provide
+          exactly one system-controlled RIB per routing-instance and
+          supported address family and make them also the default RIBs.
+          These RIBs then appear as entries of the list
+          /routing-state/routing-instance/ribs/rib.";
+     }
+
+     feature router-id {
+       description
+         "This feature indicates that the server supports configuration
+          of an explicit 32-bit router ID that is used by some routing
+          protocols.
+
+          Servers that do not advertise this feature set a router ID
+          algorithmically, usually to one of configured IPv4 addresses.
+          However, this algorithm is implementation-specific.";
+     }
+
+     /* Identities */
+
+     identity address-family {
+       description
+         "Base identity from which identities describing address
+          families are derived.";
+     }
+
+     identity ipv4 {
+       base address-family;
+       description
+         "This identity represents IPv4 address family.";
+     }
+
+     identity ipv6 {
+       base address-family;
+       description
+         "This identity represents IPv6 address family.";
+     }
+
+     identity routing-instance {
+       description
+         "Base identity from which identities describing routing
+          instance types are derived.";
+     }
+
+     identity default-routing-instance {
+       base routing-instance;
+       description
+         "This identity represents either a default routing instance, or
+          the only routing instance on systems that do not support
+          multiple instances.";
+     }
+
+     identity vrf-routing-instance {
+       base routing-instance;
+       description
+         "This identity represents a VRF routing instance. The type is
+          distinct from the default-routing-instance. There may be
+          multiple vrf-routing-interfaces.";
+     }
+
+     identity routing-protocol {
+       description
+         "Base identity from which routing protocol identities are
+          derived.";
+     }
+
+     identity direct {
+       base routing-protocol;
+       description
+         "Routing pseudo-protocol that provides routes to directly
+          connected networks.";
+     }
+
+     identity static {
+       base routing-protocol;
+       description
+         "Static routing pseudo-protocol.";
+     }
+
+     /* Type Definitions */
+
+     typedef routing-instance-ref {
+       type leafref {
+         path "/rt:routing/rt:routing-instance/rt:name";
+       }
+       description
+         "This type is used for leafs that reference a routing instance
+          configuration.";
+     }
+
+     typedef routing-instance-state-ref {
+       type leafref {
+         path "/rt:routing-state/rt:routing-instance/rt:name";
+       }
+       description
+         "This type is used for leafs that reference state data of a
+          routing instance.";
+     }
+
+     typedef route-preference {
+       type uint32;
+       description
+         "This type is used for route preferences.";
+     }
+
+     /* Groupings */
+
+     grouping address-family {
+       description
+         "This grouping provides a leaf identifying an address
+          family.";
+       leaf address-family {
+         type identityref {
+           base address-family;
+         }
+         mandatory "true";
+         description
+           "Address family.";
+       }
+     }
+
+     grouping router-id {
+       description
+         "This grouping provides router ID.";
+       leaf router-id {
+         type yang:dotted-quad;
+         description
+           "A 32-bit number in the form of a dotted quad that is used by
+            some routing protocols identifying a router.";
+         reference
+           "RFC 2328: OSPF Version 2.";
+       }
+     }
+
+     grouping special-next-hop {
+       description
+         "This grouping provides a leaf with an enumeration of special
+          next-hops.";
+       leaf special-next-hop {
+         type enumeration {
+           enum blackhole {
+             description
+               "Silently discard the packet.";
+           }
+           enum unreachable {
+             description
+               "Discard the packet and notify the sender with an error
+                message indicating that the destination host is
+                unreachable.";
+           }
+           enum prohibit {
+             description
+               "Discard the packet and notify the sender with an error
+                message indicating that the communication is
+                administratively prohibited.";
+           }
+           enum receive {
+             description
+               "The packet will be received by the local system.";
+           }
+         }
+         description
+           "Special next-hop options.";
+       }
+     }
+
+     grouping next-hop-content {
+       description
+         "Generic parameters of next-hops in static routes.";
+       choice next-hop-options {
+         mandatory "true";
+         description
+           "Options for next-hops in static routes.
+
+            It is expected that other cases will be added through
+            augments from other modules, e.g., for Equal-Cost Multipath
+            routing (ECMP).";
+         case simple-next-hop {
+           description
+             "Simple next-hop is specified as an outgoing interface,
+              next-hop address or both.
+
+              Address-family-specific modules are expected to provide
+              'next-hop-address' leaf via augmentation.";
+           leaf outgoing-interface {
+             // type leafref {
+             //   path "/rt:routing/rt:routing-instance/rt:interfaces/"
+             //      + "rt:interface";
+             // }
+             type string;
+             description
+               "Name of the outgoing interface.";
+           }
+         }
+         case special-next-hop {
+           uses special-next-hop;
+         }
+       }
+     }
+
+     grouping next-hop-state-content {
+       description
+         "Generic parameters of next-hops in state data.";
+       choice next-hop-options {
+         mandatory "true";
+         description
+           "Options for next-hops in state data.
+
+            It is expected that other cases will be added through
+            augments from other modules, e.g., for ECMP or recursive
+            next-hops.";
+         case simple-next-hop {
+           description
+             "Simple next-hop is specified as an outgoing interface,
+              next-hop address or both.
+
+              Address-family-specific modules are expected to provide
+              'next-hop-address' leaf via augmentation.";
+           leaf outgoing-interface {
+             // type leafref {
+             //   path "/rt:routing-state/rt:routing-instance/"
+             //      + "rt:interfaces/rt:interface";
+             // }
+             type string;
+             description
+               "Name of the outgoing interface.";
+           }
+           leaf next-hop-address {
+             description
+               "IP address.";
+             type string;
+           }
+
+         }
+         case special-next-hop {
+           uses special-next-hop;
+         }
+       }
+     }
+
+     grouping route-metadata {
+       description
+         "Common route metadata.";
+       leaf source-protocol {
+         type identityref {
+           base routing-protocol;
+         }
+         mandatory "true";
+         description
+           "Type of the routing protocol from which the route
+            originated.";
+       }
+       leaf active {
+         type empty;
+         description
+           "Presence of this leaf indicates that the route is preferred
+            among all routes in the same RIB that have the same
+            destination prefix.";
+       }
+       leaf last-updated {
+         type yang:date-and-time;
+         description
+           "Time stamp of the last modification of the route. If the
+            route was never modified, it is the time when the route was
+            inserted into the RIB.";
+       }
+     }
+
+     /* State data */
+
+     augment "/if:interfaces-state/if:interface" {
+       description
+         "This augment adds a wrapped leaf-list to interface state
+          data.";
+       leaf routing-instance {
+         // type routing-instance-state-ref;
+         type string;
+         must "../if:name=/rt:routing-state/"
+            + "rt:routing-instance[rt:name=current()]/rt:interfaces/"
+            + "rt:interface" {
+           error-message
+             "The interface is not assigned to the routing instance.";
+           description
+             "The reference must mirror a corresponding assignment under
+              routing-instance.";
+         }
+         description
+           "The name of the routing instance to which the interface is
+            assigned.";
+       }
+     }
+
+     container routing-state {
+       config "false";
+       description
+         "State data of the routing subsystem.";
+       list routing-instance {
+         key "name";
+         min-elements "1";
+         description
+           "Each list entry is a container for state data of a routing
+            instance.
+
+            An implementation MUST support routing instance(s) of the
+            type 'rt:default-routing-instance', and MAY support other
+            types. An implementation MAY restrict the number of routing
+            instances of each supported type.
+
+            An implementation SHOULD create at least one
+            system-controlled instance, and MAY allow the clients to
+            create user-controlled routing instances in
+            configuration.";
+         leaf name {
+           type string;
+           description
+             "The name of the routing instance.
+
+              For system-controlled instances the name is persistent,
+              i.e., it SHOULD NOT change across reboots.";
+         }
+         leaf type {
+           type identityref {
+             base routing-instance;
+           }
+           description
+             "The routing instance type.";
+         }
+         uses router-id {
+           description
+             "Global router ID.
+
+              It may be either configured or assigned algorithmically by
+              the implementation.";
+         }
+         container interfaces {
+           description
+             "Network layer interfaces belonging to the routing
+              instance.";
+           leaf-list interface {
+             type if:interface-state-ref;
+             description
+               "Each entry is a reference to the name of a configured
+                network layer interface.";
+           }
+         }
+         container routing-protocols {
+           description
+             "Container for the list of routing protocol instances.";
+           list routing-protocol {
+             key "type name";
+             description
+               "State data of a routing protocol instance.
+
+                An implementation MUST provide exactly one
+                system-controlled instance of the type 'direct'. Other
+                instances MAY be created by configuration.";
+             leaf type {
+               type identityref {
+                 base routing-protocol;
+               }
+               description
+                 "Type of the routing protocol.";
+             }
+             leaf name {
+               type string;
+               description
+                 "The name of the routing protocol instance.
+
+                  For system-controlled instances this name is
+                  persistent, i.e., it SHOULD NOT change across
+                  reboots.";
+             }
+           }
+         }
+         container ribs {
+           description
+             "Container for RIBs.";
+           list rib {
+             key "name";
+             min-elements "1";
+             description
+               "Each entry represents a RIB identified by the 'name'
+                key. All routes in a RIB MUST belong to the same address
+                family.
+
+                For each routing instance, an implementation SHOULD
+                provide one system-controlled default RIB for each
+                supported address family.";
+             leaf name {
+               type string;
+               description
+                 "The name of the RIB.";
+             }
+             uses address-family;
+             leaf default-rib {
+               if-feature multiple-ribs;
+               type boolean;
+               default "true";
+               description
+                 "This flag has the value of 'true' if and only if the
+                  RIB is the default RIB for the given address family.
+
+                  A default RIB always receives direct routes. By
+                  default it also receives routes from all routing
+                  protocols.";
+             }
+             container routes {
+               description
+                 "Current content of the RIB.";
+               list route {
+                 key "destination-prefix";
+                 description
+                   "A RIB route entry. This data node MUST be augmented
+                    with information specific for routes of each address
+                    family.";
+                 leaf route-preference {
+                   type route-preference;
+                   description
+                     "This route attribute, also known as administrative
+                      distance, allows for selecting the preferred route
+                      among routes with the same destination prefix. A
+                      smaller value means a more preferred route.";
+                 }
+                 leaf destination-prefix {
+                   description 
+                     "Destination IP address with prefix";
+                   type string;
+                 }
+                 leaf metric {
+                   type uint32;
+                   description "Route metric.";
+                 }
+                 container next-hop {
+                   description
+                     "Route's next-hop attribute.";
+                   uses next-hop-state-content;
+                 }
+                 uses route-metadata;
+                 leaf update-source {
+                   type string;
+                   description
+                     "Update source for the route.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* Configuration Data */
+
+     container routing {
+       description
+         "Configuration parameters for the routing subsystem.";
+       list routing-instance {
+         key "name";
+         description
+           "Configuration of a routing instance.";
+         leaf name {
+           type string;
+           description
+             "The name of the routing instance.
+
+              For system-controlled entries, the value of this leaf must
+              be the same as the name of the corresponding entry in
+              state data.
+
+              For user-controlled entries, an arbitrary name can be
+              used.";
+         }
+         leaf type {
+           type identityref {
+             base routing-instance;
+           }
+           default "rt:default-routing-instance";
+           description
+             "The type of the routing instance.";
+         }
+         leaf enabled {
+           type boolean;
+           default "true";
+           description
+             "Enable/disable the routing instance.
+
+              If this parameter is false, the parent routing instance is
+              disabled and does not appear in state data, despite any
+              other configuration that might be present.";
+         }
+         uses router-id {
+           if-feature router-id;
+           description
+             "Configuration of the global router ID. Routing protocols
+              that use router ID can use this parameter or override it
+              with another value.";
+         }
+         leaf description {
+           type string;
+           description
+             "Textual description of the routing instance.";
+         }
+         container interfaces {
+           description
+             "Assignment of the routing instance's interfaces.";
+           leaf-list interface {
+             type if:interface-ref;
+             description
+               "The name of a configured network layer interface to be
+                assigned to the routing-instance.";
+           }
+         }
+         container routing-protocols {
+           description
+             "Configuration of routing protocol instances.";
+           list routing-protocol {
+             key "type name";
+             description
+               "Each entry contains configuration of a routing protocol
+                instance.";
+             leaf type {
+               type identityref {
+                 base routing-protocol;
+               }
+               description
+                 "Type of the routing protocol - an identity derived
+                  from the 'routing-protocol' base identity.";
+             }
+             leaf name {
+               type string;
+               description
+                 "An arbitrary name of the routing protocol instance.";
+             }
+             leaf description {
+               type string;
+               description
+                 "Textual description of the routing protocol
+                  instance.";
+             }
+             container static-routes {
+               when "../type='rt:static'" {
+                 description
+                   "This container is only valid for the 'static'
+                    routing protocol.";
+               }
+               description
+                 "Configuration of the 'static' pseudo-protocol.
+
+                  Address-family-specific modules augment this node with
+                  their lists of routes.";
+             }
+           }
+         }
+         container ribs {
+           description
+             "Configuration of RIBs.";
+           list rib {
+             key "name";
+             description
+               "Each entry contains configuration for a RIB identified
+                by the 'name' key.
+
+                Entries having the same key as a system-controlled entry
+                of the list /routing-state/routing-instance/ribs/rib are
+                used for configuring parameters of that entry. Other
+                entries define additional user-controlled RIBs.";
+             leaf name {
+               type string;
+               description
+                 "The name of the RIB.
+
+                  For system-controlled entries, the value of this leaf
+                  must be the same as the name of the corresponding
+                  entry in state data.
+
+                  For user-controlled entries, an arbitrary name can be
+                  used.";
+             }
+             uses address-family {
+               description
+                 "Address family of the RIB.
+
+                  It is mandatory for user-controlled RIBs. For
+                  system-controlled RIBs it can be omitted, otherwise it
+                  must match the address family of the corresponding
+                  state entry.";
+               refine "address-family" {
+                 mandatory "false";
+               }
+             }
+             leaf description {
+               type string;
+               description
+                 "Textual description of the RIB.";
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     rpc fib-route {
+       description
+         "Return the active FIB route that a routing-instance uses for
+          sending packets to a destination address.";
+       input {
+         leaf routing-instance-name {
+           // type routing-instance-state-ref;
+           type string;
+           mandatory "true";
+           description
+             "Name of the routing instance whose forwarding information
+              base is being queried.
+
+              If the routing instance with name equal to the value of
+              this parameter doesn't exist, then this operation SHALL
+              fail with error-tag 'data-missing' and error-app-tag
+              'routing-instance-not-found'.";
+         }
+         container destination-address {
+           description
+             "Network layer destination address.
+
+              Address family specific modules MUST augment this
+              container with a leaf named 'address'.";
+           uses address-family;
+         }
+       }
+       output {
+         container route {
+           description
+             "The active FIB route for the specified destination.
+
+              If the routing instance has no active FIB route for the
+              destination address, no output is returned - the server
+              SHALL send an <rpc-reply> containing a single element
+              <ok>.
+
+              Address family specific modules MUST augment this list
+              with appropriate route contents.";
+           uses address-family;
+           container next-hop {
+             description
+               "Route's next-hop attribute.";
+             uses next-hop-state-content;
+           }
+           uses route-metadata;
+         }
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-syslog-types.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-syslog-types.yang
similarity index 100%
rename from profiles/bundles/yang/ietf/0.1.6/ietf-syslog-types.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-syslog-types.yang
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-yang-library.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-yang-library.yang
new file mode 100644
index 000000000..bc466ee09
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-yang-library.yang
@@ -0,0 +1,208 @@
+module ietf-yang-library {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-yang-library";
+  prefix "yanglib";
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-inet-types {
+    prefix inet;
+  }
+  organization
+    "IETF NETCONF (Network Configuration) Working Group";
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netconf/>
+     WG List:  <mailto:netconf@ietf.org>
+     WG Chair: Mehmet Ersue
+               <mailto:mehmet.ersue@nsn.com>
+     WG Chair: Mahesh Jethanandani
+               <mailto:mjethanandani@gmail.com>
+     Editor:   Andy Bierman
+               <mailto:andy@yumaworks.com>
+     Editor:   Martin Bjorklund
+               <mailto:mbj@tail-f.com>
+     Editor:   Kent Watsen
+               <mailto:kwatsen@juniper.net>";
+  description
+    "This module contains monitoring information about the YANG
+     modules and submodules that are used within a YANG-based
+     server.
+     Copyright (c) 2016 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     This version of this YANG module is part of RFC 7895; see
+     the RFC itself for full legal notices.";
+  revision 2016-06-21 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7895: YANG Module Library.";
+  }
+  /*
+   * Typedefs
+   */
+  typedef revision-identifier {
+    type string {
+      pattern '\d{4}-\d{2}-\d{2}';
+    }
+    description
+      "Represents a specific date in YYYY-MM-DD format.";
+  }
+  /*
+   * Groupings
+   */
+  grouping module-list {
+    description
+      "The module data structure is represented as a grouping
+       so it can be reused in configuration or another monitoring
+       data structure.";
+    grouping common-leafs {
+      description
+        "Common parameters for YANG modules and submodules.";
+      leaf name {
+        type yang:yang-identifier;
+        description
+          "The YANG module or submodule name.";
+      }
+      leaf revision {
+        type union {
+          type revision-identifier;
+          type string { length 0; }
+        }
+        description
+          "The YANG module or submodule revision date.
+           A zero-length string is used if no revision statement
+           is present in the YANG module or submodule.";
+      }
+    }
+    grouping schema-leaf {
+      description
+        "Common schema leaf parameter for modules and submodules.";
+      leaf schema {
+        type inet:uri;
+        description
+          "Contains a URL that represents the YANG schema
+           resource for this module or submodule.
+           This leaf will only be present if there is a URL
+           available for retrieval of the schema for this entry.";
+      }
+    }
+    list module {
+      key "name revision";
+      description
+        "Each entry represents one revision of one module
+         currently supported by the server.";
+      uses common-leafs;
+      uses schema-leaf;
+      leaf namespace {
+        type inet:uri;
+        mandatory true;
+        description
+          "The XML namespace identifier for this module.";
+      }
+      leaf-list feature {
+        type yang:yang-identifier;
+        description
+          "List of YANG feature names from this module that are
+           supported by the server, regardless of whether they are
+           defined in the module or any included submodule.";
+      }
+      list deviation {
+        key "name revision";
+        description
+          "List of YANG deviation module names and revisions
+           used by this server to modify the conformance of
+           the module associated with this entry.  Note that
+           the same module can be used for deviations for
+           multiple modules, so the same entry MAY appear
+           within multiple 'module' entries.
+           The deviation module MUST be present in the 'module'
+           list, with the same name and revision values.
+           The 'conformance-type' value will be 'implement' for
+           the deviation module.";
+        uses common-leafs;
+      }
+      leaf conformance-type {
+        type enumeration {
+          enum implement {
+            description
+              "Indicates that the server implements one or more
+               protocol-accessible objects defined in the YANG module
+               identified in this entry.  This includes deviation
+               statements defined in the module.
+               For YANG version 1.1 modules, there is at most one
+               module entry with conformance type 'implement' for a
+               particular module name, since YANG 1.1 requires that,
+               at most, one revision of a module is implemented.
+               For YANG version 1 modules, there SHOULD NOT be more
+               than one module entry for a particular module name.";
+          }
+          enum import {
+            description
+              "Indicates that the server imports reusable definitions
+               from the specified revision of the module but does
+               not implement any protocol-accessible objects from
+               this revision.
+               Multiple module entries for the same module name MAY
+               exist.  This can occur if multiple modules import the
+               same module but specify different revision dates in
+               the import statements.";
+          }
+        }
+        mandatory true;
+        description
+          "Indicates the type of conformance the server is claiming
+           for the YANG module identified by this entry.";
+      }
+      list submodule {
+        key "name revision";
+        description
+          "Each entry represents one submodule within the
+           parent module.";
+        uses common-leafs;
+        uses schema-leaf;
+      }
+    }
+  }
+  /*
+   * Operational state data nodes
+   */
+  container modules-state {
+    config false;
+    description
+      "Contains YANG module monitoring information.";
+    leaf module-set-id {
+      type string;
+      mandatory true;
+      description
+        "Contains a server-specific identifier representing
+         the current set of modules and submodules.  The
+         server MUST change the value of this leaf if the
+         information represented by the 'module' list instances
+         has changed.";
+    }
+    uses module-list;
+  }
+  /*
+   * Notifications
+   */
+  notification yang-library-change {
+    description
+      "Generated when the set of modules and submodules supported
+       by the server has changed.";
+    leaf module-set-id {
+      type leafref {
+        path "/yanglib:modules-state/yanglib:module-set-id";
+      }
+      mandatory true;
+      description
+        "Contains the module-set-id value representing the
+         set of modules and submodules supported at the server at
+         the time the notification is generated.";
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.2/ietf-yang-smiv2.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-yang-smiv2.yang
new file mode 100755
index 000000000..aa428e3d5
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.2/ietf-yang-smiv2.yang
@@ -0,0 +1,172 @@
+ module ietf-yang-smiv2 {
+
+    yang-version 1;
+
+    namespace
+      "urn:ietf:params:xml:ns:yang:ietf-yang-smiv2";
+
+  prefix ietf-yang-smiv2;
+
+    organization
+      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+    contact
+      "WG Web:   <http://tools.ietf.org/wg/netmod/>
+    WG List:  <mailto:netmod@ietf.org>
+
+    WG Chair: David Kessens
+              <mailto:david.kessens@nsn.com>
+
+    WG Chair: Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>
+
+    Editor:   Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>";
+
+    description
+      "This module defines YANG extensions that are used to translate
+    SMIv2 concepts into YANG.
+
+    Copyright (c) 2012 IETF Trust and the persons identified as
+    authors of the code.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or
+    without modification, is permitted pursuant to, and subject
+    to the license terms contained in, the Simplified BSD License
+    set forth in Section 4.c of the IETF Trust's Legal Provisions
+    Relating to IETF Documents
+    (http://trustee.ietf.org/license-info).
+
+    This version of this YANG module is part of RFC 6643; see
+    the RFC itself for full legal notices.";
+
+    revision "2012-06-22" {
+      description "Initial revision.";
+      reference
+        "RFC 6643: Translation of Structure of Management Information
+        Version 2 (SMIv2) MIB Modules to YANG Modules";
+
+    }
+
+
+    identity object-identity {
+      description
+        "Base identity for all SMIv2 OBJECT-IDENTITYs.";
+    }
+
+    typedef opaque {
+      type binary;
+      description
+        "The Opaque type supports the capability to pass arbitrary ASN.1
+      syntax.  A value is encoded using the ASN.1 Basic Encoding Rules
+      into a string of octets.  This, in turn, is encoded as an OCTET
+      STRING, in effect 'double-wrapping' the original ASN.1 value.
+
+      In the value set and its semantics, this type is equivalent to
+      the Opaque type of the SMIv2.  This type exists in the SMIv2
+      solely for backward-compatibility reasons and this is also
+      true for this YANG data type.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension display-hint {
+      argument "format" {
+        yin-element false;
+      }
+      description
+        "The display-hint statement takes as an argument the DISPLAY-HINT
+      assigned to an SMIv2 textual convention.";
+      reference
+        "RFC 2579: Textual Conventions for SMIv2";
+
+    }
+
+    extension max-access {
+      argument "access" {
+        yin-element false;
+      }
+      description
+        "The max-access statement takes as an argument the MAX-ACCESS
+      assigned to an SMIv2 object definition.
+
+      The MAX-ACCESS value is SMIv2 specific and has no impact on
+      the access provided to YANG objects through protocols such
+      as NETCONF.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension defval {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The defval statement takes as an argument a default value
+      defined by an SMIv2 DEFVAL clause.  Note that the value is in
+      the SMIv2 value space defined by the SMIv2 syntax of the
+      corresponding object and not in the YANG value space
+      defined by the corresponding YANG data type.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension implied {
+      argument "index" {
+        yin-element false;
+      }
+      description
+        "If an SMIv2 INDEX object is preceded by the IMPLIED keyword, then
+      the implied statement is present in the YANG module and takes as
+      an argument the name of the IMPLIED index object.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension alias {
+      argument "descriptor" {
+        yin-element false;
+      }
+      description
+        "The alias statement introduces an SMIv2 descriptor.  The body of
+      the alias statement is expected to contain an oid statement that
+      provides the numeric OID associated with the descriptor.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension oid {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The oid statement takes as an argument the object identifier
+      assigned to an SMIv2 definition.  The object identifier value
+      is written in decimal dotted notation.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension subid {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The subid statement takes as an argument the last sub-identifier
+      of the object identifier assigned to an SMIv2 definition.  The
+      sub-identifier value is a single positive decimal natural number.
+      The subid statement may not be used as a substatement to any
+      top-level node in a YANG document.  The subid substatement may
+      be used only as a substatement to a node having a parent node
+      defined with either an ietf-yang-smiv2:oid or ietf-yang-smiv2:subid substatement.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+  }  // module ietf-yang-smiv2
diff --git a/profiles/bundles/yang/cisco-ios-xe/ietf-yang-types.yang b/profiles/bundles/yang/ietf/0.1.2/ietf-yang-types.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-ios-xe/ietf-yang-types.yang
rename to profiles/bundles/yang/ietf/0.1.2/ietf-yang-types.yang
diff --git a/profiles/bundles/yang/ietf/0.1.3/iana-crypt-hash.yang b/profiles/bundles/yang/ietf/0.1.3/iana-crypt-hash.yang
new file mode 100644
index 000000000..44c4674f8
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/iana-crypt-hash.yang
@@ -0,0 +1,120 @@
+module iana-crypt-hash {
+  namespace "urn:ietf:params:xml:ns:yang:iana-crypt-hash";
+  prefix ianach;
+
+  organization "IANA";
+  contact
+    "        Internet Assigned Numbers Authority
+
+     Postal: ICANN
+             12025 Waterfront Drive, Suite 300
+             Los Angeles, CA  90094-2536
+             United States
+
+     Tel:    +1 310 301 5800
+     E-Mail: iana@iana.org>";
+  description
+    "This YANG module defines a type for storing passwords
+     using a hash function and features to indicate which hash
+     functions are supported by an implementation.
+
+     The latest revision of this YANG module can be obtained from
+     the IANA web site.
+
+     Requests for new values should be made to IANA via
+     email (iana@iana.org).
+
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     The initial version of this YANG module is part of RFC 7317;
+     see the RFC itself for full legal notices.";
+
+  revision 2014-08-06 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7317: A YANG Data Model for System Management";
+  }
+
+  typedef crypt-hash {
+    type string {
+      pattern
+        '$0$.*'
+      + '|$1$[a-zA-Z0-9./]{1,8}$[a-zA-Z0-9./]{22}'
+      + '|$5$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{43}'
+      + '|$6$(rounds=\d+$)?[a-zA-Z0-9./]{1,16}$[a-zA-Z0-9./]{86}';
+    }
+    description
+      "The crypt-hash type is used to store passwords using
+       a hash function.  The algorithms for applying the hash
+       function and encoding the result are implemented in
+       various UNIX systems as the function crypt(3).
+
+       A value of this type matches one of the forms:
+
+         $0$<clear text password>
+         $<id>$<salt>$<password hash>
+         $<id>$<parameter>$<salt>$<password hash>
+
+       The '$0$' prefix signals that the value is clear text.  When
+       such a value is received by the server, a hash value is
+       calculated, and the string '$<id>$<salt>$' or
+       $<id>$<parameter>$<salt>$ is prepended to the result.  This
+       value is stored in the configuration data store.
+       If a value starting with '$<id>$', where <id> is not '0', is
+       received, the server knows that the value already represents a
+       hashed value and stores it 'as is' in the data store.
+
+       When a server needs to verify a password given by a user, it
+       finds the stored password hash string for that user, extracts
+       the salt, and calculates the hash with the salt and given
+       password as input.  If the calculated hash value is the same
+       as the stored value, the password given by the client is
+       accepted.
+
+       This type defines the following hash functions:
+
+         id | hash function | feature
+         ---+---------------+-------------------
+          1 | MD5           | crypt-hash-md5
+          5 | SHA-256       | crypt-hash-sha-256
+          6 | SHA-512       | crypt-hash-sha-512
+
+       The server indicates support for the different hash functions
+       by advertising the corresponding feature.";
+    reference
+      "IEEE Std 1003.1-2008 - crypt() function
+       RFC 1321: The MD5 Message-Digest Algorithm
+       FIPS.180-4.2012: Secure Hash Standard (SHS)";
+  }
+
+  feature crypt-hash-md5 {
+    description
+      "Indicates that the device supports the MD5
+       hash function in 'crypt-hash' values.";
+    reference "RFC 1321: The MD5 Message-Digest Algorithm";
+  }
+
+  feature crypt-hash-sha-256 {
+    description
+      "Indicates that the device supports the SHA-256
+       hash function in 'crypt-hash' values.";
+    reference "FIPS.180-4.2012: Secure Hash Standard (SHS)";
+  }
+
+  feature crypt-hash-sha-512 {
+    description
+      "Indicates that the device supports the SHA-512
+       hash function in 'crypt-hash' values.";
+    reference "FIPS.180-4.2012: Secure Hash Standard (SHS)";
+  }
+
+}
diff --git a/profiles/bundles/yang/cisco-iosxr/iana-if-type.yang b/profiles/bundles/yang/ietf/0.1.3/iana-if-type.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-iosxr/iana-if-type.yang
rename to profiles/bundles/yang/ietf/0.1.3/iana-if-type.yang
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-action.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-action.yang
new file mode 100644
index 000000000..18773e638
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-action.yang
@@ -0,0 +1,486 @@
+module ietf-diffserv-action {
+    namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-action";
+    prefix action;
+
+    import ietf-inet-types { prefix inet; }
+    import ietf-diffserv-classifier { prefix classifier; }
+    import ietf-diffserv-policy { prefix policy; }
+    import policy-types { prefix policy-types; }
+    organization "IETF NETMOD (Netmod Working Group) Working Group";
+    contact
+        "WG Web: <http://tools.ietf.org/wg/netmod/> WG List: <mailto:netmod@ietf.org>
+        WG Chair: Jurgen Schonwalder <mailto:j.schoenwaelder@jacobs-university.de>
+        WG Chair: Tom Nadeau <mailto:tnadeau@lucidvision.com> Editor:
+        Aseem Choudhary <mailto:asechoud@cisco.com> Editor: Shitanshu
+        Shah <mailto:svshah@cisco.com>";
+    description
+        "This module contains a collection of YANG definitions for configuring
+        diffserv specification implementations. Copyright (c) 2014 IETF
+        Trust and the persons identified as authors of the code. All rights
+        reserved. Redistribution and use in source and binary forms, with
+        or without modification, is permitted pursuant to, and subject
+        to the license terms contained in, the Simplified BSD License
+        set forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents (http://trustee.ietf.org/license-info).
+        This version of this YANG module is part of RFC XXXX; see the
+        RFC itself for full legal notices.";
+
+    revision 2015-04-07 {
+        description
+                "Latest revision for diffserv actions";
+        reference "RFC XXXX";
+    }
+
+    feature hierarchial-policy-support {
+        description
+                " This feature allows hierarchial policy to be configured";
+    }
+
+    feature aqm-red-support {
+        description
+                " This feature allows AQM RED to be configured";
+    }
+
+   feature priority-rate-burst-support {
+        description "support rate and burst in priority";
+    }
+
+    grouping dscp-range {
+        description
+                "dscp range definition";
+        leaf dscp-min {
+            type inet:dscp;
+            description
+                        "Minimum of dscp range";
+        }
+        leaf dscp-max {
+            type inet:dscp;
+            description
+                        "Maximum of dscp range";
+        }
+    }
+
+    grouping burst {
+        description
+                "burst size or interval configuration";
+        choice burst-type {
+            case size {
+                leaf burst-size {
+                    type uint64;
+                    units "bytes";
+                    description
+                                        "burst size";
+                }
+            }
+            case interval {
+                leaf burst-interval {
+                    type uint64;
+                    units "microsecond";
+                    description
+                                        "burst interval";
+                }
+            }
+            description
+                        "Choice of burst type";
+        }
+    }
+
+    grouping threshold {
+        description
+                "Threshold Parameters";
+        container threshold {
+            description
+                        "threshold";
+            choice threshold-type {
+                case size {
+                    leaf threshold-size {
+                        type uint64;
+                        units "bytes";
+                        description
+                                                "Threshold size";
+                    }
+                }
+                case interval {
+                    leaf threshold-interval {
+                        type uint64;
+                        units "microsecond";
+                        description
+                                                "Threshold interval";
+                    }
+                }
+                description
+                                "Choice of threshold type";
+            }
+        }
+    }
+
+    identity marking {
+        base policy:action-type;
+        description
+                "marking action type";
+    }
+
+    identity meter {
+        base policy:action-type;
+        description
+                "meter action type";
+    }
+
+    identity priority {
+        base policy:action-type;
+        description
+                "priority action type";
+    }
+
+    identity min-rate {
+        base policy:action-type;
+        description
+                "min-rate action type";
+    }
+
+    identity max-rate {
+        base policy:action-type;
+        description
+                "max-rate action type";
+    }
+
+    identity algorithmic-drop {
+        base policy:action-type;
+        description
+                "algorithmic-drop action type";
+    }
+
+    identity drop-type {
+        description
+                "drop algorithm";
+    }
+
+    identity always-drop {
+        base drop-type;
+        description
+                "always drop algorithm";
+    }
+
+    identity tail-drop {
+        base drop-type;
+        description
+                "tail drop algorithm";
+    }
+
+    identity random-detect {
+        base drop-type;
+        description
+                "random detect algorithm";
+    }
+
+    identity meter-action-type {
+        description
+                "action type in a meter";
+    }
+
+    identity meter-action-drop {
+        base meter-action-type;
+        description
+                "drop action type in a meter";
+    }
+
+    identity meter-action-set {
+        base meter-action-type;
+        description
+                "mark action type in a meter";
+    }
+
+    grouping drop {
+        leaf drop-action {
+            type empty;
+            description
+                        "always drop algorithm";
+        }
+        description
+                "the drop action";
+    }
+    grouping queuelimit {
+        list qlimit-dscp-thresh {
+            key "dscp-min dscp-max";
+            uses dscp-range;
+            uses threshold;
+            description
+                        "the queue limit per dscp range";
+        }
+        description
+                "the queue limit beyond which queue will not hold any packet";
+    }
+
+    grouping meter-action-params {
+        leaf meter-action-type {
+            type identityref {
+                base meter-action-type;
+            }
+            description
+                        "meter action type";
+        }
+        leaf next-meter-id {
+            type uint16;
+            description
+                        "next meter identifier";
+        }
+        choice val {
+            case meter-action-mark {
+                uses marking;
+                description
+                                "meter action: mark";
+            }
+            case meter-action-drop {
+                description
+                                "meter action: drop";
+                uses drop;
+            }
+            description
+                        " meter action based on choice of meter action type";
+        }
+        description
+                "meter action parameters";
+    }
+
+    grouping meter {
+        leaf meter-id {
+            type uint16;
+            description
+                        "meter identifier";
+        }
+        leaf meter-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "meter rate";
+        }
+        uses burst;
+        container color {
+            uses classifier:classifier-entry-generic-attr;
+            description
+                        "color aware & color blind attributes container";
+        }
+        container succeed-action {
+            uses meter-action-params;
+            description
+                        "confirm action";
+        }
+        container fail-action {
+            uses meter-action-params;
+            description
+                        "exceed action";
+        }
+        description
+                "meter attributes";
+    }
+
+    grouping priority {
+        leaf priority-level {
+            type uint8;
+            description
+                        "priority level";
+        }
+        description
+                "priority attributes";
+    }
+
+    grouping min-rate {
+        leaf min-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "minimum rate";
+        }
+        description
+                "minimum rate grouping";
+    }
+    grouping marking {
+        leaf dscp {
+            type inet:dscp;
+            description
+                        "dscp marking";
+        }
+        description
+                "marking grouping";
+    }
+
+    grouping max-rate {
+        leaf absolute-rate {
+            type uint64;
+            units "bits-per-second";
+            description
+                        "rate in bits per second";
+        }
+        uses burst;
+        description
+                "maximum rate attributes";
+    }
+
+    grouping red-threshold {
+        container red-min-thresh {
+            uses threshold;
+            description
+                        "Minimum threshold";
+        }
+        container red-max-thresh {
+            uses threshold;
+            description
+                        "Maximum threshold";
+        }
+        leaf mark-probability {
+            type uint32 {
+                range "1..1000";
+            }
+            description
+                        "Mark probability";
+        }
+        description
+                "RED threshold attributes";
+    }
+
+    grouping randomdetect {
+        leaf exp-weighting-const {
+            type uint32;
+            description
+                        "Exponential weighting constant factor for red profile ";
+        }
+        uses red-threshold;
+        description
+                "Random detect attributes";
+    }
+
+   typedef percent-value-1to100 {
+        type uint8 {
+            range "1..100";
+        }
+
+        description "Percent range from 1 to 100";
+    }
+
+   grouping RATE-OPER {
+        leaf rate {
+            type uint64;
+            units "bits-per-second";
+            description "Rate value";
+        }
+
+        uses RATE-UNIT;
+        description "Rate value and units operator";
+    }
+
+   grouping RATE-UNIT {
+        leaf absolute-rate-metric {
+            type policy-types:metric;
+            default none;
+            description "Metric";
+        }
+        leaf absolute-rate-units {
+            type policy-types:rate-unit;
+            description "Rate basic units";
+        }
+        
+        leaf rate-percent {
+            type percent-value-1to100;
+            description "percent";
+        }
+        
+        leaf rate-ratio {
+            type uint32 {range "1..65532";}
+        }
+        description "Rate units";
+    } 
+
+    augment "/policy:policies/policy:policy-entry" +
+        "/policy:classifier-entry" +
+        "/policy:classifier-action-entry-cfg" +
+        "/policy:action-cfg-params" {
+        case marking {
+            container marking-cfg {
+                uses marking;
+                description
+                                "Marking configuration container";
+            }
+        }
+        case priority {
+            container priority-cfg {
+                uses priority;
+                container rate-burst {
+                if-feature priority-rate-burst-support;
+                uses RATE-OPER;
+                uses burst; 
+                description "absolute priority rate with/without burst rate" + 
+                    "and absolute percent";
+            }
+                description
+                                "priority attributes container";
+            }
+        }
+        case meter {
+            container meter-cfg {
+                list meter-list {
+                    key "meter-id";
+                    uses meter;
+                    description
+                                        "Meter configuration";
+                }
+                description
+                                "Meter list configuration container";
+            }
+        }
+        case min-rate {
+            container min-rate-cfg {
+                uses min-rate;
+                uses RATE-UNIT;
+                container bw-excess-share-cfg {
+                 leaf value {
+                    type uint32;
+                    description "percentage or ratio value";
+                 }
+                 uses RATE-UNIT;
+                 
+                 description "share the bandwidth remaming";
+            }
+                description
+                                "min guaranteed bandwidth";
+            }
+        }
+        case max-rate {
+            container max-rate-cfg {
+                uses max-rate;
+                uses RATE-UNIT;
+                description
+                                "maximum rate attributes";
+            }
+        }
+        case algorithmic-drop {
+            choice drop-algorithm {
+                case always-drop {
+                    container drop-cfg {
+                        uses drop;
+                        description
+                                                "Always Drop configuration container";
+                    }
+                }
+                case tail-drop {
+                    container tail-drop-cfg {
+                        uses queuelimit;
+                        description
+                                                "Tail Drop configuration container";
+                    }
+                }
+                case random-detect {
+                    container random-detect-cfg {
+                        if-feature aqm-red-support;
+                        uses randomdetect;
+                        description
+                                                "Random Detect configuration container";
+                    }
+                }
+                description
+                                "Choice of Drop Algorithm";
+            }
+        }
+        description
+                "Augment the actions to policy entry";
+    }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-classifier.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-classifier.yang
new file mode 100644
index 000000000..4ef1785c1
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-classifier.yang
@@ -0,0 +1,323 @@
+module ietf-diffserv-classifier {
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-classifier";
+  prefix classifier;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+     
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision of diffserv based classifier";
+    reference "RFC XXXX";
+  }
+
+  feature policy-inline-classifier-config {
+    description
+      " This feature allows classifier configuration 
+        directly under policy.";
+  }
+
+  identity filter-type {
+    description
+      " This is identity of base filter-type";
+  }
+
+  identity dscp {
+    base filter-type;
+    description
+      "DSCP filter-type";
+  }
+
+  identity source-ip-address {
+    base filter-type;
+    description
+      "source-ip-address filter-type";
+  }
+
+  identity destination-ip-address {
+    base filter-type;
+    description
+      "destination-ip-address filter-type";
+  }
+
+  identity source-port {
+    base filter-type;
+    description
+      "source-port filter-type";
+  }
+
+  identity destination-port {
+    base filter-type;
+    description
+      "destination-port filter-type";
+  }
+
+  identity protocol {
+    base filter-type;
+    description
+      "protocol filter-type";
+  }
+
+ 
+  identity classifier-entry-filter-operation-type {
+    description
+      "Classifier entry filter logical operation";
+  }
+
+  identity match-any-filter {
+    base classifier-entry-filter-operation-type;
+    description
+      "Classifier entry filter logical OR operation";
+  }
+
+  identity match-all-filter {
+    base classifier-entry-filter-operation-type;
+    description
+      "Classifier entry filter logical AND operation";
+  }
+
+
+  grouping filters {
+    description
+      "Filters in a Classifier entry";
+    leaf filter-type {
+      type identityref {
+        base filter-type;
+      }
+      description
+        "This leaf defines type of the filter";
+    }
+    leaf filter-logical-not {
+      type boolean;
+      description
+        "
+         This is logical-not operator for a filter. When true, it 
+         indicates filter looks for absence of a pattern defined 
+         by the filter
+        ";
+    }
+    choice filter-param {
+      description
+        "Choice of filter types";
+       case dscp {
+        list dscp-cfg {
+          key "dscp-min dscp-max";
+          description
+            "list of dscp ranges";
+          leaf dscp-min {
+            type inet:dscp;
+            description
+              "Minimum value of dscp range";
+          }
+          leaf dscp-max {
+            type inet:dscp;
+            description
+              "maximum value of dscp range";
+          }
+        }
+        description
+          "Filter containing list of dscp ranges";
+      } 
+
+     
+       case source-ip-address {
+        list source-ip-address-cfg {
+          key "source-ip-addr";
+          description
+            "list of source ip address";
+          leaf source-ip-addr {
+            type inet:ip-prefix;
+            description
+              "source ip prefix";
+          }
+        }
+        description
+          "Filter containing list of source ip addresses";
+      }  
+      
+      case destination-ip-address {
+        list destination-ip-address-cfg {
+          key "destination-ip-addr";
+          description
+            "list of destination ip address";
+          leaf destination-ip-addr {
+            type inet:ip-prefix;
+            description
+              "destination ip prefix";
+          }
+        }
+        description
+          "Filter containing list of destination ip address";
+      }
+      case source-port {
+        list source-port-cfg {
+          key "source-port-min source-port-max";
+          description
+            "list of ranges of source port";
+          leaf source-port-min {
+            type inet:port-number;
+            description
+              "minimum value of source port range";
+          }
+          leaf source-port-max {
+            type inet:port-number;
+            description
+              "maximum value of source port range";
+          }
+        }
+        description
+          "Filter containing list of source-port ranges";
+      }
+      case destination-port {
+        list destination-port-cfg {
+          key "destination-port-min destination-port-max";
+          description
+            "list of ranges of destination port";
+          leaf destination-port-min {
+            type inet:port-number;
+            description
+              "minimum value of destination port range";
+          }
+          leaf destination-port-max {
+            type inet:port-number;
+            description
+              "maximum value of destination port range";
+          }
+        }
+        description
+          "Filter containing list of destination-port ranges";
+      }
+      case protocol {
+        list protocol-cfg {
+          key "protocol-min protocol-max";
+          description
+            "list of ranges of protocol values";
+          leaf protocol-min {
+            type uint8 {
+              range "0..255";
+            }
+            description
+              "minimum value of protocol range";
+          }
+          leaf protocol-max {
+            type uint8 {
+              range "0..255";
+            }
+            description
+              "maximum value of protocol range";
+          }
+        }
+        description
+          "Filter Type Protocol";
+      }
+    }
+  }
+
+  grouping classifier-entry-generic-attr {
+    description
+      "Classifier attributes";
+    leaf classifier-entry-name {
+      type string;
+      description
+        "Diffserv classifier name";
+    }
+    leaf classifier-entry-descr {
+      type string;
+      description
+        "Description of the class template";
+    }
+    leaf classifier-entry-filter-operation {
+      type identityref {
+        base classifier-entry-filter-operation-type;
+      }
+      default "match-any-filter";
+      description
+        "Filters are applicable as any or all filters";
+    }
+  }
+
+  grouping classifier-entry-inline-attr {
+    description
+      "Classifier inline attributes";
+    leaf classifier-entry-inline {
+      type boolean;
+      default "false";
+      description
+        "Indication of inline classifier entry";
+    }
+    leaf classifier-entry-filter-oper {
+      type identityref {
+        base classifier-entry-filter-operation-type;
+      }
+      default "match-any-filter";
+      description
+        "Filters are applicable as any or all filters";
+    }
+    list filter-entry {
+      if-feature policy-inline-classifier-config;
+      must "../classifier-entry-inline = 'true'" {
+        description
+          "For inline filter configuration, inline attribute
+           must be true";
+      }
+      key "filter-type filter-logical-not";
+      uses filters;
+      description
+        "Filters configured inline in a policy";
+    }
+  }
+
+  container classifiers {
+    description
+      "list of classifier entry";
+    list classifier-entry {
+      key "classifier-entry-name";
+      description
+        "classifier entry template";
+      uses classifier-entry-generic-attr;
+      list filter-entry {
+        key "filter-type filter-logical-not";
+        uses filters;
+        description
+          "Filter configuration";
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-policy.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-policy.yang
new file mode 100644
index 000000000..a64df5e4c
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-policy.yang
@@ -0,0 +1,125 @@
+module ietf-diffserv-policy {
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-policy";
+  prefix policy;
+
+  import ietf-diffserv-classifier {
+    prefix classifier;
+  }
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder  
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision of diffserv policy";
+    reference "RFC XXXX";
+  }
+
+  feature policy-template-support {
+    description
+      " This feature allows policy template to be configured";
+  }
+
+  feature hierarchial-policy-support {
+    description
+      " This feature allows hierarchial policy to be configured";
+  }
+
+  grouping policy-generic-attr {
+    description
+      "Policy Attributes";
+    leaf policy-name {
+      type string;
+      description
+        "Diffserv policy name";
+    }
+    leaf policy-descr {
+      type string;
+      description
+        "Diffserv policy description";
+    }
+  }
+
+  identity action-type {
+    description
+      "This base identity type defines action-types";
+  }
+
+  grouping classifier-action-entry-cfg {
+    description
+      "List of Configuration of classifier & associated actions";
+    list classifier-action-entry-cfg {
+      key "action-type";
+      ordered-by user;
+      description
+        "Configuration of classifier & associated actions";
+      leaf action-type {
+        type identityref {
+          base action-type;
+        }
+        description
+          "This defines action type ";
+      }
+      choice action-cfg-params {
+        description
+          "Choice of action types";
+      }
+    }
+  }
+
+  container policies {
+    if-feature policy-template-support;
+    description
+      "list of policy templates";
+    list policy-entry {
+      key "policy-name";
+      description
+        "policy template";
+      uses policy-generic-attr;
+      list classifier-entry {
+        key "classifier-entry-name";
+        ordered-by user;
+        description
+          "Classifier entry configuration in a policy";
+        leaf classifier-entry-name {
+          type string;
+          description
+            "Diffserv classifier entry name";
+        }
+        uses classifier:classifier-entry-inline-attr;
+        uses classifier-action-entry-cfg;
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-target.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-target.yang
new file mode 100644
index 000000000..f03b32e9f
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-diffserv-target.yang
@@ -0,0 +1,261 @@
+module ietf-diffserv-target {
+  
+  yang-version 1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-diffserv-target";
+  prefix target;
+
+  import ietf-interfaces {
+    prefix if;
+  }
+
+  organization "IETF NETMOD (Netmod Working Group) Working Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Juergen Schoenwaelder  
+               <mailto:j.schoenwaelder@jacobs-university.de>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     Editor:   Aseem Choudhary
+               <mailto:asechoud@cisco.com>
+     
+     Editor:   Shitanshu Shah
+               <mailto:svshah@cisco.com>";
+  description
+    "This module contains a collection of YANG definitions for
+     configuring diffserv specification implementations.
+     
+     Copyright (c) 2014 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+     
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+     
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2015-04-07 {
+    description
+      "Latest revision diffserv based policy applied to a target";
+    reference "RFC XXXX";
+  }
+
+  identity direction {
+    description
+      "This is identity of traffic direction";
+  }
+
+  identity inbound {
+    base direction;
+    description
+      "Direction of traffic coming into the network entry";
+  }
+
+  identity outbound {
+    base direction;
+    description
+      "Direction of traffic going out of the network entry";
+  }
+
+  feature target-inline-policy-config {
+    description
+      "This feature allows the policy configuration 
+       directly under a target.";
+  }
+
+  grouping wred-stats {
+    description
+      "WRED Counters";
+    leaf early-drop-pkts {
+      type uint64;
+      description
+        "Early drop packets ";
+    }
+    leaf early-drop-bytes {
+      type uint64;
+      description
+        "Early drop bytes ";
+    }
+  }
+
+  grouping classifier-entry-stats {
+    description
+      "Classifier Counters";
+    container classifier-entry-statistics {
+      config false;
+      description
+        "
+         This group defines the classifier filter statistics of 
+         each classifier entry
+                
+        ";
+      leaf classified-pkts {
+        type uint64;
+        description
+          " Number of total packets which filtered
+            to the classifier-entry";
+      }
+      leaf classified-bytes {
+        type uint64;
+        description
+          " Number of total bytes which filtered 
+            to the classifier-entry";
+      }
+      leaf classified-rate {
+        type uint64;
+        units "bits-per-second";
+        description
+          " Rate of average data flow through the 
+            classifier-entry";
+      }
+    }
+  }
+
+  grouping queuing-stats {
+    description
+      "Queuing Counters";
+    container queuing-statistics {
+      description
+        "queue related statistics ";
+      leaf output-pkts {
+        type uint64;
+        description
+          "Number of packets transmitted from queue ";
+      }
+      leaf output-bytes {
+        type uint64;
+        description
+          "Number of bytes transmitted from queue ";
+      }
+      leaf queue-size-pkts {
+        type uint64;
+        description
+          "Number of packets currently buffered ";
+      }
+      leaf queue-size-bytes {
+        type uint64;
+        description
+          "Number of bytes currently buffered ";
+      }
+      leaf drop-pkts {
+        type uint64;
+        description
+          "Total number of packets dropped ";
+      }
+      leaf drop-bytes {
+        type uint64;
+        description
+          "Total number of bytes dropped ";
+      }
+      container wred-stats {
+        uses wred-stats;
+        description
+          "Container for WRED statistics";
+      }
+    }
+  }
+
+  grouping meter-stats {
+    description
+      "Metering Counters";
+    list meter-statistics {
+      key "meter-id";
+      description
+        "Meter statistics";
+      leaf meter-id {
+        type uint16;
+        description
+          "Meter Identifier";
+      }
+      leaf meter-succeed-pkts {
+        type uint64;
+        description
+          "Number of packets which succeed the meter";
+      }
+      leaf meter-succeed-bytes {
+        type uint64;
+        description
+          "Bytes of packets which succeed the meter";
+      }
+      leaf meter-failed-pkts {
+        type uint64;
+        description
+          "Number of packets which failed the meter";
+      }
+      leaf meter-failed-bytes {
+        type uint64;
+        description
+          "Bytes of packets which failed the meter";
+      }
+    }
+  }
+
+  augment "/if:interfaces/if:interface" {
+    description
+      "Augments Diffserv Target Entry to Interface module";
+    list diffserv-target-entry {
+      key "direction policy-name";
+      description
+        "policy target for inbound or outbound direction";
+      leaf direction {
+        type identityref {
+          base direction;
+        }
+        description
+          "Direction fo the traffic flow either inbound or outbound";
+      }
+      leaf policy-name {
+        type string;
+        description
+          "Policy entry name";
+      }
+    }
+  }
+
+  augment "/if:interfaces-state/if:interface" {
+    description
+      "Augments Diffserv Target Entry to Interface module";
+    list diffserv-target-entry {
+      key "direction policy-name";
+      description
+        "policy target for inbound or outbound direction";
+      leaf direction {
+        type identityref {
+          base direction;
+        }
+        description
+          "Direction fo the traffic flow either inbound or outbound";
+      }
+      leaf policy-name {
+        type string;
+        description
+          "Policy entry name";
+      }
+      list diffserv-target-classifier-statistics {
+        key "classifier-entry-name parent-path";
+        description
+          "Statistics for each Classifier Entry in a Policy";
+        leaf classifier-entry-name {
+          type string;
+          description
+            "Classifier Entry Name";
+        }
+        leaf parent-path {
+          type string;
+          description
+            "Path of the Classifier Entry in a hierarchial policy ";
+        }
+        uses classifier-entry-stats;
+        uses meter-stats;
+        uses queuing-stats;
+      }
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-event-notifications.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-event-notifications.yang
new file mode 100644
index 000000000..fa4ba123d
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-event-notifications.yang
@@ -0,0 +1,939 @@
+   module ietf-event-notifications {
+     namespace
+       "urn:ietf:params:xml:ns:yang:ietf-event-notifications";
+
+     prefix notif-bis;
+
+     import ietf-yang-types {
+       prefix yang;
+     }
+     import ietf-inet-types {
+       prefix inet;
+     }
+     import ietf-interfaces {
+       prefix if;
+     }
+
+     organization "IETF";
+     contact
+       "WG Web:   &lt;http://tools.ietf.org/wg/netconf/&gt;
+        WG List:  &lt;mailto:netconf@ietf.org&gt;
+
+        WG Chair: Mahesh Jethanandani
+                  &lt;mailto:mjethanandani@gmail.com&gt;
+
+        WG Chair: Mehmet Ersue
+                  &lt;mailto:mehmet.ersue@nokia.com&gt;
+        Editor:   Alexander Clemm
+                  &lt;mailto:alex@sympotech.com&gt;
+
+        Editor:   Alberto Gonzalez Prieto
+                  &lt;mailto:albertgo@cisco.com&gt;
+
+        Editor:   Eric Voit
+                  &lt;mailto:evoit@cisco.com&gt;
+
+        Editor:   Einar Nilsen-Nygaard
+                  &lt;mailto:einarnn@cisco.com&gt;
+
+        Editor:   Ambika Prasad Tripathy
+                  &lt;mailto:ambtripa@cisco.com&gt;
+
+        Editor:   Sharon Chisholm
+                  &lt;mailto:schishol@ciena.com&gt;
+
+        Editor:   Hector Trevino
+                  &lt;mailto:htrevino@cisco.com";
+
+     description
+       "This module contains conceptual YANG specifications
+        for NETCONF Event Notifications.";
+
+     revision 2016-10-27 {
+       description
+         "Tweaks to remove two notifications,
+             RPC for create subscription refined with stream default,
+             new grouping to eliminate some dymanically modifiable
+             parameters in modifiy subscription RPC";
+       reference
+         "draft-ietf-netconf-rfc5277bis-01";
+     }
+
+     /*
+      * FEATURES
+      */
+
+     feature json {
+       description
+         "This feature indicates that JSON encoding of notifications
+          is supported.";
+     }
+
+     feature configured-subscriptions {
+       description
+         "This feature indicates that management plane configuration
+          of subscription is supported.";
+     }
+
+     /*
+      * EXTENSIONS
+      */
+
+     extension control-plane-notif {
+       description
+         "This statement applies only to notifications.
+          It indicates that the notification is a control-plane
+          notification (aka OAM notification). Therefore it does
+          not participate in a regular event stream and does not
+          need to be specifically subscribed to.";
+     }
+
+     /*
+      * IDENTITIES
+      */
+
+      /* Identities for streams */
+      identity stream {
+       description
+         "Base identity to represent a generic stream of event
+          notifications.";
+     }
+
+     identity NETCONF {
+       base stream;
+       description
+         "Default NETCONF event stream, containing events based on
+          notifications defined as YANG modules that are supported
+          by the system.";
+     }
+
+     /* Identities for subscription results */
+     identity subscription-result {
+       description
+         "Base identity for RPC responses to requests surrounding
+          management (e.g. creation, modification, deletion) of
+          subscriptions.";
+     }
+
+     identity ok {
+       base subscription-result;
+       description
+         "OK - RPC was successful and was performed as requested.";
+     }
+
+     identity error {
+       base subscription-result;
+       description
+         "RPC was not successful.
+          Base identity for error return codes.";
+     }
+
+     identity error-no-such-subscription {
+       base error;
+       description
+         "A subscription with the requested subscription ID
+          does not exist.";
+     }
+
+     identity error-no-such-option {
+       base error;
+       description
+         "A requested parameter setting is not supported.";
+     }
+
+     identity error-insufficient-resources {
+       base error;
+       description
+         "The publisher has insufficient resources to support the
+          subscription as requested.";
+     }
+
+     identity error-configured-subscription {
+       base error;
+       description
+         "Cannot apply RPC to a configured subscription, i.e.
+          to a subscription that was not established via RPC.";
+     }
+
+     identity error-other {
+       base error;
+       description
+         "An unspecified error has occurred (catch all).";
+     }
+
+     /* Identities for subscription stream status */
+     identity subscription-stream-status {
+       description
+         "Base identity for the status of subscriptions and
+          datastreams.";
+     }
+     identity active {
+       base subscription-stream-status;
+       description
+         "Status is active and healthy.";
+     }
+
+     identity inactive {
+       base subscription-stream-status;
+       description
+         "Status is inactive, for example outside the
+          interval between start time and stop time.";
+     }
+
+     identity suspended {
+       base subscription-stream-status;
+       description
+         "The status is suspended, meaning that the publisher
+          is currently unable to provide the negotiated updates
+          for the subscription.";
+     }
+
+     identity in-error {
+       base subscription-stream-status;
+       description
+         "The status is in error or degraded, meaning that
+          stream and/or subscription is currently unable to provide
+          the negotiated notifications.";
+     }
+
+     /* Identities for subscription errors */
+     identity subscription-errors {
+       description
+         "Base identity for subscription error status.
+          This identity is not to be confused with error return
+          codes for RPCs";
+     }
+
+     identity internal-error {
+       base subscription-errors;
+       description
+         "Subscription failures caused by server internal error.";
+     }
+
+     identity no-resources {
+       base subscription-errors;
+       description
+         "Lack of resources, e.g. CPU, memory, bandwidth";
+     }
+     identity subscription-deleted {
+       base subscription-errors;
+       description
+         "The subscription was terminated because the subscription
+          was deleted.";
+     }
+
+     identity other {
+       base subscription-errors;
+       description
+         "Fallback reason - any other reason";
+     }
+
+     /* Identities for encodings */
+     identity encodings {
+       description
+         "Base identity to represent data encodings";
+     }
+
+     identity encode-xml {
+       base encodings;
+       description
+         "Encode data using XML";
+     }
+
+     identity encode-json {
+       base encodings;
+       description
+         "Encode data using JSON";
+     }
+
+     /* Identities for transports */
+     identity transport {
+       description
+         "An identity that represents a transport protocol for
+          event notifications";
+     }
+
+     identity netconf {
+       base transport;
+       description
+         "Netconf notifications as a transport.";
+     }
+
+     /*
+      * TYPEDEFs
+      */
+     typedef subscription-id {
+       type uint32;
+       description
+         "A type for subscription identifiers.";
+     }
+
+     typedef filter-id {
+       type uint32;
+       description
+         "A type to identify filters which can be associated with a
+          subscription.";
+     }
+
+     typedef subscription-result {
+       type identityref {
+         base subscription-result;
+       }
+       description
+         "The result of a subscription operation";
+     }
+
+     typedef subscription-term-reason {
+       type identityref {
+         base subscription-errors;
+       }
+       description
+         "Reason for a publisher to terminate a subscription.";
+     }
+
+     typedef subscription-susp-reason {
+       type identityref {
+         base subscription-errors;
+       }
+       description
+         "Reason for a publisher to suspend a subscription.";
+     }
+
+     typedef encoding {
+       type identityref {
+         base encodings;
+       }
+       description
+         "Specifies a data encoding, e.g. for a data subscription.";
+     }
+
+     typedef subscription-status {
+       type identityref {
+         base subscription-stream-status;
+       }
+       description
+         "Specifies the status of a subscription or datastream.";
+     }
+
+     typedef transport-protocol {
+       type identityref {
+         base transport;
+       }
+       description
+         "Specifies transport protocol used to send notifications to a
+          receiver.";
+     }
+
+     typedef push-source {
+       type enumeration {
+         enum "interface-originated" {
+           description
+             "Notifications will be sent from a specific interface on
+              a publisher";
+         }
+         enum "address-originated" {
+           description
+             "Notifications will be sent from a specific address on a
+              publisher";
+         }
+       }
+       description
+         "Specifies from where notifications will be sourced when
+          being sent by the publisher.";
+     }
+
+     typedef stream {
+       type identityref {
+         base stream;
+       }
+       description
+         "Specifies a system-provided datastream.";
+     }
+
+     typedef filter-ref {
+       type leafref {
+         path "/notif-bis:filters/notif-bis:filter/notif-bis:filter-id";
+       }
+       description
+         "This type is used to reference a filter.";
+     }
+     /*
+      * GROUPINGS
+      */
+
+     grouping base-filter {
+       description
+         "This grouping defines the base for filters for
+          notification events.
+          It includes the filter defined in 5277 and
+          it enables extending filtering to other
+          types of filters";
+       choice filter-type {
+         description
+           "A filter needs to be a single filter of a given type.
+            Mixing and matching of multiple filters does not occur
+            at the level of this grouping.";
+         case rfc5277 {
+           anyxml filter {
+             description
+               "Filter per RFC 5277. Notification filter.
+               If a filter element is specified to look for data of a
+               particular value, and the data item is not present
+               within a particular event notification for its value to
+               be checked against, the notification will be filtered
+               out. For example, if one were to check for
+               'severity=critical' in a configuration event
+               notification where this field was not supported, then
+               the notification would be filtered out. For subtree
+               filtering, a non-empty node set means that the filter
+               matches.  For XPath filtering, the mechanisms defined
+               in [XPATH] should be used to convert the returned
+               value to boolean.";
+           }
+         }
+       }
+     }
+
+     grouping subscription-info-basic-non-modifiable {
+       description
+         "This grouping describes the information in a basic
+          subscription request.";
+       leaf stream {
+         type stream;
+         description
+           "Indicates which stream of events is of interest.
+            If not present, events in the default NETCONF stream
+            will be sent.";
+       }
+           leaf encoding {
+         type encoding;
+         default "encode-xml";
+         description
+           "The type of encoding for the subscribed data.
+            Default is XML";
+       }
+     }
+
+     grouping subscription-info-basic-modifiable {
+       description
+         "This grouping describes some objects which may be changed
+             in a subscription via an RPC.";
+       uses base-filter;
+       leaf startTime {
+         type yang:date-and-time;
+         description
+           "Used to trigger the replay feature
+            and indicate that the replay should start at the time
+            specified.  If <startTime> is not present, this is not a
+            replay subscription.  It is not valid to specify start
+            times that are later than the current time.  If the
+            <startTime> specified is earlier than the log can support,
+            the replay will begin with the earliest available
+            notification.  This parameter is of type dateTime and
+            compliant to [RFC3339].  Implementations must
+            support time zones.";
+       }
+       leaf stopTime {
+         type yang:date-and-time;
+         must "current()  > ../startTime" {
+           description
+             "stopTime must be used with and be later than <startTime>";
+         }
+         description
+           "Used with the optional replay feature to indicate the
+            newest notifications of interest.  If <stopTime> is
+            not present, the notifications will continue until the
+            subscription is terminated.  Must be used with and be
+            later than <startTime>.  Values of <stopTime> in the
+            future are valid.  This parameter is of type dateTime and
+            compliant to [RFC3339].  Implementations must support time
+            zones.";
+       }
+     }
+
+     grouping subscription-info-all-modifiable {
+       description
+         "This grouping describes all rpc modifiable objects in a
+          subscription.";
+       uses subscription-info-basic-modifiable {
+         augment "filter-type" {
+           description
+             "Post-5277 subscriptions allow references to existing
+              filters";
+           case by-reference {
+             description
+               "Incorporate a filter that has been configured
+                separately.";
+             leaf filter-ref {
+               type filter-ref;
+               description
+                 "References filter which is associated with the
+                  subscription.";
+             }
+           }
+         }
+       }
+     }
+
+     grouping subscription-info {
+       description
+         "This grouping describes information concerning a
+          subscription.";
+           uses subscription-info-basic-non-modifiable;
+           uses subscription-info-all-modifiable;
+     }
+
+     grouping push-source-info {
+       description
+         "Defines the sender source from which notifications
+          for a configured subscription are sent.";
+       choice push-source {
+         description
+           "Identifies the egress interface on the Publisher from
+            which notifications will or are being sent.";
+         case interface-originated {
+           description
+             "When the push source is out of an interface on the
+              Publisher established via static configuration.";
+           leaf source-interface {
+             type if:interface-ref;
+             description
+               "References the interface for notifications.";
+           }
+         }
+         case address-originated {
+           description
+             "When the push source is out of an IP address on the
+              Publisher established via static configuration.";
+           leaf source-vrf {
+             type uint32 {
+               range "16..1048574";
+             }
+             description
+               "Label of the vrf.";
+           }
+           leaf source-address {
+             type inet:ip-address-no-zone;
+             mandatory true;
+             description
+               "The source address for the notifications.";
+           }
+         }
+       }
+     }
+
+     grouping receiver-info {
+       description
+         "Defines where and how to deliver notifications for a
+          configured subscription.  This includes
+          specifying the receiver, as well as defining
+          any network and transport aspects when sending of
+          notifications occurs outside of Netconf.";
+       container receivers {
+         description
+           "Set of receivers in a subscription.";
+         list receiver {
+           key "address";
+           min-elements 1;
+           description
+             "A single host or multipoint address intended as a target
+              for the notifications for a subscription.";
+           leaf address {
+             type inet:host;
+             mandatory true;
+             description
+               "Specifies the address for the traffic to reach a
+                remote host. One of the following must be
+                specified: an ipv4 address, an ipv6 address,
+                or a host name.";
+           }
+           leaf port {
+             type inet:port-number;
+             mandatory true;
+             description
+               "This leaf specifies the port number to use for
+                messages destined for a receiver.";
+           }
+           leaf protocol {
+             type transport-protocol;
+             default "netconf";
+             description
+               "This leaf specifies the transport protocol used
+                to deliver messages destined for the receiver.";
+           }
+         }
+       }
+     }
+
+     grouping subscription-response {
+       description
+         "Defines the output to the rpc's establish-subscription
+          and modify-subscription.";
+       leaf subscription-result {
+         type subscription-result;
+         mandatory true;
+         description
+           "Indicates whether subscription is operational,
+            or if a problem was encountered.";
+       }
+       choice result {
+         description
+           "Depending on the subscription result, different
+            data is returned.";
+         case success {
+           description
+             "This case is used when the subscription request
+              was successful and a subscription was created/modified
+              as a result";
+           leaf subscription-id {
+             type subscription-id;
+             mandatory true;
+             description
+               "Identifier used for this subscription.";
+           }
+         }
+         case no-success {
+           description
+             "This case applies when a subscription request
+              was not successful and no subscription was
+              created (or modified) as a result.  In this case,
+              information MAY be returned that indicates
+              suggested parameter settings that would have a
+              high likelihood of succeeding in a subsequent
+              establish-subscription or modify-subscription
+              request.";
+           uses subscription-info;
+         }
+       }
+     }
+
+     /*
+      * RPCs
+      */
+
+     rpc establish-subscription {
+       description
+         "This RPC allows a subscriber to create
+          (and possibly negotiate) a subscription on its own behalf.
+          If successful, the subscription
+          remains in effect for the duration of the subscriber's
+          association with the publisher, or until the subscription
+          is terminated by virtue of a delete-subscription request.
+          In case an error (as indicated by subscription-result)
+          is returned, the subscription is
+          not created.  In that case, the RPC output
+          MAY include suggested parameter settings
+          that would have a high likelihood of succeeding in a
+          subsequent establish-subscription request.";
+       input {
+         uses subscription-info;
+       }
+       output {
+         uses subscription-response;
+       }
+     }
+
+     rpc create-subscription {
+       description
+         "This operation initiates an event notification subscription
+          that will send asynchronous event notifications to the
+          initiator of the command until the association terminates.
+          It is not possible to modify or delete a subscription
+          that was created using this operation.  It is included for
+          reasons of backward compatibility with RFC 5277
+          implementations.";
+       input {
+         uses subscription-info-basic-non-modifiable{
+               refine "stream" {
+                      default "NETCONF";
+                   }
+             }
+             uses subscription-info-basic-modifiable;
+           }
+     }
+
+     rpc modify-subscription {
+       description
+         "This RPC allows a subscriber to modify a subscription
+          that was previously created using establish-subscription.
+          If successful, the subscription
+          remains in effect for the duration of the subscriber's
+          association with the publisher, or until the subscription
+          is terminated by virtue of a delete-subscription request.
+          In case an error is returned (as indicated by
+          subscription-result), the subscription is
+          not modified and the original subscription parameters
+          remain in effect.  In that case, the rpc error response
+          MAY include suggested parameter settings
+          that would have a high likelihood of succeeding in a
+          subsequent modify-subscription request.";
+       input {
+         leaf subscription-id {
+           type subscription-id;
+           description
+             "Identifier to use for this subscription.";
+         }
+         uses subscription-info-all-modifiable;
+       }
+       output {
+         uses subscription-response;
+       }
+     }
+
+     rpc delete-subscription {
+       description
+         "This RPC allows a subscriber to delete a subscription that
+          was previously created using establish-subscription.";
+       input {
+         leaf subscription-id {
+           type subscription-id;
+           mandatory true;
+           description
+             "Identifier of the subscription that is to be deleted.
+              Only subscriptions that were created using
+              establish-subscription can be deleted via this RPC.";
+         }
+       }
+       output {
+         leaf subscription-result {
+           type subscription-result;
+           mandatory true;
+           description
+             "Indicates whether subscription is operational,
+              or if a problem was encountered.";
+         }
+       }
+     }
+
+     /*
+      * NOTIFICATIONS
+      */
+
+     notification replay-complete {
+       notif-bis:control-plane-notif;
+       description
+         "This notification is sent to indicate that all of the
+          replay notifications have been sent. It must not be
+          sent for any other reason.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+     }
+
+     notification notification-complete {
+       notif-bis:control-plane-notif;
+       description
+         "This notification is sent to indicate that a
+          subscription, which includes a stop time, has
+          finished passing events.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+     }
+
+     notification subscription-started {
+       notif-bis:control-plane-notif;
+       description
+         "This notification indicates that a subscription has
+          started and notifications are beginning to be sent.
+          This notification shall only be sent to receivers
+          of a subscription; it does not constitute a general-purpose
+          notification.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+       uses subscription-info;
+     }
+
+     notification subscription-suspended {
+       notif-bis:control-plane-notif;
+       description
+         "This notification indicates that a suspension of the
+          subscription by the publisher has occurred.  No further
+          notifications will be sent until subscription
+          resumes.
+          This notification shall only be sent to receivers
+          of a subscription; it does not constitute a general-purpose
+          notification.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+       leaf reason {
+         type subscription-susp-reason;
+         description
+           "Provides a reason for why the subscription was
+            suspended.";
+       }
+     }
+
+     notification subscription-resumed {
+       notif-bis:control-plane-notif;
+       description
+         "This notification indicates that a subscription that had
+          previously been suspended has resumed. Notifications
+          will once again be sent.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+     }
+
+     notification subscription-modified {
+       notif-bis:control-plane-notif;
+       description
+         "This notification indicates that a subscription has
+          been modified.  Notifications sent from this point
+          on will conform to the modified terms of the
+          subscription.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+       uses subscription-info;
+     }
+
+     notification subscription-terminated {
+       notif-bis:control-plane-notif;
+       description
+         "This notification indicates that a subscription has been
+          terminated.";
+       leaf subscription-id {
+         type subscription-id;
+         mandatory true;
+         description
+           "This references the affected subscription.";
+       }
+       leaf reason {
+         type subscription-term-reason;
+         description
+           "Provides a reason for why the subscription was
+            terminated.";
+       }
+     }
+
+     /*
+      * DATA NODES
+      */
+
+     container streams {
+       config false;
+       description
+         "This container contains a leaf list of built-in
+          streams that are provided by the system.";
+       leaf-list stream {
+         type stream;
+         description
+           "Identifies the built-in streams that are supported by the
+            system.  Built-in streams are associated with their own
+            identities, each of which carries a special semantics.
+            In case configurable custom streams are supported,
+            as indicated by the custom-stream identity, the
+            configuration of those custom streams is provided
+                    separately.";
+       }
+     }
+     container filters {
+       description
+         "This container contains a list of configurable filters
+          that can be applied to subscriptions.  This facilitates
+          the reuse of complex filters once defined.";
+       list filter {
+         key "filter-id";
+         description
+           "A list of configurable filters that can be applied to
+            subscriptions.";
+         leaf filter-id {
+           type filter-id;
+           description
+             "An identifier to differentiate between filters.";
+         }
+         uses base-filter;
+       }
+     }
+     container subscription-config {
+       if-feature "configured-subscriptions";
+       description
+         "Contains the list of subscriptions that are configured,
+          as opposed to established via RPC or other means.";
+       list subscription {
+         key "subscription-id";
+         description
+           "Content of a subscription.";
+         leaf subscription-id {
+           type subscription-id;
+           description
+             "Identifier to use for this subscription.";
+         }
+         uses subscription-info;
+         uses receiver-info {
+           if-feature "configured-subscriptions";
+         }
+         uses push-source-info {
+           if-feature "configured-subscriptions";
+         }
+       }
+     }
+     container subscriptions {
+       config false;
+       description
+         "Contains the list of currently active subscriptions,
+          i.e. subscriptions that are currently in effect,
+          used for subscription management and monitoring purposes.
+          This includes subscriptions that have been setup via RPC
+          primitives, e.g. create-subscription, establish-
+          subscription, and modify-subscription, as well as
+          subscriptions that have been established via
+              configuration.";
+       list subscription {
+         key "subscription-id";
+         config false;
+         description
+           "Content of a subscription.
+            Subscriptions can be created using a control channel
+            or RPC, or be established through configuration.";
+         leaf subscription-id {
+           type subscription-id;
+           description
+             "Identifier of this subscription.";
+         }
+
+         leaf configured-subscription {
+          if-feature "configured-subscriptions";
+          type empty;
+          description
+            "The presence of this leaf indicates that the
+             subscription originated from configuration, not
+             through a control channel or RPC.";
+         }
+
+         leaf subscription-status {
+           type subscription-status;
+           description
+             "The status of the subscription.";
+         }
+         uses subscription-info;
+         uses receiver-info {
+           if-feature "configured-subscriptions";
+         }
+         uses push-source-info {
+           if-feature "configured-subscriptions";
+         }
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/cisco-iosxr/ietf-inet-types.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-inet-types.yang
similarity index 99%
rename from profiles/bundles/yang/cisco-iosxr/ietf-inet-types.yang
rename to profiles/bundles/yang/ietf/0.1.3/ietf-inet-types.yang
index 2f14270de..5388b0393 100644
--- a/profiles/bundles/yang/cisco-iosxr/ietf-inet-types.yang
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-inet-types.yang
@@ -234,6 +234,8 @@ module ietf-inet-types {
       interface.  If the zone index is not present, the default
       zone of the device will be used.
 
+
+
       The canonical format of IPv6 addresses uses the textual
       representation defined in Section 4 of RFC 5952.  The
       canonical format for the zone index is the numerical
@@ -328,6 +330,8 @@ module ietf-inet-types {
             + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
             + '(/.+)';
     }
+
+
     description
      "The ipv6-prefix type represents an IPv6 address prefix.
       The prefix length is given by the number following the
@@ -353,11 +357,11 @@ module ietf-inet-types {
 
   typedef domain-name {
     type string {
-      length "1..253";
       pattern
         '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
       + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
       + '|\.';
+      length "1..253";
     }
     description
      "The domain-name type represents a DNS domain name.  The
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-interfaces-ext.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-interfaces-ext.yang
new file mode 100644
index 000000000..3f50b9341
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-interfaces-ext.yang
@@ -0,0 +1,48 @@
+module ietf-interfaces-ext {
+
+	namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces-ext";
+	prefix if-ext;
+	import ietf-yang-types {
+		prefix yang;
+	}
+	 import ietf-interfaces {
+		prefix if;
+	 } 
+	organization
+		"IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+	contact
+		"WG Web:   <http://tools.ietf.org/wg/netmod/>
+		WG List:  <mailto:netmod@ietf.org>
+
+		WG Chair: David Kessens
+		<mailto:david.kessens@nsn.com>
+
+		WG Chair: Juergen Schoenwaelder
+		<mailto:j.schoenwaelder@jacobs-university.de>
+
+
+		Editor:   Martin Bjorklund
+		<mailto:mbj@tail-f.com>";
+	description
+		"augments needed for IOS-XE platform show interface command";
+	
+	augment "/if:interfaces-state/if:interface/if:statistics" {
+		description
+		"this adds a leaf called total input packets as we have no way of doing arithmetic in RPL";
+
+		leaf in-pkts {
+			type yang:counter64;
+			description
+				"total packets input";
+		}
+
+		leaf out-pkts {
+			type yang:counter64;
+			description
+				"total packets output";
+		}
+	}
+}
+
+
diff --git a/profiles/bundles/yang/cisco-iosxr/ietf-interfaces.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-interfaces.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-iosxr/ietf-interfaces.yang
rename to profiles/bundles/yang/ietf/0.1.3/ietf-interfaces.yang
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-ip.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-ip.yang
new file mode 100644
index 000000000..f012728b9
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-ip.yang
@@ -0,0 +1,642 @@
+module ietf-ip {
+ namespace "urn:ietf:params:xml:ns:yang:ietf-ip";
+ prefix ip;
+ import ietf-interfaces {
+   prefix if;
+ }
+ import ietf-inet-types {
+   prefix inet;
+ }
+ import ietf-yang-types {
+   prefix yang;
+ }
+ organization
+   "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+ contact
+   "WG Web:   <http://tools.ietf.org/wg/netmod/>
+    WG List:  <mailto:netmod@ietf.org>
+    WG Chair: Thomas Nadeau
+              <mailto:tnadeau@lucidvision.com>
+    WG Chair: Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>
+    Editor:   Martin Bjorklund
+              <mailto:mbj@tail-f.com>";
+ description
+   "This module contains a collection of YANG definitions for
+    configuring IP implementations.
+    Copyright (c) 2014 IETF Trust and the persons identified as
+    authors of the code.  All rights reserved.
+    Redistribution and use in source and binary forms, with or
+    without modification, is permitted pursuant to, and subject
+    to the license terms contained in, the Simplified BSD License
+    set forth in Section 4.c of the IETF Trust's Legal Provisions
+    Relating to IETF Documents
+    (http://trustee.ietf.org/license-info).
+    This version of this YANG module is part of RFC 7277; see
+    the RFC itself for full legal notices.";
+ revision 2014-06-16 {
+   description
+     "Initial revision.";
+   reference
+     "RFC 7277: A YANG Data Model for IP Management";
+ }
+ /*
+  * Features
+  */
+ feature ipv4-non-contiguous-netmasks {
+   description
+     "Indicates support for configuring non-contiguous
+      subnet masks.";
+ }
+ feature ipv6-privacy-autoconf {
+   description
+     "Indicates support for Privacy Extensions for Stateless Address
+      Autoconfiguration in IPv6.";
+   reference
+     "RFC 4941: Privacy Extensions for Stateless Address
+                Autoconfiguration in IPv6";
+ }
+ /*
+  * Typedefs
+  */
+ typedef ip-address-origin {
+   type enumeration {
+     enum other {
+       description
+         "None of the following.";
+     }
+     enum static {
+       description
+         "Indicates that the address has been statically
+          configured - for example, using NETCONF or a Command Line
+          Interface.";
+     }
+     enum dhcp {
+       description
+         "Indicates an address that has been assigned to this
+          system by a DHCP server.";
+     }
+     enum link-layer {
+       description
+         "Indicates an address created by IPv6 stateless
+          autoconfiguration that embeds a link-layer address in its
+          interface identifier.";
+     }
+     enum random {
+       description
+         "Indicates an address chosen by the system at
+          random, e.g., an IPv4 address within 169.254/16, an
+          RFC 4941 temporary address, or an RFC 7217 semantically
+          opaque address.";
+       reference
+         "RFC 4941: Privacy Extensions for Stateless Address
+                    Autoconfiguration in IPv6
+          RFC 7217: A Method for Generating Semantically Opaque
+                    Interface Identifiers with IPv6 Stateless
+                    Address Autoconfiguration (SLAAC)";
+     }
+   }
+   description
+     "The origin of an address.";
+ }
+ typedef neighbor-origin {
+   type enumeration {
+     enum other {
+       description
+         "None of the following.";
+     }
+     enum static {
+       description
+         "Indicates that the mapping has been statically
+          configured - for example, using NETCONF or a Command Line
+          Interface.";
+     }
+     enum dynamic {
+       description
+         "Indicates that the mapping has been dynamically resolved
+          using, e.g., IPv4 ARP or the IPv6 Neighbor Discovery
+          protocol.";
+     }
+   }
+   description
+     "The origin of a neighbor entry.";
+ }
+ /*
+  * Configuration data nodes
+  */
+ augment "/if:interfaces/if:interface" {
+   description
+     "Parameters for configuring IP on interfaces.
+      If an interface is not capable of running IP, the server
+      must not allow the client to configure these parameters.";
+   container ipv4 {
+     presence
+       "Enables IPv4 unless the 'enabled' leaf
+        (which defaults to 'true') is set to 'false'";
+     description
+       "Parameters for the IPv4 address family.";
+     leaf enabled {
+       type boolean;
+       default true;
+       description
+         "Controls whether IPv4 is enabled or disabled on this
+          interface.  When IPv4 is enabled, this interface is
+          connected to an IPv4 stack, and the interface can send
+          and receive IPv4 packets.";
+     }
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Controls IPv4 packet forwarding of datagrams received by,
+          but not addressed to, this interface.  IPv4 routers
+          forward datagrams.  IPv4 hosts do not (except those
+          source-routed via the host).";
+     }
+     leaf mtu {
+       type uint16 {
+         range "68..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv4 packet that the
+          interface will send and receive.
+          The server may restrict the allowed values for this leaf,
+          depending on the interface's type.
+          If this leaf is not configured, the operationally used MTU
+          depends on the interface's type.";
+       reference
+         "RFC 791: Internet Protocol";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of configured IPv4 addresses on the interface.";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address on the interface.";
+       }
+       choice subnet {
+         mandatory true;
+         description
+           "The subnet can be specified as a prefix-length, or,
+            if the server supports non-contiguous netmasks, as
+            a netmask.";
+         leaf prefix-length {
+           type uint8 {
+             range "0..32";
+           }
+           description
+             "The length of the subnet prefix.";
+         }
+         leaf netmask {
+           if-feature ipv4-non-contiguous-netmasks;
+           type yang:dotted-quad;
+           description
+             "The subnet specified as a netmask.";
+         }
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv4 addresses to
+          link-layer addresses.
+          Entries in this list are used as static entries in the
+          ARP Cache.";
+       reference
+         "RFC 826: An Ethernet Address Resolution Protocol";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         mandatory true;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+     }
+   }
+   container ipv6 {
+     presence
+       "Enables IPv6 unless the 'enabled' leaf
+        (which defaults to 'true') is set to 'false'";
+     description
+       "Parameters for the IPv6 address family.";
+     leaf enabled {
+       type boolean;
+       default true;
+       description
+         "Controls whether IPv6 is enabled or disabled on this
+          interface.  When IPv6 is enabled, this interface is
+          connected to an IPv6 stack, and the interface can send
+          and receive IPv6 packets.";
+     }
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Controls IPv6 packet forwarding of datagrams received by,
+          but not addressed to, this interface.  IPv6 routers
+          forward datagrams.  IPv6 hosts do not (except those
+          source-routed via the host).";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                    Section 6.2.1, IsRouter";
+     }
+     leaf mtu {
+       type uint32 {
+         range "1280..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv6 packet that the
+          interface will send and receive.
+          The server may restrict the allowed values for this leaf,
+          depending on the interface's type.
+          If this leaf is not configured, the operationally used MTU
+          depends on the interface's type.";
+       reference
+         "RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
+                    Section 5";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of configured IPv6 addresses on the interface.";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address on the interface.";
+       }
+       leaf prefix-length {
+         type uint8 {
+           range "0..128";
+         }
+         mandatory true;
+         description
+           "The length of the subnet prefix.";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv6 addresses to
+          link-layer addresses.
+          Entries in this list are used as static entries in the
+          Neighbor Cache.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         mandatory true;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+     }
+     leaf dup-addr-detect-transmits {
+       type uint32;
+       default 1;
+       description
+         "The number of consecutive Neighbor Solicitation messages
+          sent while performing Duplicate Address Detection on a
+          tentative address.  A value of zero indicates that
+          Duplicate Address Detection is not performed on
+          tentative addresses.  A value of one indicates a single
+          transmission with no follow-up retransmissions.";
+       reference
+         "RFC 4862: IPv6 Stateless Address Autoconfiguration";
+     }
+     container autoconf {
+       description
+         "Parameters to control the autoconfiguration of IPv6
+          addresses, as described in RFC 4862.";
+       reference
+         "RFC 4862: IPv6 Stateless Address Autoconfiguration";
+       leaf create-global-addresses {
+         type boolean;
+         default true;
+         description
+           "If enabled, the host creates global addresses as
+            described in RFC 4862.";
+         reference
+           "RFC 4862: IPv6 Stateless Address Autoconfiguration
+                      Section 5.5";
+       }
+       leaf create-temporary-addresses {
+         if-feature ipv6-privacy-autoconf;
+         type boolean;
+         default false;
+         description
+           "If enabled, the host creates temporary addresses as
+            described in RFC 4941.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6";
+       }
+       leaf temporary-valid-lifetime {
+         if-feature ipv6-privacy-autoconf;
+         type uint32;
+         units "seconds";
+         default 604800;
+         description
+           "The time period during which the temporary address
+            is valid.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6
+                      - TEMP_VALID_LIFETIME";
+       }
+       leaf temporary-preferred-lifetime {
+         if-feature ipv6-privacy-autoconf;
+         type uint32;
+         units "seconds";
+         default 86400;
+         description
+           "The time period during which the temporary address is
+            preferred.";
+         reference
+           "RFC 4941: Privacy Extensions for Stateless Address
+                      Autoconfiguration in IPv6
+                      - TEMP_PREFERRED_LIFETIME";
+       }
+     }
+   }
+ }
+ /*
+  * Operational state data nodes
+  */
+ augment "/if:interfaces-state/if:interface" {
+   description
+     "Data nodes for the operational state of IP on interfaces.";
+   container ipv4 {
+     presence "Present if IPv4 is enabled on this interface";
+     config false;
+     description
+       "Interface-specific parameters for the IPv4 address family.";
+     leaf forwarding {
+       type boolean;
+       description
+         "Indicates whether IPv4 packet forwarding is enabled or
+          disabled on this interface.";
+     }
+     leaf mtu {
+       type uint16 {
+         range "68..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv4 packet that the
+          interface will send and receive.";
+       reference
+         "RFC 791: Internet Protocol";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of IPv4 addresses on the interface.";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address on the interface.";
+       }
+       choice subnet {
+         description
+           "The subnet can be specified as a prefix-length, or,
+            if the server supports non-contiguous netmasks, as
+            a netmask.";
+         leaf prefix-length {
+           type uint8 {
+             range "0..32";
+           }
+           description
+             "The length of the subnet prefix.";
+         }
+         leaf netmask {
+           if-feature ipv4-non-contiguous-netmasks;
+           type yang:dotted-quad;
+           description
+             "The subnet specified as a netmask.";
+         }
+       }
+       leaf origin {
+         type ip-address-origin;
+         description
+           "The origin of this address.";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv4 addresses to
+          link-layer addresses.
+          This list represents the ARP Cache.";
+       reference
+         "RFC 826: An Ethernet Address Resolution Protocol";
+       leaf ip {
+         type inet:ipv4-address-no-zone;
+         description
+           "The IPv4 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+       leaf origin {
+         type neighbor-origin;
+         description
+           "The origin of this neighbor entry.";
+       }
+     }
+   }
+   container ipv6 {
+     presence "Present if IPv6 is enabled on this interface";
+     config false;
+     description
+       "Parameters for the IPv6 address family.";
+     leaf forwarding {
+       type boolean;
+       default false;
+       description
+         "Indicates whether IPv6 packet forwarding is enabled or
+          disabled on this interface.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                    Section 6.2.1, IsRouter";
+     }
+     leaf mtu {
+       type uint32 {
+         range "1280..max";
+       }
+       units octets;
+       description
+         "The size, in octets, of the largest IPv6 packet that the
+          interface will send and receive.";
+       reference
+         "RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
+                    Section 5";
+     }
+     list address {
+       key "ip";
+       description
+         "The list of IPv6 addresses on the interface.";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address on the interface.";
+       }
+       leaf prefix-length {
+         type uint8 {
+           range "0..128";
+         }
+         mandatory true;
+         description
+           "The length of the subnet prefix.";
+       }
+       leaf origin {
+         type ip-address-origin;
+         description
+           "The origin of this address.";
+       }
+       leaf status {
+         type enumeration {
+           enum preferred {
+             description
+               "This is a valid address that can appear as the
+                destination or source address of a packet.";
+           }
+           enum deprecated {
+             description
+               "This is a valid but deprecated address that should
+                no longer be used as a source address in new
+                communications, but packets addressed to such an
+                address are processed as expected.";
+           }
+           enum invalid {
+             description
+               "This isn't a valid address, and it shouldn't appear
+                as the destination or source address of a packet.";
+           }
+           enum inaccessible {
+             description
+               "The address is not accessible because the interface
+                to which this address is assigned is not
+                operational.";
+           }
+           enum unknown {
+             description
+               "The status cannot be determined for some reason.";
+           }
+           enum tentative {
+             description
+               "The uniqueness of the address on the link is being
+                verified.  Addresses in this state should not be
+                used for general communication and should only be
+                used to determine the uniqueness of the address.";
+           }
+           enum duplicate {
+             description
+               "The address has been determined to be non-unique on
+                the link and so must not be used.";
+           }
+           enum optimistic {
+             description
+               "The address is available for use, subject to
+                restrictions, while its uniqueness on a link is
+                being verified.";
+           }
+         }
+         description
+           "The status of an address.  Most of the states correspond
+            to states from the IPv6 Stateless Address
+            Autoconfiguration protocol.";
+         reference
+           "RFC 4293: Management Information Base for the
+                      Internet Protocol (IP)
+                      - IpAddressStatusTC
+            RFC 4862: IPv6 Stateless Address Autoconfiguration";
+       }
+     }
+     list neighbor {
+       key "ip";
+       description
+         "A list of mappings from IPv6 addresses to
+          link-layer addresses.
+          This list represents the Neighbor Cache.";
+       reference
+         "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)";
+       leaf ip {
+         type inet:ipv6-address-no-zone;
+         description
+           "The IPv6 address of the neighbor node.";
+       }
+       leaf link-layer-address {
+         type yang:phys-address;
+         description
+           "The link-layer address of the neighbor node.";
+       }
+       leaf origin {
+         type neighbor-origin;
+         description
+           "The origin of this neighbor entry.";
+       }
+       leaf is-router {
+         type empty;
+         description
+           "Indicates that the neighbor node acts as a router.";
+       }
+       leaf state {
+         type enumeration {
+           enum incomplete {
+             description
+               "Address resolution is in progress, and the link-layer
+                address of the neighbor has not yet been
+                determined.";
+           }
+           enum reachable {
+             description
+               "Roughly speaking, the neighbor is known to have been
+                reachable recently (within tens of seconds ago).";
+           }
+           enum stale {
+             description
+               "The neighbor is no longer known to be reachable, but
+                until traffic is sent to the neighbor no attempt
+                should be made to verify its reachability.";
+           }
+           enum delay {
+             description
+               "The neighbor is no longer known to be reachable, and
+                traffic has recently been sent to the neighbor.
+                Rather than probe the neighbor immediately, however,
+                delay sending probes for a short while in order to
+                give upper-layer protocols a chance to provide
+                reachability confirmation.";
+           }
+           enum probe {
+             description
+               "The neighbor is no longer known to be reachable, and
+                unicast Neighbor Solicitation probes are being sent
+                to verify reachability.";
+           }
+         }
+         description
+           "The Neighbor Unreachability Detection state of this
+            entry.";
+         reference
+           "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)
+                      Section 7.3.2";
+       }
+     }
+   }
+ }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-ipv4-unicast-routing.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-ipv4-unicast-routing.yang
new file mode 100644
index 000000000..b0ae65ae1
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-ipv4-unicast-routing.yang
@@ -0,0 +1,194 @@
+   module ietf-ipv4-unicast-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing";
+
+     prefix "v4ur";
+
+     import ietf-routing {
+       prefix "rt";
+     }
+
+     import ietf-inet-types {
+       prefix "inet";
+     }
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module augments the 'ietf-routing' module with basic
+        configuration and state data for IPv4 unicast routing.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Identities */
+     identity ipv4-unicast {
+       base rt:ipv4;
+       description
+         "This identity represents the IPv4 unicast address family.";
+     }
+
+     /* State data */
+
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route" {
+       when "../../rt:address-family = 'v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments an IPv4 unicast route.";
+       leaf destination-prefix {
+         type inet:ipv4-prefix;
+         description
+           "IPv4 destination prefix.";
+       }
+     }*/
+
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route/rt:next-hop/rt:next-hop-options/"
+           + "rt:simple-next-hop" {
+       when "../../../rt:address-family = 'v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case of IPv4 unicast
+          routes.";
+       leaf next-hop-address {
+         type inet:ipv4-address;
+         description
+           "IPv4 address of the next-hop.";
+       }
+     }*/
+
+     /* Configuration data */
+
+     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+           + "rt:routing-protocol/rt:static-routes" {
+       description
+         "This augment defines the configuration of the 'static'
+          pseudo-protocol with data specific to IPv4 unicast.";
+       container ipv4 {
+         description
+           "Configuration of a 'static' pseudo-protocol instance
+            consists of a list of routes.";
+         list route {
+           key "destination-prefix";
+           ordered-by "user";
+           description
+             "A user-ordered list of static routes.";
+           leaf destination-prefix {
+             type inet:ipv4-prefix;
+             mandatory "true";
+             description
+               "IPv4 destination prefix.";
+           }
+           leaf description {
+             type string;
+             description
+               "Textual description of the route.";
+           }
+           container next-hop {
+             description
+               "Configuration of next-hop.";
+             uses rt:next-hop-content {
+               augment "next-hop-options" {
+                 description
+                   "Add next-hop address case.";
+                 leaf next-hop-address {
+                   type inet:ipv4-address;
+                   description
+                     "IPv4 address of the next-hop.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     augment "/rt:fib-route/rt:input/rt:destination-address" {
+       when "rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'rt:destination-address' parameter of
+          the 'rt:fib-route' operation.";
+       leaf address {
+         type inet:ipv4-address;
+         description
+           "IPv4 destination address.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route" {
+       when "rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the reply to the 'rt:fib-route'
+          operation.";
+       leaf destination-prefix {
+         type inet:ipv4-prefix;
+         description
+           "IPv4 destination prefix.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
+           + "rt:next-hop-options/rt:simple-next-hop" {
+       when "../rt:address-family='v4ur:ipv4-unicast'" {
+         description
+           "This augment is valid only for IPv4 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case in the reply to
+          the 'rt:fib-route' operation.";
+       leaf next-hop-address {
+         type inet:ipv4-address;
+         description
+           "IPv4 address of the next-hop.";
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-ipv6-unicast-routing.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-ipv6-unicast-routing.yang
new file mode 100644
index 000000000..d03a237c0
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-ipv6-unicast-routing.yang
@@ -0,0 +1,596 @@
+   module ietf-ipv6-unicast-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing";
+
+     prefix "v6ur";
+
+     import ietf-routing {
+       prefix "rt";
+     }
+
+     import ietf-inet-types {
+       prefix "inet";
+     }
+
+     import ietf-interfaces {
+       prefix "if";
+     }
+
+     import ietf-ip {
+       prefix "ip";
+     }
+
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module augments the 'ietf-routing' module with basic
+        configuration and state data for IPv6 unicast routing.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Identities */
+
+     identity ipv6-unicast {
+       base rt:ipv6;
+       description
+         "This identity represents the IPv6 unicast address family.";
+     }
+
+     /* State data */
+/*  Oper data not available causes REST interface timeout Mark Collins 11.5.15
+     augment "/if:interfaces-state/if:interface/ip:ipv6" {
+       description
+         "Augment interface state data with IPv6-specific parameters of
+          router interfaces.";
+       container ipv6-router-advertisements {
+         description
+           "Parameters of IPv6 Router Advertisements.";
+         leaf send-advertisements {
+           type boolean;
+           description
+             "A flag indicating whether or not the router sends periodic
+              Router Advertisements and responds to Router
+              Solicitations.";
+         }
+         leaf max-rtr-adv-interval {
+           type uint16 {
+             range "4..1800";
+           }
+           units "seconds";
+           description
+             "The maximum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+         }
+         leaf min-rtr-adv-interval {
+           type uint16 {
+             range "3..1350";
+           }
+           units "seconds";
+           description
+             "The minimum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+         }
+         leaf managed-flag {
+           type boolean;
+           description
+             "The value that is placed in the 'Managed address
+              configuration' flag field in the Router Advertisement.";
+         }
+         leaf other-config-flag {
+           type boolean;
+           description
+             "The value that is placed in the 'Other configuration' flag
+              field in the Router Advertisement.";
+         }
+         leaf link-mtu {
+           type uint32;
+           description
+             "The value that is placed in MTU options sent by the
+              router. A value of zero indicates that no MTU options are
+              sent.";
+         }
+         leaf reachable-time {
+           type uint32 {
+             range "0..3600000";
+           }
+           units "milliseconds";
+           description
+             "The value that is placed in the Reachable Time field in
+              the Router Advertisement messages sent by the router. A
+              value of zero means unspecified (by this router).";
+         }
+         leaf retrans-timer {
+           type uint32;
+           units "milliseconds";
+           description
+             "The value that is placed in the Retrans Timer field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+         }
+         leaf cur-hop-limit {
+           type uint8;
+           description
+             "The value that is placed in the Cur Hop Limit field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+         }
+         leaf default-lifetime {
+           type uint16 {
+             range "0..9000";
+           }
+           units "seconds";
+           description
+             "The value that is placed in the Router Lifetime field of
+              Router Advertisements sent from the interface, in seconds.
+              A value of zero indicates that the router is not to be
+              used as a default router.";
+         }
+         container prefix-list {
+           description
+             "A list of prefixes that are placed in Prefix Information
+              options in Router Advertisement messages sent from the
+              interface.
+
+              By default, these are all prefixes that the router
+              advertises via routing protocols as being on-link for the
+              interface from which the advertisement is sent.";
+           list prefix {
+             key "prefix-spec";
+             description
+               "Advertised prefix entry and its parameters.";
+             leaf prefix-spec {
+               type inet:ipv6-prefix;
+               description
+                 "IPv6 address prefix.";
+             }
+             leaf valid-lifetime {
+               type uint32;
+               units "seconds";
+               description
+                 "The value that is placed in the Valid Lifetime in the
+                  Prefix Information option. The designated value of all
+                  1's (0xffffffff) represents infinity.
+
+                  An implementation SHOULD keep this value constant in
+                  consecutive advertisements except when it is
+                  explicitly changed in configuration.";
+             }
+             leaf on-link-flag {
+               type boolean;
+               description
+                 "The value that is placed in the on-link flag ('L-bit')
+                  field in the Prefix Information option.";
+             }
+             leaf preferred-lifetime {
+               type uint32;
+               units "seconds";
+               description
+                 "The value that is placed in the Preferred Lifetime in
+                  the Prefix Information option, in seconds. The
+                  designated value of all 1's (0xffffffff) represents
+                  infinity.
+
+                  An implementation SHOULD keep this value constant in
+                  consecutive advertisements except when it is
+                  explicitly changed in configuration.";
+             }
+             leaf autonomous-flag {
+               type boolean;
+               description
+                 "The value that is placed in the Autonomous Flag field
+                  in the Prefix Information option.";
+             }
+           }
+         }
+       }
+     }
+*/
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route" {
+       when "../../rt:address-family = 'v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments an IPv6 unicast route.";
+       leaf destination-prefix {
+         type inet:ipv6-prefix;
+         description
+           "IPv6 destination prefix.";
+       }
+     }*/
+     /*augment "/rt:routing-state/rt:routing-instance/rt:ribs/rt:rib/"
+           + "rt:routes/rt:route/rt:next-hop/rt:next-hop-options/"
+           + "rt:simple-next-hop" {
+       when "../../../rt:address-family = 'v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case of IPv6 unicast
+          routes.";
+       leaf next-hop-address {
+         type inet:ipv6-address;
+         description
+           "IPv6 address of the next-hop.";
+       }
+     }*/
+
+     /* Configuration data */
+
+     augment "/if:interfaces/if:interface/ip:ipv6" {
+       description
+         "Augment interface configuration with IPv6-specific parameters
+          of router interfaces.";
+       container ipv6-router-advertisements {
+         description
+           "Configuration of IPv6 Router Advertisements.";
+         leaf send-advertisements {
+           type boolean;
+           default "false";
+           description
+             "A flag indicating whether or not the router sends periodic
+              Router Advertisements and responds to Router
+              Solicitations.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvSendAdvertisements.";
+         }
+         leaf max-rtr-adv-interval {
+           type uint16 {
+             range "4..1800";
+           }
+           units "seconds";
+           default "600";
+           description
+             "The maximum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              MaxRtrAdvInterval.";
+         }
+         leaf min-rtr-adv-interval {
+           type uint16 {
+             range "3..1350";
+           }
+           units "seconds";
+           must ". <= 0.75 * ../max-rtr-adv-interval" {
+             description
+               "The value MUST NOT be greater than 75 % of
+                'max-rtr-adv-interval'.";
+           }
+           description
+             "The minimum time allowed between sending unsolicited
+              multicast Router Advertisements from the interface.
+
+              The default value to be used operationally if this leaf is
+              not configured is determined as follows:
+
+              - if max-rtr-adv-interval >= 9 seconds, the default value
+                is 0.33 * max-rtr-adv-interval;
+
+              - otherwise it is 0.75 * max-rtr-adv-interval.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              MinRtrAdvInterval.";
+         }
+         leaf managed-flag {
+           type boolean;
+           default "false";
+           description
+             "The value to be placed in the 'Managed address
+              configuration' flag field in the Router Advertisement.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvManagedFlag.";
+         }
+         leaf other-config-flag {
+           type boolean;
+           default "false";
+           description
+             "The value to be placed in the 'Other configuration' flag
+              field in the Router Advertisement.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvOtherConfigFlag.";
+         }
+         leaf link-mtu {
+           type uint32;
+           default "0";
+           description
+             "The value to be placed in MTU options sent by the router.
+              A value of zero indicates that no MTU options are sent.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvLinkMTU.";
+         }
+         leaf reachable-time {
+           type uint32 {
+             range "0..3600000";
+           }
+           units "milliseconds";
+           default "0";
+           description
+             "The value to be placed in the Reachable Time field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvReachableTime.";
+         }
+         leaf retrans-timer {
+           type uint32;
+           units "milliseconds";
+           default "0";
+           description
+             "The value to be placed in the Retrans Timer field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvRetransTimer.";
+         }
+         leaf cur-hop-limit {
+           type uint8;
+           description
+             "The value to be placed in the Cur Hop Limit field in the
+              Router Advertisement messages sent by the router. A value
+              of zero means unspecified (by this router).
+
+              If this parameter is not configured, the device SHOULD use
+              the value specified in IANA Assigned Numbers that was in
+              effect at the time of implementation.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvCurHopLimit.
+              IANA: IP Parameters,
+              http://www.iana.org/assignments/ip-parameters";
+         }
+         leaf default-lifetime {
+           type uint16 {
+             range "0..9000";
+           }
+           units "seconds";
+           description
+             "The value to be placed in the Router Lifetime field of
+              Router Advertisements sent from the interface, in seconds.
+              It MUST be either zero or between max-rtr-adv-interval and
+              9000 seconds. A value of zero indicates that the router is
+              not to be used as a default router. These limits may be
+              overridden by specific documents that describe how IPv6
+              operates over different link layers.
+
+              If this parameter is not configured, the device SHOULD use
+              a value of 3 * max-rtr-adv-interval.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvDefaultLifeTime.";
+         }
+         container prefix-list {
+           description
+             "Configuration of prefixes to be placed in Prefix
+              Information options in Router Advertisement messages sent
+              from the interface.
+
+              Prefixes that are advertised by default but do not have
+              their entries in the child 'prefix' list are advertised
+              with the default values of all parameters.
+
+              The link-local prefix SHOULD NOT be included in the list
+              of advertised prefixes.";
+           reference
+             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
+              AdvPrefixList.";
+           list prefix {
+             key "prefix-spec";
+             description
+               "Configuration of an advertised prefix entry.";
+             leaf prefix-spec {
+               type inet:ipv6-prefix;
+               description
+                 "IPv6 address prefix.";
+             }
+             choice control-adv-prefixes {
+               default "advertise";
+               description
+                 "The prefix either may be explicitly removed from the
+                  set of advertised prefixes, or parameters with which
+                  it is advertised may be specified (default case).";
+               leaf no-advertise {
+                 type empty;
+                 description
+                   "The prefix will not be advertised.
+
+                    This can be used for removing the prefix from the
+                    default set of advertised prefixes.";
+               }
+               case advertise {
+                 leaf valid-lifetime {
+                   type uint32;
+                   units "seconds";
+                   default "2592000";
+                   description
+                     "The value to be placed in the Valid Lifetime in
+                      the Prefix Information option. The designated
+                      value of all 1's (0xffffffff) represents
+                      infinity.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvValidLifetime.";
+                 }
+                 leaf on-link-flag {
+                   type boolean;
+                   default "true";
+                   description
+                     "The value to be placed in the on-link flag
+                      ('L-bit') field in the Prefix Information
+                      option.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvOnLinkFlag.";
+                 }
+                 leaf preferred-lifetime {
+                   type uint32;
+                   units "seconds";
+                   must ". <= ../valid-lifetime" {
+                     description
+                       "This value MUST NOT be greater than
+                        valid-lifetime.";
+                   }
+                   default "604800";
+                   description
+                     "The value to be placed in the Preferred Lifetime
+                      in the Prefix Information option. The designated
+                      value of all 1's (0xffffffff) represents
+                      infinity.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvPreferredLifetime.";
+                 }
+                 leaf autonomous-flag {
+                   type boolean;
+                   default "true";
+                   description
+                     "The value to be placed in the Autonomous Flag
+                      field in the Prefix Information option.";
+                   reference
+                     "RFC 4861: Neighbor Discovery for IP version 6
+                      (IPv6) - AdvAutonomousFlag.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+           + "rt:routing-protocol/rt:static-routes" {
+       description
+         "This augment defines the configuration of the 'static'
+          pseudo-protocol with data specific to IPv6 unicast.";
+       container ipv6 {
+         description
+           "Configuration of a 'static' pseudo-protocol instance
+            consists of a list of routes.";
+         list route {
+           key "destination-prefix";
+           ordered-by "user";
+           description
+             "A user-ordered list of static routes.";
+           leaf destination-prefix {
+             type inet:ipv6-prefix;
+             mandatory "true";
+             description
+               "IPv6 destination prefix.";
+           }
+           leaf description {
+             type string;
+             description
+               "Textual description of the route.";
+           }
+           container next-hop {
+             description
+               "Configuration of next-hop.";
+             uses rt:next-hop-content {
+               augment "next-hop-options" {
+                 description
+                   "Add next-hop address case.";
+                 leaf next-hop-address {
+                   type inet:ipv6-address;
+                   description
+                     "IPv6 address of the next-hop.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     augment "/rt:fib-route/rt:input/rt:destination-address" {
+       when "rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'rt:destination-address' parameter of
+          the 'rt:fib-route' operation.";
+       leaf address {
+         type inet:ipv6-address;
+         description
+           "IPv6 destination address.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route" {
+       when "rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the reply to the 'rt:fib-route'
+          operation.";
+       leaf destination-prefix {
+         type inet:ipv6-prefix;
+         description
+           "IPv6 destination prefix.";
+       }
+     }
+
+     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
+           + "rt:next-hop-options/rt:simple-next-hop" {
+       when "../rt:address-family='v6ur:ipv6-unicast'" {
+         description
+           "This augment is valid only for IPv6 unicast.";
+       }
+       description
+         "This leaf augments the 'simple-next-hop' case in the reply to
+          the 'rt:fib-route' operation.";
+       leaf next-hop-address {
+         type inet:ipv6-address;
+         description
+           "IPv6 address of the next-hop.";
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-key-chain.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-key-chain.yang
new file mode 100644
index 000000000..bbe394ba5
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-key-chain.yang
@@ -0,0 +1,260 @@
+module ietf-key-chain {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-key-chain";
+  // replace with IANA namespace when assigned
+  prefix "key-chain";
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+  
+  organization
+    "Cisco Systems
+     170 West Tasman Drive
+     San Jose, CA 95134-1706
+     USA";
+  contact
+    "Acee Lindem - acee@cisco.com";
+
+  description
+    "This YANG module defines the generic configuration
+     data for key-chain. It is intended that the module
+     will be extended by vendors to define vendor-specific
+     key-chain configuration parameters.
+    ";
+  
+  revision 2015-02-24 {
+    description
+      "Initial revision.";
+    reference
+      "RFC XXXX: A YANG Data Model for key-chain";
+  }
+
+  typedef key-chain-ref {
+     type leafref {
+       path "/key-chain:key-chains/key-chain:name";
+     }
+     description 
+       "This type is used by data models that need to reference
+        configured key-chains.";
+  }           
+
+  feature hex-key-string {
+    description
+      "Support hexadecimal key string.";
+  }
+
+  feature accept-tolerance {
+    description
+      "To specify the tolerance or acceptance limit.";
+  }
+
+  feature independent-send-accept-lifetime {
+    description
+      "Support for independent send and accept key lifetimes.";
+  }
+
+  grouping lifetime {
+    description 
+      "Key lifetime specification.";
+    choice lifetime {
+      default always;
+      description 
+        "Options for specifying key accept or send lifetimes";
+      case always {
+        leaf always {
+          type empty;
+            description
+              "Indicates key lifetime is always valid.";
+        }
+      }
+      case start-end-time {
+        leaf start-date-time {
+          type yang:date-and-time;
+          description "Start time.";
+        }
+        choice end-time {
+          default infinite;
+          description
+            "End-time setting.";
+          case infinite {
+	    leaf no-end-time {
+              type empty;
+            description
+              "Indicates key lifetime end-time in infinite.";
+            } 
+          }
+          case duration {
+            leaf duration {
+              type uint32 {
+                range "1..2147483646";
+              }
+              units seconds;
+              description "Key lifetime duration, in seconds";
+            }  
+          }
+          case end-date-time {
+            leaf end-date-time {
+              type yang:date-and-time;
+              description "End time.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+ grouping crypto-algorithm-types {
+     description "Cryptographic algorithm types.";
+   choice algorithm {
+     description
+         "Options for crytographic algorithm specification.";
+     case hmac-sha1-12 {
+         leaf hmac-sha1-12 {
+             type empty;
+             description "The HMAC-SHA1-12 algorithm.";
+         }
+     }
+     case hmac-sha1-20 {
+         leaf hmac-sha1-20 {
+             type empty;
+             description "The HMAC-SHA1-20 algorithm.";
+         }
+     }
+     case md5 {
+         leaf md5 {
+             type empty;
+             description "The MD5 algorithm.";
+         }
+     }
+     case sha-1 {
+         leaf sha-1 {
+             type empty;
+             description "The SHA-1 algorithm.";
+         }
+     }
+     case hmac-sha-1 {
+         leaf hmac-sha-1 {
+             type empty;
+             description "HMAC-SHA-1 authentication algorithm.";
+         }
+     }
+     case hmac-sha-256 {
+         leaf hmac-sha-256 {
+             type empty;
+             description "HMAC-SHA-256 authentication algorithm.";
+         }
+     }
+     case hmac-sha-384 {
+         leaf hmac-sha-384 {
+             type empty;
+             description "HMAC-SHA-384 authentication algorithm.";
+         }
+     }
+     case hmac-sha-512 {
+         leaf hmac-sha-512 {
+             type empty;
+             description "HMAC-SHA-512 authentication algorithm.";
+         }
+     }
+   }
+ }
+  
+  grouping key-chain {
+    description 
+      "key-chain specification grouping.";    
+    leaf name {
+      type string;
+      description "Name of the key-chain.";
+    }
+
+    container accept-tolerance {
+      if-feature accept-tolerance;
+      description 
+        "Tolerance for key lifetime acceptance (seconds).";
+      leaf duration {
+        type uint32;
+        units seconds;
+        default "0";
+        description
+          "Tolerance range, in seconds.";
+      } 
+    }
+
+    list key {
+      key "key-id";
+      description "One key.";
+      leaf key-id {
+        type uint64;
+        description "Key id.";
+      }
+      container key-string {
+        description "The key string.";
+        choice key-string-style {
+           description
+             "Key string styles";
+           case keystring {
+             leaf keystring {
+               type string;
+               description "Key string in ASCII format.";
+             } 
+           }
+           case hexadecimal {
+             if-feature hex-key-string;
+             leaf hexadecimal-string {
+               type yang:hex-string;
+               description
+                 "Key in hexadecimal string format.";
+             }
+           }
+         }
+      }
+      container lifetime {
+        description "Specify a key's lifetime.";
+        choice lifetime {
+          description  
+            "Options for specification of send and accept
+             lifetimes.";
+          case send-and-accept-lifetime {
+            description
+              "Send and accept key have the same lifetime.";
+            container send-accept-lifetime {
+              uses lifetime;
+              description
+                "Single lifetime specification for both send and
+                 accept lifetimes.";
+            }
+          }
+          case independent-send-accept-lifetime {
+            if-feature independent-send-accept-lifetime;
+            description
+              "Independent send and accept key lifetimes.";
+            container send-lifetime {
+              uses lifetime;
+              description
+                "Separate lifetime specification for send
+                 lifetime.";
+            }
+            container accept-lifetime {
+              uses lifetime;
+              description
+                "Separate lifetime specification for accept
+                 lifetime.";
+            }
+          }
+        }
+      }
+      container crypto-algorithm {
+        uses crypto-algorithm-types;
+        description "Cryptographic algorithm associated with key.";
+      } 
+    }
+  }
+
+  list key-chains {
+    key "name";
+    description
+      "A key-chain is a sequence of keys that are collectively
+      managed for authentication.";
+    uses key-chain;
+  }
+} 
diff --git a/profiles/bundles/yang/cisco-iosxr/ietf-netconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-monitoring.yang
similarity index 100%
rename from profiles/bundles/yang/cisco-iosxr/ietf-netconf-monitoring.yang
rename to profiles/bundles/yang/ietf/0.1.3/ietf-netconf-monitoring.yang
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-notifications.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-notifications.yang
new file mode 100644
index 000000000..a9083b2c6
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-notifications.yang
@@ -0,0 +1,334 @@
+module ietf-netconf-notifications {
+
+  namespace
+    "urn:ietf:params:xml:ns:yang:ietf-netconf-notifications";
+
+  prefix ncn;
+
+  import ietf-inet-types { prefix inet; }
+  import ietf-netconf { prefix nc; }
+
+  organization
+    "IETF NETCONF (Network Configuration Protocol) Working Group";
+
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netconf/>
+     WG List:  <mailto:netconf@ietf.org>
+
+     WG Chair: Bert Wijnen
+               <mailto:bertietf@bwijnen.net>
+
+     WG Chair: Mehmet Ersue
+               <mailto:mehmet.ersue@nsn.com>
+
+     Editor:   Andy Bierman
+               <mailto:andy@netconfcentral.org>";
+
+  description
+    "This module defines a YANG data model for use with the
+     NETCONF protocol that allows the NETCONF client to
+     receive common NETCONF base event notifications.
+
+     Copyright (c) 2012 IETF Trust and the persons identified as
+     the document authors.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 6470; see
+     the RFC itself for full legal notices.";
+
+  revision "2012-02-06" {
+    description
+      "Initial version.";
+    reference
+      "RFC 6470: NETCONF Base Notifications";
+  }
+
+  grouping common-session-parms {
+    description
+      "Common session parameters to identify a
+       management session.";
+
+    leaf username {
+      type string;
+      mandatory true;
+      description
+        "Name of the user for the session.";
+    }
+
+    leaf session-id {
+      type nc:session-id-or-zero-type;
+      mandatory true;
+      description
+        "Identifier of the session.
+         A NETCONF session MUST be identified by a non-zero value.
+         A non-NETCONF session MAY be identified by the value zero.";
+    }
+
+    leaf source-host {
+      type inet:ip-address;
+      description
+        "Address of the remote host for the session.";
+    }
+  }
+
+  grouping changed-by-parms {
+    description
+      "Common parameters to identify the source
+       of a change event, such as a configuration
+       or capability change.";
+
+    container changed-by {
+      description
+        "Indicates the source of the change.
+         If caused by internal action, then the
+         empty leaf 'server' will be present.
+         If caused by a management session, then
+         the name, remote host address, and session ID
+         of the session that made the change will be reported.";
+      choice server-or-user {
+        mandatory true;
+        leaf server {
+          type empty;
+          description
+            "If present, the change was caused
+             by the server.";
+        }
+
+        case by-user {
+          uses common-session-parms;
+        }
+      } // choice server-or-user
+    } // container changed-by-parms
+  }
+
+  notification netconf-config-change {
+    description
+      "Generated when the NETCONF server detects that the
+       <running> or <startup> configuration datastore
+       has been changed by a management session.
+       The notification summarizes the edits that
+       have been detected.
+
+       The server MAY choose to also generate this
+       notification while loading a datastore during the
+       boot process for the device.";
+
+    uses changed-by-parms;
+
+    leaf datastore {
+      type enumeration {
+        enum running {
+          description "The <running> datastore has changed.";
+        }
+        enum startup {
+          description "The <startup> datastore has changed";
+        }
+      }
+      default "running";
+      description
+        "Indicates which configuration datastore has changed.";
+    }
+
+    list edit {
+      description
+        "An edit record SHOULD be present for each distinct
+         edit operation that the server has detected on
+         the target datastore.  This list MAY be omitted
+         if the detailed edit operations are not known.
+         The server MAY report entries in this list for
+         changes not made by a NETCONF session (e.g., CLI).";
+
+      leaf target {
+        type instance-identifier;
+        description
+          "Topmost node associated with the configuration change.
+           A server SHOULD set this object to the node within
+           the datastore that is being altered.  A server MAY
+           set this object to one of the ancestors of the actual
+           node that was changed, or omit this object, if the
+           exact node is not known.";
+      }
+
+      leaf operation {
+        type nc:edit-operation-type;
+        description
+          "Type of edit operation performed.
+           A server MUST set this object to the NETCONF edit
+           operation performed on the target datastore.";
+      }
+    } // list edit
+  } // notification netconf-config-change
+
+  notification netconf-capability-change {
+    description
+      "Generated when the NETCONF server detects that
+       the server capabilities have changed.
+       Indicates which capabilities have been added, deleted,
+       and/or modified.  The manner in which a server
+       capability is changed is outside the scope of this
+       document.";
+
+    uses changed-by-parms;
+
+    leaf-list added-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been added.";
+    }
+
+    leaf-list deleted-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been deleted.";
+    }
+
+    leaf-list modified-capability {
+      type inet:uri;
+      description
+        "List of capabilities that have just been modified.
+         A capability is considered to be modified if the
+         base URI for the capability has not changed, but
+         one or more of the parameters encoded at the end of
+         the capability URI have changed.
+         The new modified value of the complete URI is returned.";
+    }
+  } // notification netconf-capability-change
+
+  notification netconf-session-start {
+    description
+      "Generated when a NETCONF server detects that a
+       NETCONF session has started.  A server MAY generate
+       this event for non-NETCONF management sessions.
+       Indicates the identity of the user that started
+       the session.";
+    uses common-session-parms;
+  } // notification netconf-session-start
+
+  notification netconf-session-end {
+    description
+      "Generated when a NETCONF server detects that a
+       NETCONF session has terminated.
+       A server MAY optionally generate this event for
+       non-NETCONF management sessions.  Indicates the
+       identity of the user that owned the session,
+       and why the session was terminated.";
+
+    uses common-session-parms;
+
+    leaf killed-by {
+      when "../termination-reason = 'killed'";
+      type nc:session-id-type;
+      description
+        "The ID of the session that directly caused this session
+         to be abnormally terminated.  If this session was abnormally
+         terminated by a non-NETCONF session unknown to the server,
+         then this leaf will not be present.";
+    }
+
+    leaf termination-reason {
+      type enumeration {
+        enum "closed" {
+          description
+            "The session was terminated by the client in normal
+             fashion, e.g., by the NETCONF <close-session>
+             protocol operation.";
+        }
+        enum "killed" {
+          description
+            "The session was terminated in abnormal
+             fashion, e.g., by the NETCONF <kill-session>
+             protocol operation.";
+        }
+        enum "dropped" {
+          description
+            "The session was terminated because the transport layer
+             connection was unexpectedly closed.";
+        }
+        enum "timeout" {
+          description
+            "The session was terminated because of inactivity,
+             e.g., waiting for the <hello> message or <rpc>
+             messages.";
+        }
+        enum "bad-hello" {
+          description
+            "The client's <hello> message was invalid.";
+        }
+        enum "other" {
+          description
+            "The session was terminated for some other reason.";
+        }
+      }
+      mandatory true;
+      description
+        "Reason the session was terminated.";
+    }
+  } // notification netconf-session-end
+
+  notification netconf-confirmed-commit {
+    description
+      "Generated when a NETCONF server detects that a
+       confirmed-commit event has occurred.  Indicates the event
+       and the current state of the confirmed-commit procedure
+       in progress.";
+    reference
+      "RFC 6241, Section 8.4";
+
+    uses common-session-parms {
+      when "confirm-event != 'timeout'";
+    }
+
+    leaf confirm-event {
+      type enumeration {
+        enum "start" {
+          description
+            "The confirmed-commit procedure has started.";
+        }
+        enum "cancel" {
+          description
+            "The confirmed-commit procedure has been canceled,
+             e.g., due to the session being terminated, or an
+             explicit <cancel-commit> operation.";
+        }
+        enum "timeout" {
+          description
+            "The confirmed-commit procedure has been canceled
+             due to the confirm-timeout interval expiring.
+             The common session parameters will not be present
+             in this sub-mode.";
+        }
+        enum "extend" {
+          description
+            "The confirmed-commit timeout has been extended,
+             e.g., by a new <confirmed-commit> operation.";
+        }
+        enum "complete" {
+          description
+            "The confirmed-commit procedure has been completed.";
+        }
+      }
+      mandatory true;
+      description
+        "Indicates the event that caused the notification.";
+    }
+
+    leaf timeout {
+      when
+        "../confirm-event = 'start' or ../confirm-event = 'extend'";
+      type uint32;
+      units "seconds";
+      description
+        "The configured timeout value if the event type
+         is 'start' or 'extend'.  This value represents
+         the approximate number of seconds from the event
+         time when the 'timeout' event might occur.";
+    }
+  } // notification netconf-confirmed-commit
+
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-with-defaults.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-with-defaults.yang
new file mode 100644
index 000000000..e19d2b32c
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf-with-defaults.yang
@@ -0,0 +1,140 @@
+module ietf-netconf-with-defaults {
+
+   namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-with-defaults";
+
+   prefix ncwd;
+
+   import ietf-netconf { prefix nc; }
+
+   organization
+    "IETF NETCONF (Network Configuration Protocol) Working Group";
+
+   contact
+    "WG Web:   <http://tools.ietf.org/wg/netconf/>
+
+     WG List:  <netconf@ietf.org>
+
+     WG Chair: Bert Wijnen
+               <bertietf@bwijnen.net>
+
+     WG Chair: Mehmet Ersue
+               <mehmet.ersue@nsn.com>
+
+     Editor: Andy Bierman
+             <andy.bierman@brocade.com>
+
+     Editor: Balazs Lengyel
+             <balazs.lengyel@ericsson.com>";
+
+   description
+    "This module defines an extension to the NETCONF protocol
+     that allows the NETCONF client to control how default
+     values are handled by the server in particular NETCONF
+     operations.
+
+     Copyright (c) 2011 IETF Trust and the persons identified as
+     the document authors.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 6243; see
+     the RFC itself for full legal notices.";
+
+   revision 2011-06-01 {
+     description
+       "Initial version.";
+     reference
+      "RFC 6243: With-defaults Capability for NETCONF";
+   }
+
+   typedef with-defaults-mode {
+      description
+        "Possible modes to report default data.";
+      reference
+         "RFC 6243; Section 3.";
+      type enumeration {
+         enum report-all {
+             description
+               "All default data is reported.";
+             reference
+               "RFC 6243; Section 3.1";
+         }
+         enum report-all-tagged {
+             description
+               "All default data is reported.
+                Any nodes considered to be default data
+                will contain a 'default' XML attribute,
+                set to 'true' or '1'.";
+             reference
+               "RFC 6243; Section 3.4";
+         }
+         enum trim {
+             description
+               "Values are not reported if they contain the default.";
+             reference
+               "RFC 6243; Section 3.2";
+         }
+         enum explicit {
+             description
+               "Report values that contain the definition of
+                explicitly set data.";
+             reference
+               "RFC 6243; Section 3.3";
+         }
+     }
+   }
+
+   grouping with-defaults-parameters {
+     description
+       "Contains the <with-defaults> parameter for control
+        of defaults in NETCONF retrieval operations.";
+
+     leaf with-defaults {
+       description
+         "The explicit defaults processing mode requested.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       type with-defaults-mode;
+     }
+   }
+
+   // extending the get-config operation
+   augment /nc:get-config/nc:input {
+       description
+         "Adds the <with-defaults> parameter to the
+          input of the NETCONF <get-config> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+   // extending the get operation
+   augment /nc:get/nc:input {
+       description
+         "Adds the <with-defaults> parameter to
+          the input of the NETCONF <get> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+   // extending the copy-config operation
+   augment /nc:copy-config/nc:input {
+       description
+         "Adds the <with-defaults> parameter to
+          the input of the NETCONF <copy-config> operation.";
+       reference
+         "RFC 6243; Section 4.5.1";
+
+       uses with-defaults-parameters;
+   }
+
+}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf.yang
similarity index 99%
rename from profiles/bundles/yang/ietf/0.1.6/ietf-netconf.yang
rename to profiles/bundles/yang/ietf/0.1.3/ietf-netconf.yang
index 644942164..4d849c9f1 100644
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf.yang
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-netconf.yang
@@ -10,8 +10,6 @@ module ietf-netconf {
     prefix inet;
   }
 
-  import ietf-netconf-acm { prefix nacm; }
-
   organization
     "IETF NETCONF (Network Configuration) Working Group";
 
@@ -33,6 +31,7 @@ module ietf-netconf {
 
      Editor:   Andy Bierman
                <andy.bierman@brocade.com>";
+
   description
     "NETCONF Protocol Data Types and Protocol Operations.
 
@@ -48,12 +47,9 @@ module ietf-netconf {
 
      This version of this YANG module is part of RFC 6241; see
      the RFC itself for full legal notices.";
-
   revision 2011-06-01 {
     description
-      "Initial revision;
-       2013-09-29: Updated to include NACM attributes, 
-       as specified in RFC 6536: sec 3.2.5 and 3.2.8";
+      "Initial revision";
     reference
       "RFC 6241: Network Configuration Protocol";
   }
@@ -180,6 +176,7 @@ module ietf-netconf {
     description
       "NETCONF Session Id or Zero to indicate none";
   }
+
   typedef error-tag-type {
     type enumeration {
        enum in-use {
@@ -247,7 +244,6 @@ module ietf-netconf {
            "Request to roll back some configuration change (via
             rollback-on-error or <discard-changes> operations)
             was not completed for some reason.";
-
        }
        enum data-exists {
          description
@@ -623,7 +619,6 @@ module ietf-netconf {
   }
 
   rpc delete-config {
-    nacm:default-deny-all;
     description
       "Delete a configuration datastore.";
 
@@ -768,7 +763,6 @@ module ietf-netconf {
   }
 
   rpc kill-session {
-    nacm:default-deny-all;
     description
       "Force the termination of a NETCONF session.";
 
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-ospf.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-ospf.yang
new file mode 100644
index 000000000..0c3164f7a
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-ospf.yang
@@ -0,0 +1,2888 @@
+
+
+module ietf-ospf {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-ospf";
+
+  prefix ospf;
+
+  import ietf-inet-types {
+    prefix "inet";
+  }
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+
+  import ietf-interfaces {
+    prefix "if";
+  }
+
+  import ietf-routing {
+    prefix "rt";
+  }
+
+  import ietf-key-chain {
+    prefix "key-chain";
+  }
+
+  organization
+    "Cisco Systems
+     170 West Tasman Drive
+     San Jose, CA 95134-1706
+     USA";
+
+  contact
+     "WG Web:   <http://tools.ietf.org/wg/ospf/>
+      WG List:  <mailto:ospf@ietf.org>
+
+      WG Chair: Acee Lindem
+                <mailto:acee@cisco.com>
+
+      WG Chair: Abhay Roy
+                <mailto:akr@cisco.com>
+
+      Editor:   Derek Yeung
+                <myeung@cisco.com>
+      Author:   Derek Yeung
+                <myeung@cisco.com>
+      Author:   Yingzhen Qu
+                <yiqu@cisco.com>
+      Author:   Dean Bogdanovic
+                <deanb@juniper.net>
+      Author:   Jeffrey Zhang
+                <zzhang@juniper.net>
+      Author:   Kiran Agrahara Sreenivasa
+                <kkoushik@Brocade.com>";
+
+  description
+    "This YANG module defines the generic configuration
+     data for OSPF, which is common across all of the vendor
+     implementations of the protocol. It is intended that the module
+     will be extended by vendors to define vendor-specific
+     OSPF configuration parameters and policies,
+     for example route maps or route policies.
+
+     Terms and Acronyms
+
+     OSPF (ospf): Open Shortest Path First
+
+     IP (ip): Internet Protocol
+
+     IPv4 (ipv4):Internet Protocol Version 4
+
+     IPv6 (ipv6): Internet Protocol Version 6
+
+     MTU (mtu) Maximum Transmission Unit
+    ";
+
+  revision 2015-03-09 {
+    description
+      "Initial revision.
+       Remove protocol-centric
+       Replace admin-control
+       Add IPFRR
+       Max-path etc reorg
+       SR
+       Align config/operation field";
+    reference
+      "RFC XXXX: A YANG Data Model for OSPF";
+  }
+
+  identity ospf {
+    base "rt:routing-protocol";
+    description "OSPF Protocol";
+  }
+
+  identity ospfv2 {
+    base "rt:routing-protocol";
+    description "OSPFv2";
+  }
+
+  identity ospfv3 {
+    base "rt:routing-protocol";
+    description "OSPFv3";
+  }
+
+  identity operation-mode {
+    description
+      "OSPF operation mode.";
+  }
+
+  identity ships-in-the-night {
+    base operation-mode;
+    description
+      "Ships-in-the-night operation mode in which
+      each OSPF instance carries only one address family";
+  }
+
+  identity area-type {
+    description "Base identity for OSPF area type.";
+  }
+
+  identity normal {
+    base area-type;
+    description "OSPF normal area.";
+  }
+
+  identity stub {
+    base area-type;
+    description "OSPF stub area.";
+  }
+
+  identity nssa {
+    base area-type;
+    description "OSPF NSSA area.";
+  }
+
+  typedef rib-ref {
+    type leafref {
+      path "/rt:routing/rt:routing-instance/rt:ribs/rt:rib/rt:name";
+    }
+    description
+      "This type is used for leafs that reference a RIB
+       configuration.";
+  }
+
+  typedef uint24 {
+    type uint32 {
+      range "0 .. 16777215";
+    }
+    description
+      "24-bit unsigned integer.";
+  }
+
+  typedef area-id-type {
+    type union {
+      type uint32;
+      type yang:dotted-quad;
+    }
+    description
+      "Area ID type.";
+  }
+
+  typedef if-state-type {
+    type enumeration {
+      enum Down {
+        value "1";
+        description
+          "Interface down state";
+      }
+      enum Loopback {
+        value "2";
+        description
+          "Interface loopback state";
+      }
+      enum Waiting {
+        value "3";
+        description
+          "Interface waiting state";
+      }
+      enum Point-to-Point {
+        value "4";
+        description
+          "Interface point-to-point state";
+      }
+      enum DR {
+        value "5";
+        description
+          "Interface Designated Router (DR) state";
+      }
+      enum BDR {
+        value "6";
+        description
+          "Interface Backup Designated Router (BDR) state";
+      }
+      enum DR-Other {
+        value "7";
+        description
+          "Interface Other Designated Router state";
+      }
+    }
+    description
+      "OSPF interface state type.";
+  }
+
+  typedef nbr-state-type {
+    type enumeration {
+      enum Down {
+        value "1";
+        description
+          "Neighbor down state";
+      }
+      enum Attempt {
+        value "2";
+        description
+          "Neighbor attempt state";
+      }
+      enum Init {
+        value "3";
+        description
+          "Neighbor init state";
+      }
+      enum 2-Way {
+        value "4";
+        description
+          "Neighbor 2-Way state";
+      }
+      enum ExStart {
+        value "5";
+        description
+          "Neighbor exchange start state";
+      }
+      enum Exchange {
+        value "6";
+        description
+          "Neighbor exchange state";
+      }
+      enum Loading {
+        value "7";
+        description
+          "Neighbor loading state";
+      }
+      enum Full {
+        value "8";
+        description
+          "Neighbor full state";
+      }
+    }
+    description
+      "OSPF neighbor state type.";
+  }
+
+  typedef restart-helper-status-type {
+    type enumeration {
+      enum Not-Helping {
+        value "1";
+        description
+          "Restart helper status not helping.";
+      }
+      enum Helping {
+        value "2";
+        description
+          "Restart helper status helping.";
+      }
+    }
+    description
+      "Restart helper status type.";
+  }
+
+  typedef restart-exit-reason-type {
+    type enumeration {
+      enum None {
+        value "1";
+        description
+          "Not attempted.";
+      }
+      enum InProgress {
+        value "2";
+        description
+          "Restart in progress.";
+      }
+      enum Completed {
+        value "3";
+        description
+          "Successfully completed.";
+      }
+      enum TimedOut {
+        value "4";
+        description
+          "Timed out.";
+      }
+      enum TopologyChanged {
+        value "5";
+        description
+          "Aborted due to topology change.";
+      }
+    }
+    description
+      "Describes the outcome of the last attempt at a
+      graceful restart, either by itself or acting
+      as a helper.";
+  }
+
+  typedef packet-type {
+    type enumeration {
+      enum Hello {
+        value "1";
+        description
+          "OSPF hello packet.";
+      }
+      enum Database-Descripton {
+        value "2";
+        description
+          "OSPF database description packet.";
+      }
+      enum Link-State-Request {
+        value "3";
+        description
+          "OSPF link state request packet.";
+      }
+      enum Link-State-Update {
+        value "4";
+        description
+          "OSPF link state update packet.";
+      }
+      enum Link-State-Ack {
+        value "5";
+        description
+          "OSPF link state acknowlegement packet.";
+      }
+    }
+    description
+      "OSPF packet type.";
+  }
+
+  typedef nssa-translator-state-type {
+    type enumeration {
+      enum Enabled {
+        value "1";
+        description
+          "NSSA translator enabled state.";
+      }
+      enum Elected {
+        description
+          "NSSA translator elected state.";
+      }
+      enum Disabled {
+        value "3";
+        description
+          "NSSA translator disabled state.";
+      }
+    }
+    description
+      "OSPF NSSA translator state type.";
+  }
+
+  typedef restart-status-type {
+    type enumeration {
+      enum Not-Restarting {
+        value "1";
+        description
+          "Router is not restarting.";
+      }
+      enum Planned-Restart {
+        description
+          "Router is going through planned restart.";
+      }
+      enum Unplanned-Restart {
+        value "3";
+        description
+          "Router is going through unplanned restart.";
+      }
+    }
+    description
+      "OSPF graceful restart status type.";
+  }
+
+  feature multi-topology {
+    description
+      "Support MTR.";
+  }
+
+  feature multi-area-adj {
+    description
+      "OSPF multi-area adjacency support as in RFC 5185.";
+  }
+
+  feature router-id {
+    description
+      "Set router ID per instance.";
+  }
+
+  feature demand-circuit {
+    description
+      "OSPF demand circuit support as in RFC 1793.";
+  }
+
+  feature mtu-ignore {
+    description
+      "Disable OSPF MTU mismatch detection on receiving
+       DBD packets.";
+  }
+
+  feature lls {
+    description
+      "OSPF link-local signaling (LLS) as in RFC 5613.";
+  }
+
+  feature prefix-suppression {
+    description
+      "OSPF prefix suppression support as in RFC 6860.";
+  }
+
+  feature bfd {
+    description
+      "OSPF BFD support.";
+  }
+
+  feature ttl-security {
+    description
+      "OSPF ttl security check.";
+  }
+
+  feature nsr {
+    description
+      "Non-Stop-Routing (NSR).";
+  }
+
+  feature graceful-restart {
+    description
+      "Graceful OSPF Restart as defined in RFC3623 and RFC5187.";
+  }
+
+  feature admin-control {
+    description
+      "Administrative control of the protocol state.";
+  }
+
+  feature auto-cost {
+    description
+      "Calculate OSPF interface cost according to
+       reference bandwidth.";
+  }
+
+  feature max-ecmp {
+    description
+      "Setting maximum number of ECMP paths.";
+  }
+
+  feature max-lsa {
+    description
+      "Setting maximum number of LSAs OSPF will receive.";
+  }
+
+  feature te-rid {
+    description
+      "TE router-id.";
+  }
+
+  feature ldp-igp-sync {
+    description
+      "LDP IGP synchronization.";
+  }
+
+  feature ldp-igp-autoconfig {
+    description
+      "LDP IGP auto-config.";
+  }
+
+  feature ospfv3-authentication-ipsec {
+    description
+      "Use IPsec for OSPFv3 authentication.";
+  }
+
+  feature fast-reroute {
+   description
+     "Support of IPFRR.";
+  }
+
+  feature node-flag {
+   description
+     "Support of node flag.";
+  }
+
+  feature lfa {
+   description
+     "Support of Loop Free Alternates.";
+  }
+
+  feature remote-lfa {
+   description
+     "Support of remote Loop Free Alternates.";
+  }
+
+  feature instance-inheritance {
+    description
+      "Support instance inheritance";
+  }
+
+  feature area-inheritance {
+    description
+      "Support area inheritance";
+  }
+
+  feature interface-inheritance {
+    description
+      "Support interface inheritance";
+  }
+
+  grouping instance-fast-reroute-config {
+    description
+      "This group defines global configuration of IPFRR.";
+    container fast-reroute {
+      if-feature fast-reroute;
+      description
+        "This container may be augmented with global
+         parameters for IPFRR.";
+      container lfa {
+        if-feature lfa;
+        description
+          "This container may be augmented with
+           global parameters for LFA.
+           Creating the container has no effect on
+           LFA activation.";
+      }
+    }
+  }
+
+  grouping interface-fast-reroute-config {
+    description
+      "This group defines interface configuration of IPFRR.";
+    container fast-reroute {
+      if-feature fast-reroute;
+
+      container lfa {
+        if-feature lfa;
+
+        leaf candidate-disabled {
+          type boolean;
+          description
+            "Prevent the interface to be used as backup.";
+        }
+        leaf enabled {
+          type boolean;
+          description
+            "Activates LFA.
+            This model assumes activation of per-prefix LFA.";
+        }
+        container remote-lfa {
+          if-feature remote-lfa;
+          leaf enabled {
+            type boolean;
+            description
+            "Activates remote LFA.";
+          }
+          description
+            "Remote LFA configuration.";
+        }
+        description
+          "LFA configuration.";
+      }
+      description
+        "Fast-reroute configuration.";
+    }
+  }
+
+  grouping interface-common-config {
+    description "Common configuration for all types of interfaces,
+                 including virtual link and sham link";
+
+    leaf cost {
+      type uint16 {
+        range "1..65535";
+      }
+      description
+        "Interface cost.";
+    }
+
+    leaf hello-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Time between hello packets.";
+    }
+
+    leaf dead-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      must "../dead-interval > ../hello-interval" {
+        error-message "The dead interval must be "
+                    + "larger than the hello interval";
+        description
+          "The value MUST be greater than 'hello-internval'.";
+      }
+      description
+        "Interval after which a neighbor is declared dead.";
+    }
+
+    leaf retransmit-interval {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Time between retransmitting unacknowledged Link State
+         Advertisements (LSAs).";
+    }
+
+    leaf transmit-delay {
+      type uint16 {
+        range "1..65535";
+      }
+      units seconds;
+      description
+        "Estimated time needed to send link-state update.";
+    }
+
+    leaf mtu-ignore {
+      if-feature mtu-ignore;
+      type boolean;
+      description
+        "Enable/Disable ignoring of MTU in DBD packets.";
+    }
+
+    leaf lls {
+      if-feature lls;
+      type boolean;
+      description
+        "Enable/Disable link-local signaling (LLS) support.";
+    }
+
+    leaf prefix-suppression {
+      if-feature prefix-suppression;
+      type boolean;
+      description
+        "Suppress advertisement of the prefixes.";
+    }
+
+    leaf bfd {
+      if-feature bfd;
+      type boolean;
+      description
+        "Enable/disable bfd.";
+    }
+
+    container ttl-security {
+      if-feature ttl-security;
+      description "TTL security check.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable TTL security check.";
+      }
+      leaf hops {
+        type uint8 {
+          range "1..254";
+        }
+        description
+          "Maximum number of hops that a OSPF packet may
+           have traveled.";
+      }
+    }
+    leaf enable {
+      if-feature admin-control;
+      type boolean;
+      default true;
+      description
+        "Enable/disable protocol on the interface.";
+    }
+
+    container authentication {
+      description "Authentication configuration.";
+      choice auth-type-selection {
+        description
+          "Options for expressing authentication setting";
+        case auth-ipsec {
+          when "../../../../../rt:type = 'ospfv3'" {
+            description "Applied to OSPFv3 only";
+          }
+          if-feature ospfv3-authentication-ipsec;
+          leaf sa {
+              type string;
+              description
+                "SA name";
+          }
+        }
+        case auth-trailer-key-chain {
+          leaf key-chain {
+            type key-chain:key-chain-ref;
+             description
+              "key-chain name";
+            }
+          }
+        case auth-trailer-key {
+          leaf key {
+            type string;
+            description
+              "Key string in ASCII format.";
+          }
+          container crypto-algorithm {
+            uses key-chain:crypto-algorithm-types;
+            description
+              "Cryptographic algorithm associated with key.";
+          }
+        }
+      }
+    }
+  } // interface-common-config
+
+  grouping interface-config {
+    description "Configuration for real interfaces.";
+
+    leaf network-type {
+      type enumeration {
+        enum "broadcast" {
+          description
+            "Specify OSPF broadcast multi-access network.";
+        }
+        enum "non-broadcast" {
+          description
+            "Specify OSPF Non-Broadcast Multi-Access
+            (NBMA) network.";
+        }
+        enum "point-to-multipoint" {
+          description
+            "Specify OSPF point-to-multipoint network.";
+        }
+        enum "point-to-point" {
+          description
+            "Specify OSPF point-to-point network.";
+        }
+      }
+      description
+        "Network type.";
+    }
+
+    leaf passive {
+      type boolean;
+      description
+        "Enable/Disable passive.";
+    }
+
+    leaf demand-circuit {
+      if-feature demand-circuit;
+      type boolean;
+      description
+        "Enable/Disable demand circuit.";
+    }
+
+    container multi-area {
+      if-feature multi-area-adj;
+      description
+        "Configure ospf multi-area.";
+      leaf multi-area-id {
+        type area-id-type;
+        description
+          "Multi-area ID";
+      }
+      leaf cost {
+        type uint16;
+        description
+          "Interface cost for multi-area.";
+      }
+    }
+
+    container static-neighbors {
+      description "Static configured neighbors.";
+
+      list neighbor {
+        key "address";
+        description
+          "Specify a neighbor router.";
+
+        leaf address {
+          type inet:ip-address;
+          description "Neighbor IP address.";
+        }
+
+        leaf cost {
+          type uint16 {
+            range "1..65535";
+          }
+          description "Neighbor cost.";
+        }
+        leaf poll-interval {
+          type uint16 {
+            range "1..65535";
+          }
+          units seconds;
+          description "Neighbor poll interval.";
+        }
+        leaf priority {
+          type uint8 {
+            range "1..255";
+          }
+          description "Neighbor priority for DR election.";
+        }
+      }
+    }
+
+    leaf node-flag {
+      if-feature node-flag;
+      type boolean;
+      default false;
+      description
+        "Set prefix as a node representative prefix.";
+    }
+    uses interface-fast-reroute-config;
+    uses interface-common-config;
+  } // grouping interface-config
+
+  grouping tlv {
+    description
+      "TLV";
+    leaf type {
+      type uint16;
+      description "TLV type.";
+    }
+    leaf length {
+      type uint16;
+      description "TLV length.";
+    }
+    leaf value {
+      type yang:hex-string;
+      description "TLV value.";
+    }
+  }
+
+  grouping ospfv2-lsa-body {
+    description "OSPFv2 LSA body.";
+    container router {
+      when "../../header/type = 1" {
+        description
+          "Only apply to Router-LSA.";
+      }
+      description
+        "Router LSA.";
+      leaf flags {
+        //type string;
+        type bits {
+          bit V {
+            description
+              "When set, the router is an endpoint of one or
+              more virtual links.";
+          }
+          bit E {
+            description
+              "When set, the router is an AS Boundary Router
+              (ASBR).";
+          }
+          bit B {
+            description
+              "When set, the router is an Area Border
+              Router (ABR).";
+          }
+        }
+        description "Flags";
+      }
+      leaf num-of-links {
+        type uint16;
+        description "Number of links.";
+      }
+      list link {
+        key "link-id link-data";
+        description "Router LSA link.";
+        leaf link-id {
+          type union {
+            type inet:ipv4-address;
+            type yang:dotted-quad;
+          }
+          description "Link ID";
+        }
+        leaf link-data {
+          type union {
+            type inet:ipv4-address;
+            type uint32;
+          }
+          description "Link data.";
+        }
+        leaf type {
+          type uint8;
+          description "Link type.";
+        }
+        list topology {
+          key "mt-id";
+          description
+            "Topology specific information.";
+          leaf mt-id {
+            type uint8;
+            description
+              "The MT-ID for topology enabled on the link.";
+          }
+          leaf metric {
+            type uint16;
+            description "Metric for the topology.";
+          }
+        }
+      }
+    }
+    container network {
+      when "../../header/type = 2" {
+        description
+          "Only apply to network LSA.";
+      }
+      description
+        "Network LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      leaf-list attached-router {
+        type yang:dotted-quad;
+        description
+          "List of the routers attached to the network.";
+      }
+    }
+    container summary {
+      when "../../header/type = 3 or "
+         + "../../header/type = 4" {
+        description
+          "Only apply to Summary-LSA.";
+      }
+      description
+        "Summary LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      list topology {
+        key "mt-id";
+        description
+          "Topology specific information.";
+        leaf mt-id {
+          type uint8;
+          description
+            "The MT-ID for topology enabled on the link.";
+        }
+        leaf metric {
+          type uint24;
+          description "Metric for the topology.";
+        }
+      }
+    }
+    container external {
+      when "../../header/type = 5 or "
+         + "../../header/type = 7" {
+        description
+          "Only apply to AS-external-LSA and NSSA-LSA.";
+      }
+      description
+        "External LSA.";
+      leaf network-mask {
+        type inet:ipv4-address;
+        //type string;
+        description
+          "The IP address mask for the network";
+      }
+      list topology {
+        key "mt-id";
+        description
+          "Topology specific information.";
+        leaf mt-id {
+          type uint8;
+          description
+            "The MT-ID for topology enabled on the link.";
+        }
+        leaf flags {
+          //type string;
+          type bits {
+            bit E {
+              description
+                "When set, the metric specified is a Type 2
+                external metric.";
+            }
+          }
+          description "Flags.";
+        }
+        leaf metric {
+          type uint24;
+          description "Metric for the topology.";
+        }
+        leaf forwarding-address {
+          type inet:ipv4-address;
+          description
+            "Forwarding address.";
+        }
+        leaf external-route-tag {
+          type uint32;
+          description
+            "Route tag.";
+        }
+      }
+    }
+    container opaque {
+      when "../../header/type = 9 or "
+         + "../../header/type = 10 or "
+         + "../../header/type = 11" {
+        description
+          "Only apply to opaque LSA.";
+      }
+      description
+        "Opaque LSA.";
+
+      list unknown-tlv {
+        key "type";
+        description "Unknown TLV.";
+        uses tlv;
+      }
+
+      container router-address-tlv {
+        leaf router-address {
+          type inet:ipv4-address;
+          description
+            "Router address.";
+        }
+        description
+          "Router address TLV.";
+      }
+
+      container link-tlv {
+        leaf link-type {
+          type uint8;
+          mandatory true;
+          description "Link type.";
+        }
+        leaf link-id {
+          type union {
+            type inet:ipv4-address;
+            type yang:dotted-quad;
+          }
+          mandatory true;
+          description "Link ID.";
+        }
+        leaf-list local-if-ipv4-addr {
+          type inet:ipv4-address;
+          description
+            "List of local interface IPv4 addresses.";
+        }
+        leaf-list local-remote-ipv4-addr {
+          type inet:ipv4-address;
+          description
+            "List of remote interface IPv4 addresses.";
+        }
+        leaf te-metric {
+          type uint32;
+          description "TE metric.";
+        }
+        leaf max-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Maximum bandwidth.";
+        }
+        leaf max-reservable-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Maximum reservable bandwidth.";
+        }
+        leaf unreserved-bandwidth {
+          type decimal64 {
+            fraction-digits 2;
+          }
+          description "Unreserved bandwidth.";
+        }
+        leaf admin-group {
+          type uint32;
+          description "Administrative group/Resource class/Color.";
+        }
+        list unknown-subtlv {
+          key "type";
+          description "Unknown sub-TLV.";
+          uses tlv;
+        }
+        description
+          "Link TLV.";
+      }
+    }
+  }
+
+  grouping ospfv3-lsa-options {
+    description "OSPFv3 LSA options";
+    leaf options {
+      //type string;
+      type bits {
+        bit DC {
+          description
+            "When set, the router support demand circuits.";
+        }
+        bit R {
+          description
+            "When set, the originator is an active router.";
+        }
+        bit N {
+          description
+            "If set, the router is attached to an NSSA";
+        }
+        bit E {
+          description
+            "This bit describes the way AS-external-LSAs
+            are flooded";
+        }
+        bit V6 {
+          description
+            "If clear, the router/link should be excluded
+             from IPv6 routing calculaton";
+        }
+        bit AF {
+        }
+      }
+      mandatory true;
+      description "OSPFv3 LSA options.";
+    }
+  }
+
+  grouping ospfv3-lsa-prefix {
+    description
+      "OSPFv3 LSA prefix.";
+
+    leaf prefix {
+      //type inet:ip-prefix;
+      type string;
+      description
+        "Prefix";
+    }
+    leaf prefix-options {
+      type string;
+      /*type bits {
+        bit NU {
+          description
+            "When set, the prefix should be excluded
+            from IPv6 unicast calculations.";
+        }
+        bit LA {
+          description
+            "When set, the prefix is actually an IPv6 interface
+            address of the Advertising Router.";
+        }
+        bit P {
+          description
+            "When set, the NSSA area prefix should be
+            readvertised by the translating NSSA area border.";
+        }
+        bit DN {
+          description
+            "When set, the inter-area-prefix-LSA or
+            AS-external-LSA prefix has been advertised in a VPN
+            environment.";
+        }
+      }*/
+      mandatory true;
+      description "Prefix options.";
+    }
+  }
+
+  grouping ospfv3-lsa-external {
+    description
+      "AS-External and NSSA LSA.";
+    leaf metric {
+      type uint24;
+      description "Metric";
+    }
+
+    leaf flags {
+      //type string;
+      type bits {
+        bit E {
+          description
+            "When set, the metric specified is a Type 2
+            external metric.";
+        }
+      }
+      description "Flags.";
+    }
+
+    leaf referenced-ls-type {
+      type uint16;
+      description "Referenced Link State type.";
+    }
+
+    uses ospfv3-lsa-prefix;
+
+    leaf forwarding-address {
+      type inet:ipv6-address;
+      description
+        "Forwarding address.";
+    }
+
+    leaf external-route-tag {
+      type uint32;
+      description
+        "Route tag.";
+    }
+    leaf referenced-link-state-id {
+      type uint32;
+      description
+        "Referenced Link State ID.";
+    }
+  }
+
+  grouping ospfv3-lsa-body {
+    description "OSPFv3 LSA body.";
+    container router {
+      when "../../header/type = 8193" { // 0x2001
+        description
+          "Only apply to Router-LSA.";
+      }
+      description "Router LSA.";
+      leaf flags {
+        //type string;
+        type bits {
+          bit V {
+            description
+              "When set, the router is an endpoint of one or
+              more virtual links.";
+          }
+          bit E {
+            description
+              "When set, the router is an AS Boundary Router
+              (ASBR).";
+          }
+          bit B {
+            description
+              "When set, the router is an Area Border
+              Router (ABR).";
+          }
+          bit Nt {
+            description
+              "When set, the router is an NSSA border router
+              that is unconditionally translating NSSA-LSAs
+              into AS-external-LSAs.";
+          }
+        }
+        mandatory true;
+        description "LSA option.";
+      }
+
+      uses ospfv3-lsa-options;
+
+      list link {
+        key "interface-id neighbor-interface-id neighbor-router-id";
+        description "Router LSA link.";
+        leaf interface-id {
+          type uint32;
+          description "Interface ID.";
+        }
+        leaf neighbor-interface-id {
+          type uint32;
+          description "Neighbor Interface ID.";
+        }
+        leaf neighbor-router-id {
+          type yang:dotted-quad;
+          description "Neighbor Router ID";
+        }
+        leaf type {
+          type uint8;
+          description "Link type.";
+        }
+        leaf metric {
+          type uint16;
+            description "Metric.";
+        }
+      }
+    }
+    container network {
+      when "../../header/type = 8194" { // 0x2002
+        description
+          "Only apply to network LSA.";
+      }
+      description "Network LSA.";
+
+      uses ospfv3-lsa-options;
+
+      leaf-list attached-router {
+        type yang:dotted-quad;
+        description
+          "List of the routers attached to the network.";
+      }
+    }
+    container inter-area-prefix {
+      when "../../header/type = 8195" { // 0x2003
+        description
+          "Only apply to inter-area-prefix LSA.";
+      }
+      leaf metric {
+        type uint24;
+        description "Metric";
+      }
+
+      uses ospfv3-lsa-prefix;
+      description "Inter-Area-Prefix LSA.";
+    }
+    container inter-area-router {
+      when "../../header/type = 8196" { // 0x2004
+        description
+          "Only apply to inter-area-router LSA.";
+      }
+      uses ospfv3-lsa-options;
+      leaf metric {
+        type uint24;
+        description "Metric";
+      }
+      leaf destination-router-id {
+        type yang:dotted-quad;
+        description
+          "The Router ID of the router being described by the LSA.";
+      }
+      description "Inter-Area-Router LSA.";
+    }
+    container as-external {
+      when "../../header/type = 16389" { // 0x2007
+        description
+          "Only apply to as-external LSA.";
+      }
+
+      uses ospfv3-lsa-external;
+
+      description "AS-External LSA.";
+    }
+    container nssa {
+      when "../../header/type = 8199" { // 0x2007
+        description
+          "Only apply to nssa LSA.";
+      }
+      uses ospfv3-lsa-external;
+
+      description "NSSA LSA.";
+    }
+    container link {
+      when "../../header/type = 8" { // 0x0008
+        description
+          "Only apply to link LSA.";
+      }
+      leaf rtr-priority {
+        type uint8;
+        description "Router Priority of the interface.";
+      }
+
+      uses ospfv3-lsa-options;
+
+      leaf link-local-interface-address {
+        type inet:ip-address;
+        description
+          "The originating router's link-local
+          interface address on the link.";
+      }
+
+      leaf num-of-prefixes {
+        type uint32;
+        description "Number of prefixes.";
+      }
+
+      list prefix-list {
+        key "prefix";
+        description "List of prefixes associated with the link.";
+        uses ospfv3-lsa-prefix;
+      }
+      description "Link LSA.";
+    }
+    container intra-area-prefix {
+      when "../../header/type = 8201" { // 0x2009
+        description
+          "Only apply to intra-area-prefix LSA.";
+      }
+      description "Intra-Area-Prefix LSA.";
+
+      leaf referenced-ls-type {
+        type uint16;
+        description "Referenced Link State type.";
+      }
+      leaf referenced-link-state-id {
+        type uint32;
+        description
+          "Referenced Link State ID.";
+      }
+      leaf referenced-adv-router {
+        type inet:ipv4-address;
+        description
+          "Referenced Advertising Router.";
+      }
+
+      leaf num-of-prefixes {
+        type uint16;
+        description "Number of prefixes.";
+      }
+      list prefix-list {
+        key "prefix";
+        description "List of prefixes associated with the link.";
+        uses ospfv3-lsa-prefix;
+        leaf metric {
+          type uint24;
+          description "Metric";
+        }
+      }
+    }
+  }
+
+  grouping lsa-header {
+    description
+        "Common LSA for OSPFv2 and OSPFv3";
+    leaf age {
+      type uint16;
+      mandatory true;
+      description "LSA age.";
+    }
+    leaf type {
+      type uint16;
+      mandatory true;
+      description "LSA type.";
+    }
+    leaf adv-router {
+      type yang:dotted-quad;
+      mandatory true;
+      description "LSA advertising router.";
+    }
+    leaf seq-num {
+      type string;
+      mandatory true;
+      description "LSA sequence number.";
+    }
+    leaf checksum {
+      type string;
+      mandatory true;
+      description "LSA checksum.";
+    }
+    leaf length {
+      type uint16;
+      mandatory true;
+      description "LSA length.";
+    }
+  }
+
+  grouping ospfv2-lsa {
+    description
+        "OSPFv2 LSA.";
+    container header {
+      description
+        "Decoded OSPFv2 LSA header data.";
+      leaf options {
+        //type string;
+        type bits {
+          bit DC {
+            description
+              "When set, the router support demand circuits.";
+          }
+          bit P {
+            description
+              "Only used in type-7 LSA. When set, the NSSA
+              border router should translate the type-7 LSA
+              to type-5 LSA.";
+          }
+          bit MC {
+            description
+              "When set, the router support MOSPF.";
+          }
+          bit E {
+            description
+              "This bit describes the way AS-external-LSAs
+              are flooded";
+          }
+          bit Upward {
+          }
+          bit MT {
+          }
+          bit R {
+          }
+          bit AF {
+          }
+        }
+        mandatory true;
+        description "LSA option.";
+      }
+      leaf lsa-id {
+        type inet:ipv4-address;
+        mandatory true;
+        description "LSA ID.";
+      }
+
+      leaf opaque-type {
+        when "../../header/type = 9 or "
+           + "../../header/type = 10 or "
+           + "../../header/type = 11" {
+          description
+            "Only apply to opaque LSA.";
+        }
+        type uint8;
+        mandatory true;
+        description "Opaque type.";
+      }
+
+      leaf opaque-id {
+        when "../../header/type = 9 or "
+           + "../../header/type = 10 or "
+           + "../../header/type = 11" {
+          description
+            "Only apply to opaque LSA.";
+        }
+        type uint24;
+        mandatory true;
+        description "Opaque id.";
+      }
+      uses lsa-header;
+    }
+    container body {
+      description
+        "Decoded OSPFv2 LSA body data.";
+      uses ospfv2-lsa-body;
+    }
+  }
+
+  grouping ospfv3-lsa {
+    description
+        "Decoded OSPFv3 LSA.";
+    container header {
+      description
+        "Decoded OSPFv3 LSA header data.";
+      leaf lsa-id {
+        type uint32;
+        mandatory true;
+        description "LSA ID.";
+      }
+      uses lsa-header;
+      uses ospfv3-lsa-options;
+    }
+    container body {
+      description
+        "Decoded OSPF LSA body data.";
+      uses ospfv3-lsa-body;
+    }
+  }
+
+  grouping lsa-common {
+    description
+        "Common field for OSPF LSA represenation.";
+    leaf decoded-completed {
+      type boolean;
+      description
+        "The OSPF LSA body is fully decoded.";
+    }
+    leaf raw-data {
+      type yang:hex-string;
+      description
+        "The complete LSA in network byte
+        order as received/sent over the wire.";
+    }
+  }
+
+  grouping lsa {
+    description
+        "OSPF LSA.";
+    uses lsa-common;
+    choice version {
+      description
+        "OSPFv2 or OSPFv3 LSA body.";
+     case v2 {
+      container ospfv2 {
+        description "OSPFv2 LSA";
+        uses ospfv2-lsa;
+       }
+      }
+     case v3 {
+      container ospfv3 {
+        description "OSPFv3 LSA";
+        uses ospfv3-lsa;
+      }
+    }
+   }
+  }
+
+  grouping lsa-key {
+    description
+      "OSPF LSA key.";
+    leaf lsa-id {
+      type union {
+        type inet:ipv4-address;
+        type uint32;
+      }
+      description
+        "LSA ID.";
+    }
+    leaf adv-router {
+      type inet:ipv4-address;
+      description
+        "Advertising router.";
+    }
+  }
+
+  grouping af-area-config {
+    description
+      "OSPF address-family specific area config state.";
+    list range {
+      key "prefix";
+      description
+        "Summarize routes matching address/mask (border
+         routers only)";
+      leaf prefix {
+        //type inet:ip-prefix;
+        type string;
+        description
+          "IPv4 or IPv6 prefix";
+      }
+      leaf advertise {
+        type boolean;
+        description
+          "Advertise or hide.";
+      }
+      leaf cost {
+        type uint24 {
+          range "0..16777214";
+        }
+        description
+          "Cost of summary route.";
+      }
+    }
+  }
+
+  grouping area-config {
+    description
+      "OSPF area config state.";
+    leaf area-type {
+      type identityref {
+        base area-type;
+      }
+      default normal;
+      description
+        "Area type.";
+    }
+
+    leaf summary {
+      /* when "../area-type = 'stub' or ../area-type = 'nssa'" {
+        description
+          "Summary generation valid for stub/NSSA area.";
+      } */
+      type boolean;
+      description
+        "Enable/Disable summary generation to the stub or
+        NSSA area.";
+    }
+
+    leaf default-cost {
+      /* when "../area-type = 'stub' or ../area-type = 'nssa'" {
+          description
+            "Default cost for LSA advertised into stub or
+            NSSA area.";
+      } */
+      type uint32 {
+        range "1..16777215";
+      }
+      description
+        "Set the summary default-cost for a stub or NSSA area.";
+    }
+
+    uses af-area-config {
+      /* when "../../operation-mode = 'ospf:ships-in-the-night'" {
+        description
+          "Ships in the night configuration.";
+      } */
+    }
+  }
+
+  grouping instance-config {
+    description
+      "OSPF instance config state.";
+    leaf router-id {
+      if-feature router-id;
+      type yang:dotted-quad;
+      description
+        "Defined in RFC 2328. A 32-bit number
+         that uniquely identifies the router.";
+    }
+
+    container admin-distance {
+      description "Admin distance config state.";
+      choice granularity {
+        description
+          "Options for expressing admin distance
+           for intra-area and inter-area route";
+        case detail {
+          leaf intra-area {
+            type uint8;
+            description
+              "Admin distance for intra-area route.";
+          }
+          leaf inter-area {
+            type uint8;
+            description
+              "Admin distance for inter-area route.";
+          }
+        }
+        case coarse {
+          leaf internal {
+            type uint8;
+            description
+              "Admin distance for both intra-area and
+               inter-area route.";
+          }
+        }
+      }
+      leaf external {
+        type uint8;
+        description
+          "Admin distance for both external route.";
+      }
+    }
+
+    container nsr {
+      if-feature nsr;
+      description
+        "NSR config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable NSR.";
+      }
+    }
+
+    container graceful-restart {
+      if-feature graceful-restart;
+      description
+        "Graceful restart config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable graceful restart as defined in RFC 3623.";
+      }
+      leaf helper-enable {
+        type boolean;
+        description
+          "Enable RestartHelperSupport in RFC 3623 Section B.2.";
+      }
+      leaf restart-interval {
+        type uint16 {
+          range "1..1800";  // Range is defined in RFC 3623.
+        }
+        units seconds;
+        default "120";  // Default is defined in RFC 3623.
+        description
+          "RestartInterval option in RFC 3623 Section B.1.";
+      }
+      leaf helper-strict-lsa-checking {
+        type boolean;
+        description
+          "RestartHelperStrictLSAChecking option in RFC 3623
+          Section B.2.";
+      }
+    }
+
+    leaf enable {
+      if-feature admin-control;
+      type boolean;
+      default true;
+      description
+        "Enable/Disable the protocol.";
+    }
+
+    container auto-cost {
+      if-feature auto-cost;
+      description
+        "Auto cost config state.";
+      leaf enable {
+        type boolean;
+        description
+          "Enable/Disable auto cost.";
+      }
+      leaf reference-bandwidth {
+        type uint32 {
+          range "1..4294967";
+        }
+        units Mbits;
+        description
+          "Configure reference bandwidth in term of Mbits";
+      }
+    }
+
+/*
+    container maximum {
+      leaf paths {
+        if-feature max-ecmp;
+        type uint16 {
+          range "1..32";
+        }
+        description
+          "Maximum number of ECMP paths.";
+      }
+      description
+        "OSPF limits settings.";
+      leaf max-lsa {
+        if-feature max-lsa;
+        type uint32 {
+          range "1..4294967294";
+        }
+        description
+          "Maximum number of LSAs OSPF will receive.";
+      }
+    }
+*/
+
+    container spf-control {
+      leaf paths {
+        if-feature max-ecmp;
+        type uint16 {
+          range "1..32";
+        }
+        description
+          "Maximum number of ECMP paths.";
+      }
+      // timer (augment)
+      description "SPF calculation control.";
+    }
+    container database-control {
+      leaf max-lsa {
+        if-feature max-lsa;
+        type uint32 {
+          range "1..4294967294";
+        }
+        description
+          "Maximum number of LSAs OSPF will receive.";
+      }
+      description "Database maintenance control.";
+    }
+    container reload-control {
+      // max-metric
+      description "Protocol reload control.";
+    }
+
+    container mpls {
+      description
+        "OSPF MPLS config state.";
+      container te-rid {
+        if-feature te-rid;
+        description
+          "Traffic Engineering stable IP address for system.";
+        choice source {
+          description
+            "Different options for specifying TE router ID.";
+          case interface {
+            leaf interface {
+              type if:interface-ref;
+              description
+                "Take the interface's IPv4 address as TE
+                 router ID.";
+            }
+          }
+          case explicit {
+            leaf router-id {
+              type inet:ipv4-address;
+              description
+                "Explicitly configure the TE router ID.";
+            }
+          }
+        }
+      }
+      container ldp {
+        description
+          "OSPF MPLS LDP config state.";
+        leaf igp-sync {
+          if-feature ldp-igp-sync;
+          type boolean;
+          description
+            "Enable LDP IGP synchronization.";
+        }
+        leaf autoconfig {
+          if-feature ldp-igp-autoconfig;
+          type boolean;
+          description
+            "Enable LDP IGP interface auto-configuration.";
+        }
+      }
+    }
+    uses instance-fast-reroute-config;
+  }
+
+  grouping interface-operation {
+    description
+      "OSPF interface operation state.";
+    reference "RFC2328 Section 9";
+    uses interface-config;
+
+    leaf state {
+      //type if-state-type;
+      type string;
+      description "Interface state.";
+    }
+
+    leaf hello-timer {
+      type uint32;
+      units "milliseconds";
+      description "Hello timer.";
+    }
+
+    leaf wait-timer {
+      type uint32;
+      units "milliseconds";
+      description "Wait timer.";
+    }
+
+    leaf dr {
+      type inet:ipv4-address;
+      description "DR.";
+    }
+
+    leaf bdr {
+      type inet:ipv4-address;
+      description "BDR.";
+    }
+  } // interface-operation
+
+  grouping neighbor-operation {
+    description
+      "OSPF neighbor operation data.";
+
+    leaf address {
+      type inet:ip-address;
+      description
+        "Neighbor address.";
+    }
+    leaf dr {
+      type inet:ipv4-address;
+      description
+        "Designated Router.";
+    }
+    leaf bdr {
+      type inet:ipv4-address;
+      description
+        "Backup Designated Router.";
+    }
+    leaf state {
+      type nbr-state-type;
+      description
+        "OSPF neighbor state.";
+    }
+  }
+
+  grouping instance-operation {
+    description
+      "OSPF Address Family operation state.";
+    leaf router-id {
+      type yang:dotted-quad;
+      description
+        "Defined in RFC 2328. A 32-bit number
+         that uniquely identifies the router.";
+    }
+  }
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol" {
+      when "rt:type = 'ospf:ospfv2' or rt:type = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for a routing protocol instance
+         of OSPF (type 'ospfv2' or 'ospfv3').";
+    }
+    description "OSPF augmentation.";
+
+    container ospf {
+      description
+        "OSPF.";
+
+      container all-instances-inherit {
+        if-feature instance-inheritance;
+        description
+          "Inheritance support to all instances.";
+        container area {
+          description
+            "Area config to be inherited by all areas in
+            all instances.";
+        }
+        container interface {
+          description
+            "Interface config to be inherited by all interfaces
+            in all instances.";
+        }
+      }
+
+      leaf operation-mode {
+        type identityref {
+          base operation-mode;
+        }
+        default ospf:ships-in-the-night;
+        description
+          "OSPF operation mode.";
+      }
+
+      list instance {
+        key "af";
+        description
+          "An OSPF routing protocol instance.";
+
+        leaf af {
+          type identityref {
+            base rt:address-family;
+          }
+          description
+            "Address-family of the instance.";
+        }
+
+        uses instance-config;
+
+        container all-areas-inherit {
+          if-feature area-inheritance;
+          description
+            "Inheritance for all areas.";
+          container area {
+            description
+              "Area config to be inherited by all areas.";
+          }
+          container interface {
+            description
+              "Interface config to be inherited by all interfaces
+              in all areas.";
+          }
+        }
+
+        list area {
+          key "area-id";
+          description
+            "List of ospf areas";
+          leaf area-id {
+            type area-id-type;
+            description
+              "Area ID.";
+          }
+
+          uses area-config;
+
+          container all-interfaces-inherit {
+            if-feature interface-inheritance;
+            description
+              "Inheritance for all interfaces";
+            container interface {
+              description
+                "Interface config to be inherited by all
+                interfaces.";
+            }
+          }
+
+          list virtual-link {
+            /* when "../area-id != '0' and "
+               + "../area-type = 'normal'" {
+              description
+                "Transit area must be non-backbone normal area.";
+            } */
+            key "router-id";
+            description
+              "OSPF virtual link";
+            leaf router-id {
+              type yang:dotted-quad;
+              description
+                "Virtual link router ID.";
+            }
+
+            uses interface-common-config;
+          }
+
+          list sham-link {
+            key "local-id remote-id";
+            description
+              "OSPF sham link";
+            leaf local-id {
+              type inet:ip-address;
+              description
+                "Address of the local end-point.";
+            }
+            leaf remote-id {
+              type inet:ip-address;
+              description
+                "Address of the remote end-point.";
+            }
+            uses interface-common-config;
+          }
+
+          list interface {
+            key "interface";
+            description
+              "List of OSPF interfaces.";
+            leaf interface {
+              type if:interface-ref;
+              description
+                "Interface.";
+            }
+            uses interface-config;
+          } // list of interfaces
+        } // list of areas
+      } // list of instance
+    } // container ospf
+  }
+
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol/ospf:ospf/ospf:instance" {
+    /* when "../../rt:type = 'ospf:ospfv2' or
+          ../../rt:type = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for OSPF
+        (type 'ospfv2' or 'ospfv3').";
+    } */
+    if-feature multi-topology;
+    description
+      "OSPF multi-topology routing-protocol augmentation.";
+    list topology {
+      // Topology must be in the same routing-instance
+      //  and of same AF as the container.
+      key "name";
+      description "OSPF topology.";
+      leaf name {
+        type rib-ref;
+        description "RIB";
+      }
+      list area {
+        key "area-id";
+        description
+          "List of ospf areas";
+        leaf area-id {
+          type area-id-type;
+          description
+            "Area ID.";
+        }
+        uses area-config;
+      }
+    }
+  }
+
+  augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
+        + "rt:routing-protocol/ospf:ospf/ospf:instance/"
+        + "ospf:area/ospf:interface" {
+    /* when "../../../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    } */
+    if-feature ospf:multi-topology;
+    description "OSPF multi-topology interface augmentation.";
+    list topology {
+      key "name";
+      description "OSPF interface topology.";
+      leaf name {
+        type rib-ref;
+        description
+          "One of the topology enabled on this interface";
+      }
+      leaf cost {
+         type uint32;
+         description
+           "Interface cost for this topology";
+      }
+    }
+  }
+
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol" {
+    when "rt:type = 'ospf:ospfv2' or rt:type = 'ospf:ospfv3'"  {
+      description
+        "This augment is only valid for a routing protocol instance
+         of type 'ospfv2' or 'ospfv3'.";
+    }
+    description
+         "OSPF operation state.";
+    container ospf {
+      description "OSPF";
+
+      leaf operation-mode {
+        type identityref {
+          base operation-mode;
+        }
+        description
+          "OSPF operation mode.";
+      }
+
+      list instance {
+        key "af";
+        description
+          "An OSPF routing protocol instance.";
+
+        leaf af {
+          type identityref {
+            base rt:address-family;
+          }
+          description
+            "Address-family of the instance.";
+        }
+
+        uses instance-operation;
+
+        list area {
+          key "area-id";
+          description "List of OSPF areas";
+          leaf area-id {
+            type area-id-type;
+            description "Area ID.";
+          }
+          list interfaces {
+            key "interface";
+            description
+              "List of OSPF interfaces.";
+            leaf interface {
+              // Should it refer to config state leaf?
+              //type if:interface-ref;
+              type string;
+              description "Interface.";
+            }
+
+            uses interface-operation;
+
+            list neighbor {
+              key "neighbor-id";
+              description
+                "List of OSPF neighbors.";
+              leaf neighbor-id {
+                type inet:ipv4-address;
+                description
+                  "Neighbor ID.";
+              }
+
+              uses neighbor-operation;
+            } // list of OSPF neighbors
+
+            list link-scope-lsas {
+              when "../../../../../rt:type = 'ospfv3'" {
+                description
+                  "Link scope LSA only exists in OSPFv3.";
+              }
+              key "lsa-type";
+              description "List OSPF link scope LSA databases";
+              leaf lsa-type {
+                type uint8;
+                description "OSPF link scope LSA type.";
+              }
+              list link-scope-lsa {
+                key "lsa-id adv-router";
+                description "List of OSPF link scope LSAs";
+                uses lsa-key;
+                uses lsa {
+                  refine "version/v2/ospfv2" {
+                    must "../../../../../../../rt:type = 'ospfv2'" {
+                      description "OSPFv2 LSA";
+                    }
+                  }
+                  refine "version/v3/ospfv3" {
+                    must "../../../../../../../rt:type = 'ospfv3'" {
+                      description "OSPFv3 LSA";
+                    }
+                  }
+                }
+              }
+            } // list link-scope-lsas
+          } // list of OSPF interfaces
+          list area-scope-lsas {
+            key "lsa-type";
+            description "List OSPF area scope LSA databases";
+            leaf lsa-type {
+              type uint8;
+              description "OSPF area scope LSA type.";
+            }
+            list area-scope-lsa {
+              key "lsa-id adv-router";
+              description "List of OSPF area scope LSAs";
+              uses lsa-key;
+              uses lsa {
+                refine "version/v2/ospfv2" {
+                  must "../../../../../../rt:type = 'ospfv2'" {
+                    description "OSPFv2 LSA";
+                  }
+                }
+                refine "version/v3/ospfv3" {
+                  must "../../../../../../rt:type = 'ospfv3'" {
+                    description "OSPFv3 LSA";
+                  }
+                }
+              }
+            }
+          } // list area-scope-lsas
+        } // list of OSPF areas
+
+        list as-scope-lsas {
+          key "lsa-type";
+          description "List OSPF AS scope LSA databases";
+          leaf lsa-type {
+            type uint8;
+            description "OSPF AS scope LSA type.";
+          }
+          list as-scope-lsa {
+            key "lsa-id adv-router";
+            description "List of OSPF AS scope LSAs";
+            uses lsa-key;
+            uses lsa {
+              refine "version/v2/ospfv2" {
+                must "../../../../../rt:type = 'ospfv2'" {
+                  description "OSPFv2 LSA";
+                }
+              }
+              refine "version/v3/ospfv3" {
+                must "../../../../../rt:type = 'ospfv3'" {
+                  description "OSPFv3 LSA";
+                }
+              }
+            }
+          }
+        } // list as-scope-lsas
+      } // list of instances
+    } // container ospf
+  }
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol/"
+        + "ospf:ospf/ospf:instance" {
+    when "../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    }
+    if-feature multi-topology;
+    description
+      "OSPF multi-topology routing-protocol augmentation.";
+    list topology {
+      // Topology must be in the same routing-instance
+      // and of same AF as the container.
+      key "name";
+      description "OSPF topology.";
+      leaf name {
+        type rib-ref;
+        description "RIB";
+      }
+      list area {
+        key "area-id";
+        description
+          "List of ospf areas";
+        leaf area-id {
+          type area-id-type;
+          description
+            "Area ID.";
+        }
+      }
+    }
+  }
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:routing-protocols/rt:routing-protocol/"
+        + "ospf:ospf/ospf:instance/ospf:area/ospf:interfaces" {
+    when "../../../../rt:type = 'ospf:ospfv2'" {
+      description
+        "This augment is only valid for OSPFv2.";
+    }
+    if-feature ospf:multi-topology;
+    description "OSPF multi-topology interface augmentation.";
+    list topology {
+      key "name";
+      description "OSPF interface topology.";
+      leaf name {
+        type rib-ref;
+        description
+          "One of the topology enabled on this interface";
+      }
+    }
+  }
+  grouping route-content {
+    description
+      "This grouping defines OSPF-specific route attributes.";
+    /* moved to ietf-routing
+    leaf metric {
+      type uint32;
+      description "OSPF route metric.";
+    } */
+    leaf tag {
+      type uint32;
+      default "0";
+      description "OSPF route tag.";
+    }
+    leaf route-type {
+      type enumeration {
+        enum intra-area {
+          description "OSPF intra-area route";
+        }
+        enum inter-area {
+          description "OSPF inter-area route";
+        }
+        enum external-1 {
+          description "OSPF external route type 1";
+        }
+        enum external-2 {
+          description "OSPF External route type 2";
+        }
+        enum nssa-1 {
+          description "OSPF NSSA external route type 1";
+        }
+        enum nssa-2 {
+          description "OSPF NSSA external route type 2";
+        }
+      }
+      description "OSPF route type";
+    }
+  }
+
+  augment "/rt:routing-state/rt:routing-instance/"
+        + "rt:ribs/rt:rib/rt:routes/rt:route" {
+    when "rt:source-protocol = 'ospf:ospfv2' or "
+       + "rt:source-protocol = 'ospf:ospfv3'" {
+      description
+        "This augment is only valid for a routes whose source
+         protocol is OSPF.";
+      }
+     description
+       "OSPF-specific route attributes.";
+     uses route-content;
+  }
+
+  identity if-link-type {
+    description "Base identity for OSPF interface link type.";
+  }
+
+  identity if-link-type-normal {
+    base if-link-type;
+    description "OSPF interface link type normal.";
+  }
+
+  identity if-link-type-virtual-link {
+    base if-link-type;
+    description "OSPF interface link type virtual link.";
+  }
+
+  identity if-link-type-sham-link {
+    base if-link-type;
+    description "OSPF interface link type sham link.";
+  }
+
+  grouping notification-instance-hdr {
+    description
+     "This group describes common instance specific
+      data for notifications.";
+
+    leaf routing-instance {
+      type rt:routing-instance-ref;
+      description
+        "Describe the routing instance.";
+    }
+
+    leaf routing-protocol-name {
+      type string;
+      description
+       "Describes the name of the OSPF routing protocol.";
+    }
+
+    container instance-af {
+      leaf af {
+        type identityref {
+          base rt:address-family;
+        }
+        description
+          "Address-family of the instance.";
+      }
+      description
+       "Describes the address family of the OSPF instance.";
+    }
+  }
+
+  notification if-state-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf state {
+      //type if-state-type;
+      type string;
+      description "Interface state.";
+    }
+
+    description
+      "This notification is sent when interface
+      state change is detected.";
+  }
+
+  notification if-config-error {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf packet-source {
+        type yang:dotted-quad;
+        description "Source address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf packet-type {
+      type packet-type;
+      description "OSPF packet type.";
+    }
+
+    leaf error {
+      type enumeration {
+        enum "badVersion" {
+          description "Bad version";
+        }
+        enum "areaMismatch" {
+          description "Area mistmatch";
+        }
+        enum "unknownNbmaNbr" {
+          description "Unknown NBMA neighbor";
+        }
+        enum "unknownVirtualNbr" {
+          description "Unknown virtual link neighbor";
+        }
+        enum "authTypeMismatch" {
+          description "Auth type mismatch";
+        }
+        enum "authFailure" {
+          description "Auth failure";
+        }
+        enum "netMaskMismatch" {
+          description "Network mask mismatch";
+        }
+        enum "helloIntervalMismatch" {
+          description "Hello interval mismatch";
+        }
+        enum "deadIntervalMismatch" {
+          description "Dead interval mismatch";
+        }
+        enum "optionMismatch" {
+          description "Option mismatch";
+        }
+        enum "mtuMismatch" {
+          description "MTU mismatch";
+        }
+        enum "duplicateRouterId" {
+          description "Duplicate router ID";
+        }
+        enum "noError" {
+          description "No error";
+        }
+      }
+      description "Error code.";
+    }
+    description
+      "This notification is sent when interface
+      config error is detected.";
+  }
+
+  notification nbr-state-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+
+    leaf state {
+        type nbr-state-type;
+      description "Neighbor state.";
+    }
+
+    description
+      "This notification is sent when neighbor
+      state change is detected.";
+  }
+
+  notification nbr-restart-helper-status-change {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+      leaf neighbor-ip-addr {
+        type yang:dotted-quad;
+        description "Neighbor address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    leaf status {
+      type restart-helper-status-type;
+      description "Restart helper status.";
+    }
+
+    leaf age {
+      type uint32;
+      units seconds;
+      description
+        "Remaining time in current OSPF graceful restart
+        interval, if the router is acting as a restart
+        helper for the neighbor.";
+    }
+
+    leaf exit-reason {
+      type restart-exit-reason-type;
+      description
+        "Restart helper exit reason.";
+    }
+    description
+      "This notification is sent when neighbor restart
+      helper status change is detected.";
+  }
+
+  notification rx-bad-packet {
+    uses notification-instance-hdr;
+
+    leaf link-type {
+      type identityref {
+        base if-link-type;
+      }
+      description "Type of OSPF interface.";
+    }
+
+    container interface {
+      description "Normal interface.";
+      leaf interface {
+        type if:interface-ref;
+        description "Interface.";
+      }
+      leaf packet-source {
+        type yang:dotted-quad;
+        description "Source address.";
+      }
+    }
+    container virtual-link {
+      description "virtual-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf neighbor-router-id {
+        type yang:dotted-quad;
+        description "Neighbor router id.";
+      }
+    }
+
+    container sham-link {
+      description "sham-link.";
+      leaf area-id {
+        type uint32;
+        description "Area ID.";
+      }
+      leaf local-ip-addr {
+        type inet:ip-address;
+        description "Sham link local address.";
+      }
+
+      leaf remote-ip-addr {
+        type inet:ip-address;
+        description "Sham link remote address.";
+      }
+    }
+
+    leaf packet-type {
+      type packet-type;
+      description "OSPF packet type.";
+    }
+
+    description
+      "This notification is sent when an OSPF packet
+      has been received on a interface that cannot be parsed.";
+  }
+
+  notification lsdb-approaching-overflow {
+    uses notification-instance-hdr;
+
+    leaf ext-lsdb-limit {
+      type uint32;
+      description
+        "The maximum number of non-default AS-external LSAs
+        entries that can be stored in the link state database.";
+    }
+
+    description
+      "This notification is sent when the number of LSAs
+      in the router's link state database has exceeded
+      ninety percent of the ext-lsdb-limit.";
+  }
+
+  notification lsdb-overflow {
+    uses notification-instance-hdr;
+
+    leaf ext-lsdb-limit {
+      type uint32;
+      description
+        "The maximum number of non-default AS-external LSAs
+        entries that can be stored in the link state database.";
+    }
+
+    description
+      "This notification is sent when the number of LSAs
+      in the router's link state database has exceeded
+      ext-lsdb-limit.";
+  }
+
+  notification nssa-translator-status-change {
+    uses notification-instance-hdr;
+
+    leaf area-id {
+      type uint32;
+      description "Area ID.";
+    }
+
+    leaf status {
+      type nssa-translator-state-type;
+      description
+        "NSSA translator status.";
+    }
+
+    description
+      "This notification is sent when there is a change
+      in the router's ability to translate OSPF NSSA LSAs
+      OSPF AS-External LSAs.";
+  }
+
+  notification restart-status-change {
+    uses notification-instance-hdr;
+
+    leaf status {
+      type restart-status-type;
+      description
+        "Restart status.";
+    }
+
+    leaf restart-interval {
+      type uint16 {
+        range "1..1800";
+      }
+      units seconds;
+      default "120";
+      description
+        "Restart interval.";
+    }
+
+    leaf exit-reason {
+      type restart-exit-reason-type;
+      description
+        "Restart exit reason.";
+    }
+
+    description
+      "This notification is sent when the graceful restart
+      state for the router has changed.";
+  }
+}
+
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring-ann.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring-ann.yang
new file mode 100644
index 000000000..4e39cb6bf
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring-ann.yang
@@ -0,0 +1,38 @@
+module ietf-restconf-monitoring-ann {
+  namespace "urn:dummy";
+  prefix dummy;
+
+  import tailf-common {
+    prefix tailf;
+  }
+  import ietf-restconf-monitoring {
+    prefix rcm;
+  }
+
+  description
+    "Annotation module for ietf-restconf-monitoring.
+
+    Adds tailf:info statements for a better CLI / WebUI experience,
+    and adds the callpoints necessary for using this module with
+    ConfD.";
+
+  tailf:annotate "/rcm:restconf-state" {
+    tailf:callpoint "rcagent" {
+      tailf:internal;
+    }
+    tailf:info "Statistics about RESTCONF";
+
+    tailf:annotate "rcm:capabilities" {
+      tailf:info "Capabilities supported by the RESTCONF server";
+
+      tailf:annotate "rcm:capability" {
+        tailf:info "Capabilities supported by the RESTCONF server";
+        tailf:cli-list-syntax;
+      }
+    }
+    tailf:annotate "rcm:streams" {
+      tailf:info "Notification event streams supported by the server";
+      tailf:cli-suppress-show-path;
+    }
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring.yang
new file mode 100644
index 000000000..389c9bc0d
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-restconf-monitoring.yang
@@ -0,0 +1,155 @@
+module ietf-restconf-monitoring {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring";
+  prefix "rcmon";
+
+  import ietf-yang-types { prefix yang; }
+  import ietf-inet-types { prefix inet; }
+
+     organization
+       "IETF NETCONF (Network Configuration) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netconf/>
+        WG List:  <mailto:netconf@ietf.org>
+
+        Author:   Andy Bierman
+                  <mailto:andy@yumaworks.com>
+
+        Author:   Martin Bjorklund
+                  <mailto:mbj@tail-f.com>
+
+        Author:   Kent Watsen
+                  <mailto:kwatsen@juniper.net>";
+
+     description
+       "This module contains monitoring information for the
+        RESTCONF protocol.
+
+        Copyright (c) 2016 IETF Trust and the persons identified as
+        authors of the code.  All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject
+        to the license terms contained in, the Simplified BSD License
+        set forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        This version of this YANG module is part of RFC XXXX; see
+        the RFC itself for full legal notices.";
+
+     // RFC Ed.: replace XXXX with actual RFC number and remove this
+     // note.
+
+     // RFC Ed.: remove this note
+     // Note: extracted from draft-ietf-netconf-restconf-16.txt
+
+     // RFC Ed.: update the date below with the date of RFC publication
+     // and remove this note.
+     revision 2016-08-15 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: RESTCONF Protocol.";
+     }
+
+     container restconf-state {
+       config false;
+       description
+         "Contains RESTCONF protocol monitoring information.";
+
+       container capabilities {
+         description
+           "Contains a list of protocol capability URIs";
+
+         leaf-list capability {
+           type inet:uri;
+           description "A RESTCONF protocol capability URI.";
+         }
+       }
+
+       container streams {
+         description
+           "Container representing the notification event streams
+            supported by the server.";
+          reference
+            "RFC 5277, Section 3.4, <streams> element.";
+
+          list stream {
+            key name;
+           description
+             "Each entry describes an event stream supported by
+              the server.";
+
+           leaf name {
+             type string;
+             description "The stream name";
+             reference "RFC 5277, Section 3.4, <name> element.";
+           }
+
+           leaf description {
+             type string;
+             description "Description of stream content";
+             reference
+               "RFC 5277, Section 3.4, <description> element.";
+           }
+
+           leaf replay-support {
+             type boolean;
+             default false;
+             description
+               "Indicates if replay buffer supported for this stream.
+                If 'true', then the server MUST support the 'start-time'
+                and 'stop-time' query parameters for this stream.";
+             reference
+               "RFC 5277, Section 3.4, <replaySupport> element.";
+           }
+
+           leaf replay-log-creation-time {
+             when "../replay-support" {
+               description
+                 "Only present if notification replay is supported";
+             }
+             type yang:date-and-time;
+             description
+               "Indicates the time the replay log for this stream
+                was created.";
+             reference
+               "RFC 5277, Section 3.4, <replayLogCreationTime>
+                element.";
+           }
+
+           list access {
+             key encoding;
+             min-elements 1;
+             description
+               "The server will create an entry in this list for each
+                encoding format that is supported for this stream.
+                The media type 'text/event-stream' is expected
+                for all event streams. This list identifies the
+                sub-types supported for this stream.";
+
+             leaf encoding {
+               type string;
+               description
+                 "This is the secondary encoding format within the
+                  'text/event-stream' encoding used by all streams.
+                  The type 'xml' is supported for XML encoding.
+
+                  The type 'json' is supported for JSON encoding.";
+             }
+
+             leaf location {
+               type inet:uri;
+               mandatory true;
+               description
+                 "Contains a URL that represents the entry point
+                  for establishing notification delivery via server
+                  sent events.";
+             }
+           }
+          }
+       }
+     }
+
+}
\ No newline at end of file
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-routing.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-routing.yang
new file mode 100644
index 000000000..727652545
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-routing.yang
@@ -0,0 +1,718 @@
+   module ietf-routing {
+
+     namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
+
+     prefix "rt";
+
+     import ietf-yang-types {
+       prefix "yang";
+     }
+
+     import ietf-interfaces {
+       prefix "if";
+     }
+
+     organization
+       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+     contact
+       "WG Web:   <http://tools.ietf.org/wg/netmod/>
+        WG List:  <mailto:netmod@ietf.org>
+
+        WG Chair: Thomas Nadeau
+                  <mailto:tnadeau@lucidvision.com>
+
+        WG Chair: Juergen Schoenwaelder
+                  <mailto:j.schoenwaelder@jacobs-university.de>
+
+        Editor:   Ladislav Lhotka
+                  <mailto:lhotka@nic.cz>";
+
+     description
+       "This YANG module defines essential components for the management
+        of a routing subsystem.
+
+        Copyright (c) 2014 IETF Trust and the persons identified as
+        authors of the code. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without modification, is permitted pursuant to, and subject to
+        the license terms contained in, the Simplified BSD License set
+        forth in Section 4.c of the IETF Trust's Legal Provisions
+        Relating to IETF Documents
+        (http://trustee.ietf.org/license-info).
+
+        The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
+        NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and
+        'OPTIONAL' in the module text are to be interpreted as described
+        in RFC 2119 (http://tools.ietf.org/html/rfc2119).
+
+        This version of this YANG module is part of RFC XXXX
+        (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for
+        full legal notices.";
+
+     revision 2015-05-25 {
+       description
+         "Initial revision.";
+       reference
+         "RFC XXXX: A YANG Data Model for Routing Management";
+     }
+
+     /* Features */
+
+     feature multiple-ribs {
+       description
+         "This feature indicates that the server supports user-defined
+          RIBs.
+
+          Servers that do not advertise this feature SHOULD provide
+          exactly one system-controlled RIB per routing-instance and
+          supported address family and make them also the default RIBs.
+          These RIBs then appear as entries of the list
+          /routing-state/routing-instance/ribs/rib.";
+     }
+
+     feature router-id {
+       description
+         "This feature indicates that the server supports configuration
+          of an explicit 32-bit router ID that is used by some routing
+          protocols.
+
+          Servers that do not advertise this feature set a router ID
+          algorithmically, usually to one of configured IPv4 addresses.
+          However, this algorithm is implementation-specific.";
+     }
+
+     /* Identities */
+
+     identity address-family {
+       description
+         "Base identity from which identities describing address
+          families are derived.";
+     }
+
+     identity ipv4 {
+       base address-family;
+       description
+         "This identity represents IPv4 address family.";
+     }
+
+     identity ipv6 {
+       base address-family;
+       description
+         "This identity represents IPv6 address family.";
+     }
+
+     identity routing-instance {
+       description
+         "Base identity from which identities describing routing
+          instance types are derived.";
+     }
+
+     identity default-routing-instance {
+       base routing-instance;
+       description
+         "This identity represents either a default routing instance, or
+          the only routing instance on systems that do not support
+          multiple instances.";
+     }
+
+     identity vrf-routing-instance {
+       base routing-instance;
+       description
+         "This identity represents a VRF routing instance. The type is
+          distinct from the default-routing-instance. There may be
+          multiple vrf-routing-interfaces.";
+     }
+
+     identity routing-protocol {
+       description
+         "Base identity from which routing protocol identities are
+          derived.";
+     }
+
+     identity direct {
+       base routing-protocol;
+       description
+         "Routing pseudo-protocol that provides routes to directly
+          connected networks.";
+     }
+
+     identity static {
+       base routing-protocol;
+       description
+         "Static routing pseudo-protocol.";
+     }
+
+     /* Type Definitions */
+
+     typedef routing-instance-ref {
+       type leafref {
+         path "/rt:routing/rt:routing-instance/rt:name";
+       }
+       description
+         "This type is used for leafs that reference a routing instance
+          configuration.";
+     }
+
+     typedef routing-instance-state-ref {
+       type leafref {
+         path "/rt:routing-state/rt:routing-instance/rt:name";
+       }
+       description
+         "This type is used for leafs that reference state data of a
+          routing instance.";
+     }
+
+     typedef route-preference {
+       type uint32;
+       description
+         "This type is used for route preferences.";
+     }
+
+     /* Groupings */
+
+     grouping address-family {
+       description
+         "This grouping provides a leaf identifying an address
+          family.";
+       leaf address-family {
+         type identityref {
+           base address-family;
+         }
+         mandatory "true";
+         description
+           "Address family.";
+       }
+     }
+
+     grouping router-id {
+       description
+         "This grouping provides router ID.";
+       leaf router-id {
+         type yang:dotted-quad;
+         description
+           "A 32-bit number in the form of a dotted quad that is used by
+            some routing protocols identifying a router.";
+         reference
+           "RFC 2328: OSPF Version 2.";
+       }
+     }
+
+     grouping special-next-hop {
+       description
+         "This grouping provides a leaf with an enumeration of special
+          next-hops.";
+       leaf special-next-hop {
+         type enumeration {
+           enum blackhole {
+             description
+               "Silently discard the packet.";
+           }
+           enum unreachable {
+             description
+               "Discard the packet and notify the sender with an error
+                message indicating that the destination host is
+                unreachable.";
+           }
+           enum prohibit {
+             description
+               "Discard the packet and notify the sender with an error
+                message indicating that the communication is
+                administratively prohibited.";
+           }
+           enum receive {
+             description
+               "The packet will be received by the local system.";
+           }
+         }
+         description
+           "Special next-hop options.";
+       }
+     }
+
+     grouping next-hop-content {
+       description
+         "Generic parameters of next-hops in static routes.";
+       choice next-hop-options {
+         mandatory "true";
+         description
+           "Options for next-hops in static routes.
+
+            It is expected that other cases will be added through
+            augments from other modules, e.g., for Equal-Cost Multipath
+            routing (ECMP).";
+         case simple-next-hop {
+           description
+             "Simple next-hop is specified as an outgoing interface,
+              next-hop address or both.
+
+              Address-family-specific modules are expected to provide
+              'next-hop-address' leaf via augmentation.";
+           leaf outgoing-interface {
+             // type leafref {
+             //   path "/rt:routing/rt:routing-instance/rt:interfaces/"
+             //      + "rt:interface";
+             // }
+             type string;
+             description
+               "Name of the outgoing interface.";
+           }
+         }
+         case special-next-hop {
+           uses special-next-hop;
+         }
+       }
+     }
+
+     grouping next-hop-state-content {
+       description
+         "Generic parameters of next-hops in state data.";
+       choice next-hop-options {
+         mandatory "true";
+         description
+           "Options for next-hops in state data.
+
+            It is expected that other cases will be added through
+            augments from other modules, e.g., for ECMP or recursive
+            next-hops.";
+         case simple-next-hop {
+           description
+             "Simple next-hop is specified as an outgoing interface,
+              next-hop address or both.
+
+              Address-family-specific modules are expected to provide
+              'next-hop-address' leaf via augmentation.";
+           leaf outgoing-interface {
+             // type leafref {
+             //   path "/rt:routing-state/rt:routing-instance/"
+             //      + "rt:interfaces/rt:interface";
+             // }
+             type string;
+             description
+               "Name of the outgoing interface.";
+           }
+           leaf next-hop-address {
+             description
+               "IP address.";
+             type string;
+           }
+
+         }
+         case special-next-hop {
+           uses special-next-hop;
+         }
+       }
+     }
+
+     grouping route-metadata {
+       description
+         "Common route metadata.";
+       leaf source-protocol {
+         type identityref {
+           base routing-protocol;
+         }
+         mandatory "true";
+         description
+           "Type of the routing protocol from which the route
+            originated.";
+       }
+       leaf active {
+         type empty;
+         description
+           "Presence of this leaf indicates that the route is preferred
+            among all routes in the same RIB that have the same
+            destination prefix.";
+       }
+       leaf last-updated {
+         type yang:date-and-time;
+         description
+           "Time stamp of the last modification of the route. If the
+            route was never modified, it is the time when the route was
+            inserted into the RIB.";
+       }
+     }
+
+     /* State data */
+
+     augment "/if:interfaces-state/if:interface" {
+       description
+         "This augment adds a wrapped leaf-list to interface state
+          data.";
+       leaf routing-instance {
+         // type routing-instance-state-ref;
+         type string;
+         must "../if:name=/rt:routing-state/"
+            + "rt:routing-instance[rt:name=current()]/rt:interfaces/"
+            + "rt:interface" {
+           error-message
+             "The interface is not assigned to the routing instance.";
+           description
+             "The reference must mirror a corresponding assignment under
+              routing-instance.";
+         }
+         description
+           "The name of the routing instance to which the interface is
+            assigned.";
+       }
+     }
+
+     container routing-state {
+       config "false";
+       description
+         "State data of the routing subsystem.";
+       list routing-instance {
+         key "name";
+         min-elements "1";
+         description
+           "Each list entry is a container for state data of a routing
+            instance.
+
+            An implementation MUST support routing instance(s) of the
+            type 'rt:default-routing-instance', and MAY support other
+            types. An implementation MAY restrict the number of routing
+            instances of each supported type.
+
+            An implementation SHOULD create at least one
+            system-controlled instance, and MAY allow the clients to
+            create user-controlled routing instances in
+            configuration.";
+         leaf name {
+           type string;
+           description
+             "The name of the routing instance.
+
+              For system-controlled instances the name is persistent,
+              i.e., it SHOULD NOT change across reboots.";
+         }
+         leaf type {
+           type identityref {
+             base routing-instance;
+           }
+           description
+             "The routing instance type.";
+         }
+         uses router-id {
+           description
+             "Global router ID.
+
+              It may be either configured or assigned algorithmically by
+              the implementation.";
+         }
+         container interfaces {
+           description
+             "Network layer interfaces belonging to the routing
+              instance.";
+           leaf-list interface {
+             type if:interface-state-ref;
+             description
+               "Each entry is a reference to the name of a configured
+                network layer interface.";
+           }
+         }
+         container routing-protocols {
+           description
+             "Container for the list of routing protocol instances.";
+           list routing-protocol {
+             key "type name";
+             description
+               "State data of a routing protocol instance.
+
+                An implementation MUST provide exactly one
+                system-controlled instance of the type 'direct'. Other
+                instances MAY be created by configuration.";
+             leaf type {
+               type identityref {
+                 base routing-protocol;
+               }
+               description
+                 "Type of the routing protocol.";
+             }
+             leaf name {
+               type string;
+               description
+                 "The name of the routing protocol instance.
+
+                  For system-controlled instances this name is
+                  persistent, i.e., it SHOULD NOT change across
+                  reboots.";
+             }
+           }
+         }
+         container ribs {
+           description
+             "Container for RIBs.";
+           list rib {
+             key "name";
+             min-elements "1";
+             description
+               "Each entry represents a RIB identified by the 'name'
+                key. All routes in a RIB MUST belong to the same address
+                family.
+
+                For each routing instance, an implementation SHOULD
+                provide one system-controlled default RIB for each
+                supported address family.";
+             leaf name {
+               type string;
+               description
+                 "The name of the RIB.";
+             }
+             uses address-family;
+             leaf default-rib {
+               if-feature multiple-ribs;
+               type boolean;
+               default "true";
+               description
+                 "This flag has the value of 'true' if and only if the
+                  RIB is the default RIB for the given address family.
+
+                  A default RIB always receives direct routes. By
+                  default it also receives routes from all routing
+                  protocols.";
+             }
+             container routes {
+               description
+                 "Current content of the RIB.";
+               list route {
+                 key "destination-prefix";
+                 description
+                   "A RIB route entry. This data node MUST be augmented
+                    with information specific for routes of each address
+                    family.";
+                 leaf route-preference {
+                   type route-preference;
+                   description
+                     "This route attribute, also known as administrative
+                      distance, allows for selecting the preferred route
+                      among routes with the same destination prefix. A
+                      smaller value means a more preferred route.";
+                 }
+                 leaf destination-prefix {
+                   description 
+                     "Destination IP address with prefix";
+                   type string;
+                 }
+                 leaf metric {
+                   type uint32;
+                   description "Route metric.";
+                 }
+                 container next-hop {
+                   description
+                     "Route's next-hop attribute.";
+                   uses next-hop-state-content;
+                 }
+                 uses route-metadata;
+                 leaf update-source {
+                   type string;
+                   description
+                     "Update source for the route.";
+                 }
+               }
+             }
+           }
+         }
+       }
+     }
+
+     /* Configuration Data */
+
+     container routing {
+       description
+         "Configuration parameters for the routing subsystem.";
+       list routing-instance {
+         key "name";
+         description
+           "Configuration of a routing instance.";
+         leaf name {
+           type string;
+           description
+             "The name of the routing instance.
+
+              For system-controlled entries, the value of this leaf must
+              be the same as the name of the corresponding entry in
+              state data.
+
+              For user-controlled entries, an arbitrary name can be
+              used.";
+         }
+         leaf type {
+           type identityref {
+             base routing-instance;
+           }
+           default "rt:default-routing-instance";
+           description
+             "The type of the routing instance.";
+         }
+         leaf enabled {
+           type boolean;
+           default "true";
+           description
+             "Enable/disable the routing instance.
+
+              If this parameter is false, the parent routing instance is
+              disabled and does not appear in state data, despite any
+              other configuration that might be present.";
+         }
+         uses router-id {
+           if-feature router-id;
+           description
+             "Configuration of the global router ID. Routing protocols
+              that use router ID can use this parameter or override it
+              with another value.";
+         }
+         leaf description {
+           type string;
+           description
+             "Textual description of the routing instance.";
+         }
+         container interfaces {
+           description
+             "Assignment of the routing instance's interfaces.";
+           leaf-list interface {
+             type if:interface-ref;
+             description
+               "The name of a configured network layer interface to be
+                assigned to the routing-instance.";
+           }
+         }
+         container routing-protocols {
+           description
+             "Configuration of routing protocol instances.";
+           list routing-protocol {
+             key "type name";
+             description
+               "Each entry contains configuration of a routing protocol
+                instance.";
+             leaf type {
+               type identityref {
+                 base routing-protocol;
+               }
+               description
+                 "Type of the routing protocol - an identity derived
+                  from the 'routing-protocol' base identity.";
+             }
+             leaf name {
+               type string;
+               description
+                 "An arbitrary name of the routing protocol instance.";
+             }
+             leaf description {
+               type string;
+               description
+                 "Textual description of the routing protocol
+                  instance.";
+             }
+             container static-routes {
+               when "../type='rt:static'" {
+                 description
+                   "This container is only valid for the 'static'
+                    routing protocol.";
+               }
+               description
+                 "Configuration of the 'static' pseudo-protocol.
+
+                  Address-family-specific modules augment this node with
+                  their lists of routes.";
+             }
+           }
+         }
+         container ribs {
+           description
+             "Configuration of RIBs.";
+           list rib {
+             key "name";
+             description
+               "Each entry contains configuration for a RIB identified
+                by the 'name' key.
+
+                Entries having the same key as a system-controlled entry
+                of the list /routing-state/routing-instance/ribs/rib are
+                used for configuring parameters of that entry. Other
+                entries define additional user-controlled RIBs.";
+             leaf name {
+               type string;
+               description
+                 "The name of the RIB.
+
+                  For system-controlled entries, the value of this leaf
+                  must be the same as the name of the corresponding
+                  entry in state data.
+
+                  For user-controlled entries, an arbitrary name can be
+                  used.";
+             }
+             uses address-family {
+               description
+                 "Address family of the RIB.
+
+                  It is mandatory for user-controlled RIBs. For
+                  system-controlled RIBs it can be omitted, otherwise it
+                  must match the address family of the corresponding
+                  state entry.";
+               refine "address-family" {
+                 mandatory "false";
+               }
+             }
+             leaf description {
+               type string;
+               description
+                 "Textual description of the RIB.";
+             }
+           }
+         }
+       }
+     }
+
+     /* RPC operations */
+
+     rpc fib-route {
+       description
+         "Return the active FIB route that a routing-instance uses for
+          sending packets to a destination address.";
+       input {
+         leaf routing-instance-name {
+           // type routing-instance-state-ref;
+           type string;
+           mandatory "true";
+           description
+             "Name of the routing instance whose forwarding information
+              base is being queried.
+
+              If the routing instance with name equal to the value of
+              this parameter doesn't exist, then this operation SHALL
+              fail with error-tag 'data-missing' and error-app-tag
+              'routing-instance-not-found'.";
+         }
+         container destination-address {
+           description
+             "Network layer destination address.
+
+              Address family specific modules MUST augment this
+              container with a leaf named 'address'.";
+           uses address-family;
+         }
+       }
+       output {
+         container route {
+           description
+             "The active FIB route for the specified destination.
+
+              If the routing instance has no active FIB route for the
+              destination address, no output is returned - the server
+              SHALL send an <rpc-reply> containing a single element
+              <ok>.
+
+              Address family specific modules MUST augment this list
+              with appropriate route contents.";
+           uses address-family;
+           container next-hop {
+             description
+               "Route's next-hop attribute.";
+             uses next-hop-state-content;
+           }
+           uses route-metadata;
+         }
+       }
+     }
+   }
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-syslog-types.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-syslog-types.yang
new file mode 100644
index 000000000..16cc3ed14
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-syslog-types.yang
@@ -0,0 +1,240 @@
+module ietf-syslog-types {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-syslog-types";
+  prefix syslogtypes;
+
+  organization "IETF NETMOD (NETCONF Data Modeling Language) Working 
+                Group";
+  contact
+    "WG Web:   <http://tools.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+     
+     WG Chair: Tom Nadeau
+               <mailto:tnadeau@lucidvision.com>
+     
+     WG Chair: Kent Watsen
+               <mailto:kwatsen@juniper.net>
+     
+     Editor:   Ladislav Lhotka
+               <mailto:lhotka@nic.cz>";
+  description
+    "This module contains a collection of YANG type definitions for 
+     SYSLOG.";
+
+  revision 2015-11-09 {
+    description
+      "Initial Revision";
+    reference
+      "This model references RFC 5424 - The Syslog Protocol, 
+       and RFC 5848 - Signed Syslog Messages.";
+  }
+
+  typedef severity {
+    type enumeration {
+      enum "emergency" {
+        value 0;
+        description
+          "Emergency Level Msg";
+      }
+      enum "alert" {
+        value 1;
+        description
+          "Alert Level Msg";
+      }
+      enum "critical" {
+        value 2;
+        description
+          "Critical Level Msg";
+      }
+      enum "error" {
+        value 3;
+        description
+          "Error Level Msg";
+      }
+      enum "warning" {
+        value 4;
+        description
+          "Warning Level Msg";
+      }
+      enum "notice" {
+        value 5;
+        description
+          "Notification Level Msg";
+      }
+      enum "info" {
+        value 6;
+        description
+          "Informational Level Msg";
+      }
+      enum "debug" {
+        value 7;
+        description
+          "Debugging Level Msg";
+      }
+    }
+    description
+      "The definitions for Syslog message severity as per RFC 5424.";
+  }
+
+  identity syslog-facility {
+    description
+      "The base identity to represent syslog facilities";
+  }
+
+  identity kern {
+    base syslog-facility;
+    description
+      "The facility for kernel messages as defined in RFC 5424.";
+  }
+
+  identity user {
+    base syslog-facility;
+    description
+      "The facility for user-level messages as defined in RFC 5424.";
+  }
+
+  identity mail {
+    base syslog-facility;
+    description
+      "The facility for the mail system as defined in RFC 5424.";
+  }
+
+  identity daemon {
+    base syslog-facility;
+    description
+      "The facility for the system daemons as defined in RFC 5424.";
+   }
+
+  identity auth {
+    base syslog-facility;
+    description
+      "The facility for security/authorization messages as defined 
+       in RFC 5424.";
+  }
+
+  identity syslog {
+    base syslog-facility;
+    description
+      "The facility for messages generated internally by syslogd 
+       facility as defined in RFC 5424.";
+  }
+
+  identity lpr {
+    base syslog-facility;
+    description
+      "The facility for the line printer subsystem as defined in 
+       RFC 5424.";
+  }
+
+  identity news {
+    base syslog-facility;
+    description
+      "The facility for the network news subsystem as defined in 
+       RFC 5424.";
+  }
+
+  identity uucp {
+    base syslog-facility;
+    description
+      "The facility for the UUCP subsystem as defined in RFC 5424.";
+  }
+
+  identity cron {
+    base syslog-facility;
+    description
+      "The facility for the clock daemon as defined in RFC 5424.";
+  }
+
+  identity authpriv {
+    base syslog-facility;
+    description
+      "The facility for privileged security/authorization messages 
+       as defined in RFC 5424.";
+  }
+
+  identity ftp {
+    base syslog-facility;
+    description
+      "The facility for the FTP daemon as defined in RFC 5424.";
+  }
+
+  identity ntp {
+    base syslog-facility;
+    description
+      "The facility for the NTP subsystem as defined in RFC 5424.";
+  }
+
+  identity audit {
+    base syslog-facility;
+    description
+      "The facility for log audit messages as defined in RFC 5424.";
+  }
+
+  identity console {
+    base syslog-facility;
+    description
+      "The facility for log alert messages as defined in RFC 5424.";
+  }
+
+  identity cron2 {
+    base syslog-facility;
+    description
+      "The facility for the second clock daemon as defined in 
+       RFC 5424.";
+  }
+
+  identity local0 {
+    base syslog-facility;
+    description
+      "The facility for local use 0 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local1 {
+    base syslog-facility;
+    description
+      "The facility for local use 1 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local2 {
+    base syslog-facility;
+    description
+      "The facility for local use 2 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local3 {
+    base syslog-facility;
+    description
+      "The facility for local use 3 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local4 {
+    base syslog-facility;
+    description
+      "The facility for local use 4 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local5 {
+    base syslog-facility;
+    description
+      "The facility for local use 5 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local6 {
+    base syslog-facility;
+    description
+      "The facility for local use 6 messages as defined in 
+       RFC 5424.";
+  }
+
+  identity local7 {
+    base syslog-facility;
+    description
+      "The facility for local use 7 messages as defined in 
+       RFC 5424.";
+  }
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-yang-library.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-library.yang
new file mode 100644
index 000000000..e6221a60a
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-library.yang
@@ -0,0 +1,244 @@
+module ietf-yang-library {
+  namespace "urn:ietf:params:xml:ns:yang:ietf-yang-library";
+  prefix "yanglib";
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  organization
+    "IETF NETCONF (Network Configuration) Working Group";
+
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netconf/>
+     WG List:  <mailto:netconf@ietf.org>
+
+     WG Chair: Mehmet Ersue
+               <mailto:mehmet.ersue@nsn.com>
+
+     WG Chair: Mahesh Jethanandani
+               <mailto:mjethanandani@gmail.com>
+
+     Editor:   Andy Bierman
+               <mailto:andy@yumaworks.com>
+
+     Editor:   Martin Bjorklund
+               <mailto:mbj@tail-f.com>
+
+     Editor:   Kent Watsen
+               <mailto:kwatsen@juniper.net>";
+
+  description
+    "This module contains monitoring information about the YANG
+     modules and submodules that are used within a YANG-based
+     server.
+
+     Copyright (c) 2016 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (http://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 7895; see
+     the RFC itself for full legal notices.";
+
+  revision 2016-06-21 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7895: YANG Module Library.";
+  }
+
+  /*
+   * Typedefs
+   */
+
+  typedef revision-identifier {
+    type string {
+      pattern '\d{4}-\d{2}-\d{2}';
+    }
+    description
+      "Represents a specific date in YYYY-MM-DD format.";
+  }
+
+  /*
+   * Groupings
+   */
+
+  grouping module-list {
+    description
+      "The module data structure is represented as a grouping
+       so it can be reused in configuration or another monitoring
+       data structure.";
+
+    grouping common-leafs {
+      description
+        "Common parameters for YANG modules and submodules.";
+
+      leaf name {
+        type yang:yang-identifier;
+        description
+          "The YANG module or submodule name.";
+      }
+      leaf revision {
+        type union {
+          type revision-identifier;
+          type string { length 0; }
+        }
+        description
+          "The YANG module or submodule revision date.
+           A zero-length string is used if no revision statement
+           is present in the YANG module or submodule.";
+      }
+    }
+
+    grouping schema-leaf {
+      description
+        "Common schema leaf parameter for modules and submodules.";
+
+      leaf schema {
+        type inet:uri;
+        description
+          "Contains a URL that represents the YANG schema
+           resource for this module or submodule.
+
+           This leaf will only be present if there is a URL
+           available for retrieval of the schema for this entry.";
+      }
+    }
+
+    list module {
+      key "name revision";
+      description
+        "Each entry represents one revision of one module
+         currently supported by the server.";
+
+      uses common-leafs;
+      uses schema-leaf;
+
+      leaf namespace {
+        type inet:uri;
+        mandatory true;
+        description
+          "The XML namespace identifier for this module.";
+      }
+      leaf-list feature {
+        type yang:yang-identifier;
+        description
+          "List of YANG feature names from this module that are
+           supported by the server, regardless of whether they are
+           defined in the module or any included submodule.";
+      }
+      list deviation {
+        key "name revision";
+        description
+          "List of YANG deviation module names and revisions
+           used by this server to modify the conformance of
+           the module associated with this entry.  Note that
+           the same module can be used for deviations for
+           multiple modules, so the same entry MAY appear
+           within multiple 'module' entries.
+
+           The deviation module MUST be present in the 'module'
+           list, with the same name and revision values.
+           The 'conformance-type' value will be 'implement' for
+           the deviation module.";
+        uses common-leafs;
+      }
+      leaf conformance-type {
+        type enumeration {
+          enum implement {
+            description
+              "Indicates that the server implements one or more
+               protocol-accessible objects defined in the YANG module
+               identified in this entry.  This includes deviation
+               statements defined in the module.
+
+               For YANG version 1.1 modules, there is at most one
+               module entry with conformance type 'implement' for a
+               particular module name, since YANG 1.1 requires that,
+               at most, one revision of a module is implemented.
+
+               For YANG version 1 modules, there SHOULD NOT be more
+               than one module entry for a particular module name.";
+          }
+          enum import {
+            description
+              "Indicates that the server imports reusable definitions
+               from the specified revision of the module but does
+               not implement any protocol-accessible objects from
+               this revision.
+
+               Multiple module entries for the same module name MAY
+               exist.  This can occur if multiple modules import the
+               same module but specify different revision dates in
+               the import statements.";
+          }
+        }
+        mandatory true;
+        description
+          "Indicates the type of conformance the server is claiming
+           for the YANG module identified by this entry.";
+      }
+      list submodule {
+        key "name revision";
+        description
+          "Each entry represents one submodule within the
+           parent module.";
+        uses common-leafs;
+        uses schema-leaf;
+      }
+    }
+  }
+
+  /*
+   * Operational state data nodes
+   */
+
+  container modules-state {
+    config false;
+    description
+      "Contains YANG module monitoring information.";
+
+    leaf module-set-id {
+      type string;
+      mandatory true;
+      description
+        "Contains a server-specific identifier representing
+         the current set of modules and submodules.  The
+         server MUST change the value of this leaf if the
+         information represented by the 'module' list instances
+         has changed.";
+    }
+
+    uses module-list;
+  }
+
+  /*
+   * Notifications
+   */
+
+  notification yang-library-change {
+    description
+      "Generated when the set of modules and submodules supported
+       by the server has changed.";
+    leaf module-set-id {
+      type leafref {
+        path "/yanglib:modules-state/yanglib:module-set-id";
+      }
+      mandatory true;
+      description
+        "Contains the module-set-id value representing the
+         set of modules and submodules supported at the server at
+         the time the notification is generated.";
+    }
+  }
+
+}
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-yang-push.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-push.yang
new file mode 100644
index 000000000..9d20c76c5
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-push.yang
@@ -0,0 +1,580 @@
+  module ietf-yang-push {
+    /*
+     * ---------------------------------------------------
+     * Not Supported
+
+    yang-version 1.1;
+     * ---------------------------------------------------
+     */
+    namespace "urn:ietf:params:xml:ns:yang:ietf-yang-push";
+    prefix yp;
+
+    import ietf-inet-types {
+      prefix inet;
+    }
+    import ietf-yang-types {
+      prefix yang;
+    }
+    import ietf-event-notifications {
+      prefix notif-bis;
+    }
+
+    organization "IETF";
+    contact
+      "WG Web:   <http://tools.ietf.org/wg/netconf/>
+       WG List:  <mailto:netconf@ietf.org>
+
+       WG Chair: Mahesh Jethanandani
+                 <mailto:mjethanandani@gmail.com>
+
+       WG Chair: Mehmet Ersue
+                 <mailto:mehmet.ersue@nokia.com>
+
+       Editor:   Alexander Clemm
+                 <mailto:alex@sympotech.com>
+
+       Editor:   Eric Voit
+                 <mailto:evoit@cisco.com>
+
+       Editor:   Alberto Gonzalez Prieto
+                 <mailto:albertgo@cisco.com>
+
+       Editor:   Ambika Prasad Tripathy
+                 <mailto:ambtripa@cisco.com>
+
+       Editor:   Einar Nilsen-Nygaard
+                 <mailto:einarnn@cisco.com>
+
+       Editor:   Andy Bierman
+                 <mailto:andy@yumaworks.com>
+
+       Editor:   Balazs Lengyel
+                 <mailto:balazs.lengyel@ericsson.com>";
+
+    description
+      "This module contains conceptual YANG specifications
+       for YANG push.";
+
+    revision 2016-10-28 {
+      description
+        "Updates to simplify modify-subscription, add anchor-time";
+      reference "YANG Datastore Push, draft-ietf-netconf-yang-push-04";
+    }
+
+    feature on-change {
+      description
+        "This feature indicates that on-change updates are
+         supported.";
+    }
+
+   /*
+    * IDENTITIES
+    */
+
+    /* Additional errors for subscription operations */
+    identity error-data-not-authorized {
+      base notif-bis:error;
+      description
+        "No read authorization for a requested data node.";
+    }
+
+    /* Additional types of streams */
+
+    identity yang-push {
+      base notif-bis:stream;
+      description
+        "A conceptual datastream consisting of all datastore
+         updates, including operational and configuration data.";
+    }
+
+    identity custom-stream {
+      base notif-bis:stream;
+      description
+        "A conceptual datastream for datastore
+         updates with custom updates as defined by a user.";
+    }
+
+    /* Additional transport option */
+    identity http2 {
+      base notif-bis:transport;
+      description
+        "HTTP2 notifications as a transport";
+    }
+
+    /*
+     * TYPE DEFINITIONS
+     */
+
+    typedef filter-id {
+      type uint32;
+      description
+        "A type to identify filters which can be associated with a
+         subscription.";
+    }
+
+    typedef change-type {
+      type enumeration {
+        enum "create" {
+          description
+            "A new data node was created";
+        }
+        enum "delete" {
+          description
+            "A data node was deleted";
+        }
+        enum "modify" {
+          description
+            "The value of a data node has changed";
+        }
+      }
+      description
+        "Specifies different types of changes that may occur
+         to a datastore.";
+    }
+
+
+    grouping update-filter {
+      description
+        "This groupings defines filters for push updates for a
+        datastore tree.  The filters define which updates are of
+        interest in a push update subscription.  Mixing and matching
+        of multiple filters does not occur at the level of this
+        grouping. When a push-update subscription is created, the
+        filter can be a regular subscription filter, or one of the
+        additional filters that are defined in this grouping.";
+      choice update-filter {
+        description
+          "Define filters regarding which data nodes to include
+           in push updates";
+        case subtree {
+          description
+            "Subtree filter.";
+          anyxml subtree-filter {
+            description
+              "Subtree-filter used to specify the data nodes targeted
+              for subscription within a subtree, or subtrees, of a
+              conceptual YANG datastore.  Objects matching the filter
+              criteria will traverse the filter. The syntax follows
+              the subtree filter syntax specified in RFC 6241,
+              section 6.";
+            reference "RFC 6241 section 6";
+          }
+        }
+        case xpath {
+          description
+            "XPath filter";
+          leaf xpath-filter {
+            type yang:xpath1.0;
+            description
+              "Xpath defining the data items of interest.";
+          }
+        }
+      }
+    }
+
+    grouping update-policy {
+      description
+        "This grouping describes the conditions under which an
+         update will be sent as part of an update stream.";
+      choice update-trigger {
+        description
+          "Defines necessary conditions for sending an event to
+           the subscriber.";
+        case periodic {
+          description
+            "The agent is requested to notify periodically the
+             current values of the datastore or the subset
+             defined by the filter.";
+          leaf period {
+            type yang:timeticks;
+            mandatory true;
+            description
+              "Duration of time which should occur between periodic
+               push updates.  Where the anchor of a start-time is
+               available, the push will include the objects and their
+               values which exist at an exact multiple of timeticks
+               aligning to this start-time anchor.";
+          }
+          leaf anchor-time {
+            type yang:date-and-time;
+            description
+              "Designates a timestamp from which the series of
+              periodic push updates are computed. The next update
+              will take place at the next period interval from the
+              anchor time.  For example, for an anchor time at the
+              top of a minute and a period interval of a minute,
+              the next update will be sent at the top of the next
+              minute.";
+          }
+        }
+        case on-change {
+          if-feature "on-change";
+          description
+            "The agent is requested to notify changes in
+             values in the datastore or a subset of it defined
+             by a filter.";
+          leaf no-synch-on-start {
+            type empty;
+            description
+              "This leaf acts as a flag that determines behavior at the
+               start of the subscription.  When present,
+               synchronization of state at the beginning of the
+               subscription is outside the scope of the subscription.
+               Only updates about changes that are observed from the
+               start time, i.e. only push-change-update notifications
+               are sent.
+               When absent (default behavior), in order to facilitate
+               a receiver's synchronization, a full update is sent
+               when the subscription starts using a push-update
+               notification, just like in the case of a periodic
+               subscription.  After that, push-change-update
+               notifications only are sent unless the Publisher chooses
+               to resynch the subscription again.";
+          }
+          leaf dampening-period {
+            type yang:timeticks;
+            mandatory true;
+            description
+              "Minimum amount of time that needs to have
+               passed since the last time an update was
+               provided.";
+          }
+          leaf-list excluded-change {
+            type change-type;
+            description
+              "Use to restrict which changes trigger an update.
+               For example, if modify is excluded, only creation and
+               deletion of objects is reported.";
+          }
+        }
+      }
+    }
+
+    grouping subscription-qos {
+      description
+        "This grouping describes Quality of Service information
+         concerning a subscription.  This information is passed to lower
+         layers for transport priortization and treatment";
+      leaf dscp {
+        if-feature "notif-bis:configured-subscriptions";
+        type inet:dscp;
+        default "0";
+        description
+          "The push update's IP packet transport priority.
+           This is made visible across network hops to receiver.
+           The transport priority is shared for all receivers of
+           a given subscription.";
+      }
+      leaf subscription-priority {
+        type uint8;
+        description
+          "Relative priority for a subscription.   Allows an
+           underlying transport layer perform informed load
+           balance allocations between various subscriptions";
+      }
+      leaf subscription-dependency {
+        type string;
+        description
+          "Provides the Subscription ID of a parent subscription
+           without which this subscription should not exist. In
+           other words, there is no reason to stream these objects
+           if another subscription is missing.";
+      }
+    }
+
+    augment "/notif-bis:establish-subscription/notif-bis:input" {
+      description
+        "Define additional subscription parameters that apply
+         specifically to push updates";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:establish-subscription/notif-bis:input/"+
+            "notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:establish-subscription/notif-bis:output" {
+      description
+        "Allow to return additional subscription parameters that apply
+         specifically to push updates.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:establish-subscription/notif-bis:output/"+
+      "notif-bis:result/notif-bis:no-success/notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:modify-subscription/notif-bis:input" {
+      description
+        "Define additional subscription parameters that apply
+         specifically to push updates.";
+      uses update-policy;
+    }
+    augment "/notif-bis:modify-subscription/notif-bis:input/"+
+            "notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:modify-subscription/notif-bis:output" {
+      description
+        "Allow to retun additional subscription parameters that apply
+         specifically to push updates.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:modify-subscription/notif-bis:output/"+
+        "notif-bis:result/notif-bis:no-success/notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    notification push-update {
+      description
+        "This notification contains a push update, containing
+         data subscribed to via a subscription.
+         This notification is sent for periodic updates, for a
+         periodic subscription.  It can also be used for
+         synchronization updates of an on-change subscription.
+         This notification shall only be sent to receivers
+         of a subscription; it does not constitute a general-purpose
+         notification.";
+      leaf subscription-id {
+        type notif-bis:subscription-id;
+        mandatory true;
+        description
+          "This references the subscription because of which the
+           notification is sent.";
+      }
+      leaf time-of-update {
+        type yang:date-and-time;
+        description
+          "This leaf contains the time of the update.";
+      }
+      leaf updates-not-sent {
+        type empty;
+        description
+          "This is a flag which indicates that not all data nodes
+           subscribed to are included included with this
+           update.  In other words, the publisher has failed to
+           fulfill its full subscription obligations.
+           This may lead to intermittent loss of synchronization
+           of data at the client.  Synchronization at the client
+           can occur when the next push-update is received.";
+      }
+      /*
+       * --------------------------------------------------------------------
+       * datastore-contents not currently supported.
+       * Will replace datastore-contents-string in a future release.
+
+      anydata datastore-contents {
+        description
+          "This contains the updated data.  It constitutes a snapshot
+           at the time-of-update of the set of data that has been
+           subscribed to.  The format and syntax of the data
+           corresponds to the format and syntax of data that would be
+           returned in a corresponding get operation with the same
+           filter parameters applied.";
+      }
+       * --------------------------------------------------------------------
+       */
+      leaf datastore-contents-string {
+        type string;
+        description
+          "This contains the updated data.  It constitutes a snapshot
+           at the time-of-update of the set of data that has been
+           subscribed to.  The format and syntax of the data
+           corresponds to the format and syntax of data that would be
+           returned in a corresponding get operation with the same
+           filter parameters applied.";
+      }
+      /*
+       * --------------------------------------------------------------------
+       */
+
+    }
+    notification push-change-update {
+      if-feature "on-change";
+      description
+        "This notification contains an on-change push update.
+         This notification shall only be sent to the receivers
+         of a subscription; it does not constitute a general-purpose
+         notification.";
+      leaf subscription-id {
+        type notif-bis:subscription-id;
+        mandatory true;
+        description
+          "This references the subscription because of which the
+           notification is sent.";
+      }
+      leaf time-of-update {
+        type yang:date-and-time;
+        description
+          "This leaf contains the time of the update, i.e. the
+           time at which the change was observed.";
+      }
+      leaf updates-not-sent {
+        type empty;
+        description
+          "This is a flag which indicates that not all changes which
+           have occured since the last update are included with this
+           update.  In other words, the publisher has failed to
+           fulfill its full subscription obligations, for example in
+           cases where it was not able to keep up with a change burst.
+           To facilitate synchronization, a publisher MAY subsequently
+           send a push-update containing a full snapshot of subscribed
+           data. Such a push-update might also be triggered by a
+           subscriber requesting an on-demand synchronization.";
+      }
+      /*
+       * --------------------------------------------------------------------
+       * datastore-changes not currently supported.
+       * Will replace datastore-change-string in a future release.
+
+      anydata datastore-changes {
+        description
+          "This contains datastore contents that has changed
+           since the previous update, per the terms of the
+           subscription.  Changes are encoded analogous to
+           the syntax of a corresponding yang-patch operation,
+           i.e. a yang-patch operation applied to the YANG datastore
+           implied by the previous update to result in the current
+           state (and assuming yang-patch could also be applied to
+           operational data).";
+      }
+       *
+       * --------------------------------------------------------------------
+       */
+      leaf datastore-changes-string {
+        type string;
+        description
+          "This contains datastore contents that has changed
+           since the previous update, per the terms of the
+           subscription.  Changes are encoded analogous to
+           the syntax of a corresponding yang-patch operation,
+           i.e. a yang-patch operation applied to the YANG datastore
+           implied by the previous update to result in the current
+           state (and assuming yang-patch could also be applied to
+           operational data).";
+      }
+      /*
+       * --------------------------------------------------------------------
+       */
+
+    }
+    augment "/notif-bis:subscription-started" {
+      description
+        "This augmentation adds push subscription parameters
+         to the notification that a subscription has
+         started and data updates are beginning to be sent.
+         This notification shall only be sent to receivers
+         of a subscription; it does not constitute a general-purpose
+         notification.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:subscription-started/notif-bis:filter-type" {
+      description
+        "This augmentation allows to include additional update filters
+         options to be included as part of the notification that a
+         subscription has started.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:subscription-modified" {
+      description
+        "This augmentation adds push subscription parameters
+         to the notification that a subscription has
+         been modified.
+
+         This notification shall only be sent to receivers
+         of a subscription; it does not constitute a general-purpose
+         notification.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:subscription-modified/notif-bis:filter-type" {
+      description
+        "This augmentation allows to include additional update
+         filters options to be included as part of the notification
+         that a subscription has been modified.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:filters/notif-bis:filter/"+
+            "notif-bis:filter-type" {
+      description
+        "This container adds additional update filter options
+         to the list of configurable filters
+         that can be applied to subscriptions.  This facilitates
+         the reuse of complex filters once defined.";
+      case update-filter {
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:subscription-config/notif-bis:subscription" {
+      description
+        "Contains the list of subscriptions that are configured,
+         as opposed to established via RPC or other means.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:subscription-config/notif-bis:subscription/"+
+            "notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        uses update-filter;
+      }
+    }
+    augment "/notif-bis:subscriptions/notif-bis:subscription" {
+      description
+        "Contains the list of currently active subscriptions,
+         i.e. subscriptions that are currently in effect,
+         used for subscription management and monitoring purposes.
+
+         This includes subscriptions that have been setup via RPC
+         primitives, e.g. establish-subscription, delete-subscription,
+         and modify-subscription, as well as subscriptions that
+         have been established via configuration.";
+      uses update-policy;
+      uses subscription-qos;
+    }
+    augment "/notif-bis:subscriptions/notif-bis:subscription/"+
+            "notif-bis:filter-type" {
+      description
+        "Add push filters to selection of filter types.";
+      case update-filter {
+        description
+          "Additional filter options for push subscription.";
+        uses update-filter;
+      }
+    }
+  }
+
diff --git a/profiles/bundles/yang/ietf/0.1.3/ietf-yang-smiv2.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-smiv2.yang
new file mode 100644
index 000000000..aa428e3d5
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-smiv2.yang
@@ -0,0 +1,172 @@
+ module ietf-yang-smiv2 {
+
+    yang-version 1;
+
+    namespace
+      "urn:ietf:params:xml:ns:yang:ietf-yang-smiv2";
+
+  prefix ietf-yang-smiv2;
+
+    organization
+      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
+
+    contact
+      "WG Web:   <http://tools.ietf.org/wg/netmod/>
+    WG List:  <mailto:netmod@ietf.org>
+
+    WG Chair: David Kessens
+              <mailto:david.kessens@nsn.com>
+
+    WG Chair: Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>
+
+    Editor:   Juergen Schoenwaelder
+              <mailto:j.schoenwaelder@jacobs-university.de>";
+
+    description
+      "This module defines YANG extensions that are used to translate
+    SMIv2 concepts into YANG.
+
+    Copyright (c) 2012 IETF Trust and the persons identified as
+    authors of the code.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or
+    without modification, is permitted pursuant to, and subject
+    to the license terms contained in, the Simplified BSD License
+    set forth in Section 4.c of the IETF Trust's Legal Provisions
+    Relating to IETF Documents
+    (http://trustee.ietf.org/license-info).
+
+    This version of this YANG module is part of RFC 6643; see
+    the RFC itself for full legal notices.";
+
+    revision "2012-06-22" {
+      description "Initial revision.";
+      reference
+        "RFC 6643: Translation of Structure of Management Information
+        Version 2 (SMIv2) MIB Modules to YANG Modules";
+
+    }
+
+
+    identity object-identity {
+      description
+        "Base identity for all SMIv2 OBJECT-IDENTITYs.";
+    }
+
+    typedef opaque {
+      type binary;
+      description
+        "The Opaque type supports the capability to pass arbitrary ASN.1
+      syntax.  A value is encoded using the ASN.1 Basic Encoding Rules
+      into a string of octets.  This, in turn, is encoded as an OCTET
+      STRING, in effect 'double-wrapping' the original ASN.1 value.
+
+      In the value set and its semantics, this type is equivalent to
+      the Opaque type of the SMIv2.  This type exists in the SMIv2
+      solely for backward-compatibility reasons and this is also
+      true for this YANG data type.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension display-hint {
+      argument "format" {
+        yin-element false;
+      }
+      description
+        "The display-hint statement takes as an argument the DISPLAY-HINT
+      assigned to an SMIv2 textual convention.";
+      reference
+        "RFC 2579: Textual Conventions for SMIv2";
+
+    }
+
+    extension max-access {
+      argument "access" {
+        yin-element false;
+      }
+      description
+        "The max-access statement takes as an argument the MAX-ACCESS
+      assigned to an SMIv2 object definition.
+
+      The MAX-ACCESS value is SMIv2 specific and has no impact on
+      the access provided to YANG objects through protocols such
+      as NETCONF.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension defval {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The defval statement takes as an argument a default value
+      defined by an SMIv2 DEFVAL clause.  Note that the value is in
+      the SMIv2 value space defined by the SMIv2 syntax of the
+      corresponding object and not in the YANG value space
+      defined by the corresponding YANG data type.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension implied {
+      argument "index" {
+        yin-element false;
+      }
+      description
+        "If an SMIv2 INDEX object is preceded by the IMPLIED keyword, then
+      the implied statement is present in the YANG module and takes as
+      an argument the name of the IMPLIED index object.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension alias {
+      argument "descriptor" {
+        yin-element false;
+      }
+      description
+        "The alias statement introduces an SMIv2 descriptor.  The body of
+      the alias statement is expected to contain an oid statement that
+      provides the numeric OID associated with the descriptor.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension oid {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The oid statement takes as an argument the object identifier
+      assigned to an SMIv2 definition.  The object identifier value
+      is written in decimal dotted notation.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+
+    extension subid {
+      argument "value" {
+        yin-element false;
+      }
+      description
+        "The subid statement takes as an argument the last sub-identifier
+      of the object identifier assigned to an SMIv2 definition.  The
+      sub-identifier value is a single positive decimal natural number.
+      The subid statement may not be used as a substatement to any
+      top-level node in a YANG document.  The subid substatement may
+      be used only as a substatement to a node having a parent node
+      defined with either an ietf-yang-smiv2:oid or ietf-yang-smiv2:subid substatement.";
+      reference
+        "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
+
+    }
+  }  // module ietf-yang-smiv2
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-types.yang b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-types.yang
similarity index 99%
rename from profiles/bundles/yang/ietf/0.1.6/ietf-yang-types.yang
rename to profiles/bundles/yang/ietf/0.1.3/ietf-yang-types.yang
index ee58fa3ab..371a091d1 100644
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-types.yang
+++ b/profiles/bundles/yang/ietf/0.1.3/ietf-yang-types.yang
@@ -151,6 +151,9 @@ module ietf-yang-types {
      "The zero-based-counter64 type represents a counter64 that
       has the defined 'initial' value zero.
 
+
+
+
       A schema node of this type will be set to zero (0) on creation
       and will thereafter increase monotonically until it reaches
       a maximum value of 2^64-1 (18446744073709551615 decimal),
@@ -388,6 +391,9 @@ module ietf-yang-types {
       pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
     }
 
+
+
+
     description
      "Represents media- or physical-level addresses represented
       as a sequence octets, each octet represented by two hexadecimal
diff --git a/profiles/bundles/yang/ietf/0.1.3/policy-types.yang b/profiles/bundles/yang/ietf/0.1.3/policy-types.yang
new file mode 100644
index 000000000..42488e6f6
--- /dev/null
+++ b/profiles/bundles/yang/ietf/0.1.3/policy-types.yang
@@ -0,0 +1,585 @@
+/*-------------------------------------------------------------------
+ *  policy-types.yang - C3PL type definition yang file
+ * 
+ *  Oct 2013, Aseem Choudhary - Nazanin Magharei   
+ *                                           
+ *  Copyright (c) 2013 by Cisco Systems, Inc.
+ *  All rights reserved.                     
+ *-------------------------------------------------------------------
+ */
+module policy-types{
+    yang-version 1;
+    namespace "urn:ietf:params:xml:ns:yang:c3pl-types";
+   
+    prefix policy-types;
+
+    import ietf-diffserv-classifier {
+        prefix classifier;
+    }
+    
+    import ietf-inet-types {
+        prefix inet;
+    }
+    organization "Cisco Systems, Inc.";
+    contact
+    "Cisco Systems, Inc.
+    Customer Service
+
+    Postal: 170 W Tasman Drive
+    San Jose, CA 95134
+
+    Tel: +1 1800 553-NETS
+
+    E-mail: cs-yang@cisco.com
+     
+    Editor:   Nazanin Magharei
+               <mailto:nmaghare@cisco.com>";
+    description
+    "This module contains a collection of YANG groupings 
+     in filter configurations for policy model.";
+     
+    revision "2013-10-07" {
+        description "first revision";
+        reference "TBD";
+    }
+    /* policy-type identity definitions */
+    identity policy-type {
+        description " 
+        This is identity of base policy-type";
+    }
+    
+    identity qos {
+        base policy-type;
+        description "
+        Policy-type QOS (quality of service)";
+    }
+    
+    identity pbr {
+        base policy-type;
+        description "
+        Policy-type PBR (policy based routing)";
+    }
+    
+    identity perf-mon {
+        base policy-type;
+        description "
+        Policy-type PERF-MON (performance monitoring)";
+    }
+    
+    identity access-control {
+        base policy-type;
+        description "
+        Policy-type access-control specific policy-map";
+    }
+    
+    identity appnav {
+        base policy-type;
+        description "
+        Policy-type APPNAV Policy Map";
+    }
+    
+    identity control {
+        base policy-type;
+        description "
+        Policy-type control policy-map";
+    }
+    
+    identity inspect {
+        base policy-type;
+        description "
+        Policy-type Firewall Policy Map";
+    }
+    
+    identity packet-service {
+        base policy-type;
+        description "
+        Policy-type Packet Service Policy Map";
+    }
+    
+    identity service {
+        base policy-type;
+        description "
+        Policy-type policymap service configuration";
+    }
+    
+    /* class-type identity definitions */
+    identity class-type {
+        description " 
+        This is identity of base class-type";
+      }
+      
+      identity qos-class {
+        base class-type;
+        description "
+        QOS class-map";
+    }
+    
+    identity access-control-class {
+        base class-type;
+        description "
+        Access-control specific class-map";
+    }
+    
+    identity appnav-class {
+        base class-type;
+        description "
+        APPNAV Class Map";
+    }
+    identity control-class {
+        base class-type;
+        description "
+        Control policy class-map";
+    }
+    
+    identity inspect-class {
+        base class-type;
+        description "
+        Firewall Class Map";
+    }
+      
+    typedef metric {
+        type enumeration {
+            enum none;
+            enum peta;
+            enum tera;
+            enum giga;
+            enum mega;
+            enum kilo;
+            enum milli;
+            enum nano;
+        }
+        description "metric";
+    }
+    typedef rate-unit {
+        type enumeration {
+            enum pps;
+            enum cps;
+            enum bps;
+            enum perc;
+            enum ratio;
+        }
+        description
+           "Unit for traffic rate:
+            pps:     packets per sec
+            cps:     cells per sec
+            bps:     bits per sec
+            perc:    percentage
+            ratio:   ratio";
+    }
+    typedef direction {
+        type enumeration{
+            enum inbound;
+            enum outbound;
+        }
+        description "
+            This typedef defines directional enums used in c3pl.
+            inbound:         Incoming direction.
+            outbound:        Outgoing direction.
+        ";
+    }
+    
+    /* filter type identity definitions */
+   
+     identity cos {
+        base classifier:filter-type;
+        description "
+        Filter-type IEEE 802.1Q/ISL class of service/user 
+        priority values";
+    }
+
+    identity cos-inner {
+        base classifier:filter-type;
+        description "ATM VC configured as Access VC
+         class of service/user priority values";
+    }
+    
+    identity ipv4-acl-name {
+        base classifier:filter-type;
+        description "IPV4 access group list";
+    }
+    
+    identity ipv6-acl-name {
+        base classifier:filter-type;
+        description "IPV6 access group list";
+    }
+     
+    identity ipv4-acl {
+        base classifier:filter-type;
+        description "IPV4 access group Index";
+    }
+    
+    identity ipv6-acl {
+        base classifier:filter-type;
+        description "IPV6 access group Index";
+    }  
+    
+    identity input-interface {
+        base classifier:filter-type;
+        description "Input interface";
+    }
+    
+    identity src-mac {
+        base classifier:filter-type;
+        description "Source MAC address";
+    }
+    
+    identity dst-mac {
+        base classifier:filter-type;
+        description "Destination MAC address";
+    }
+    
+    identity mpls-exp-top {
+        base classifier:filter-type;
+        description "Multi Protocol Label Switching experimental 
+        topmost specific values";
+    }
+    
+    identity mpls-exp-imp {
+        base classifier:filter-type;
+        description "Multi Protocol Label Switching experimental 
+        imposition specific values";
+    }
+    
+    identity packet-length {
+        base classifier:filter-type;
+        description "Layer 3 packet length";
+    }
+    
+    identity prec {
+        base classifier:filter-type;
+        description "IP precendence";
+    }
+    
+    identity qos-group {
+        base classifier:filter-type;
+        description "QOS group";
+    }
+    
+    identity vlan {
+        base classifier:filter-type;
+        description "Vlan";
+    }
+    
+    identity vlan-inner {
+        base classifier:filter-type;
+        description "Vlan-inner";
+    }
+    
+    identity atm-clp {
+        base classifier:filter-type;
+        description "ATM CLP bit";
+    }
+    
+    identity atm-vci {
+        base classifier:filter-type;
+        description "ATM VCI number";
+    }
+    identity dei {
+        base classifier:filter-type;
+        description "Frame-relay DE bit";
+    }
+    
+    identity dei-inner {
+        base classifier:filter-type;
+        description "Frame-relay inner DE bit";
+    }
+    
+    identity flow-ip {
+        base classifier:filter-type;
+        description "Flow IP";
+    }
+    
+    identity flow-record {
+        base classifier:filter-type;
+        description "FLow record";
+    }
+    
+    identity flow-de {
+        base classifier:filter-type;
+        description "Flow DE";
+    }
+    
+    identity flow-dlci {
+        base classifier:filter-type;
+        description "Frame-relay DLCI";
+    }
+    
+    identity wlan-user-priority {
+        base classifier:filter-type;
+        description "WLAN user priority";
+    }
+    
+    identity discard-class {
+        base classifier:filter-type;
+        description "Discard behavior identifier";
+    }
+    
+    identity class-map {
+        base classifier:filter-type;
+        description "class-map";
+    }
+    
+    identity metadata {
+        base classifier:filter-type;
+        description "metadata";
+    }
+    
+    identity application {
+        base classifier:filter-type;
+        description "application";
+    }
+    
+    identity security-group-name {
+        base classifier:filter-type;
+        description "security group name";
+    }
+    
+    identity security-group-tag {
+        base classifier:filter-type;
+        description "security group tag";
+    }
+    
+    identity ip-rtp {
+        base classifier:filter-type;
+        description "IP RTP port";
+    }
+    
+    identity vpls {
+        base classifier:filter-type;
+        description "VPLS";
+    }
+    /* Feature capability defintions */
+    feature match-cos-support {
+        description "Match COS feature support";
+    }
+    feature match-cos-inner-support {
+        description "Match COS-inner feature support";
+    }
+    feature match-ipv4-acl-name-support {
+        description "Match IPV4 ACL list feature support";
+    }
+    feature match-ipv6-acl-name-support {
+        description "Match IPV6 ACL list feature support";
+    }
+    feature match-ipv4-acl-support {
+        description "Match IPV4 ACL number feature support";
+    }
+    feature match-ipv6-acl-support {
+        description "Match IPV6 ACL number feature support";
+    }
+    feature match-input-interface-support {
+        description "Match input interface support";
+    }
+    feature match-src-mac-support {
+        description "Match source Mac address feature support";
+    }
+    feature match-dst-mac-support {
+        description "Match destination Mac address feature support";
+    }
+    feature protocol-name-support{
+       description "Match non-standard protocol feature support";
+    }
+    feature match-packet-length-support {
+        description "Match packet length feature support";
+    }
+    feature match-discard-class-support {
+        description "Match discard class feature support";
+    }
+    feature match-class-map-support {
+        description "Match class-map feature support";
+    }
+    feature match-qos-group-support {
+        description "Match QOS group feature support";
+    }
+    feature match-prec-support {
+        description "Match IP precendence feature support";
+    }
+    feature match-mpls-exp-imp-support {
+        description "Match MPLS experimental imposition feature 
+        support";
+    }
+    feature match-mpls-exp-top-support {
+        description "Match MPLS experimental topmost feature 
+        support";
+    }
+    feature match-fr-de-support {
+        description "Match Frame relay DE feature support";
+    }
+    feature match-fr-dlci-support {
+        description "Match Frame relay DLCI feature support";
+    }
+    feature match-atm-clp-support {
+        description "Match ATM CLP feature support";
+    }
+    feature match-atm-vci-support {
+        description "Match ATM VCI feature support";
+    }
+    feature match-vlan-inner-support {
+        description "Match Vlan-inner feature support";
+    }
+    feature match-vlan-support {
+        description "Match VLAN feature support";
+    }
+    feature match-dei-support {
+        description "Match Frame relay DEI feature support";
+    }
+    feature match-dei-inner-support {
+        description "Match Frame relay DEI inner feature support";
+    }
+    feature match-flow-ip-support {
+        description "Match Flow IP feature support";
+    }
+    feature match-flow-record-support {
+        description "Match Flow record feature support";
+    }
+    feature match-wlan-user-priority-support {
+        description "Match Wlan user priority feature support";
+    }
+    feature match-metadata-support {
+        description "Match Metadata feature support";
+    }
+    feature match-application-support {
+        description "Match Application feature support";
+    }
+    feature match-security-group-support {
+        description "Match Security group feature support";
+    }
+    feature match-ip-rtp-support {
+        description "Match IP RTP feature support";
+    }
+    feature match-vpls-support {
+        description "Match VPLS feature support";
+    }
+    
+    /* typedef definitions of filter configurations */
+    typedef pkt-len-type {
+        type uint16 {
+            range "1..9216";
+        }
+        description "Layer 3 packet length from 1 to 9216";
+    } 
+    typedef dscp-type { 
+        type inet:dscp;
+        description "
+        Differentiated services codepoint.
+        ";
+    } 
+    typedef src-dst-ip-type {
+        type inet:ip-prefix;
+        description "
+        Source/destination IP prefix.";
+    }
+    typedef src-dst-port-type {
+        type inet:port-number;
+        description
+        "Source/destination port value";
+    }
+    typedef protocol-type {
+        type string;     
+        description
+        "Name of the protocol"; 
+    }
+    typedef protocol-name {
+       type string;
+       description 
+       "Name of the protocol";
+    }
+    typedef cos-type { 
+        type uint8 {
+            range "0..7";
+        }
+        description "
+        Class of service.
+        ";
+    }
+    typedef ip-acl-name-type {
+        type string {length "1..64";}
+        description "IPv4/6 access group.";
+    }
+    typedef ip-acl-type {
+        type uint32;
+        description "IPv4/6 access group number.";
+    }
+    typedef prec-val-type { 
+        type uint8 {
+            range "0..7";
+        }
+        description "
+        IP precendece value.
+        ";
+    }  
+    
+    typedef prec-attr-type { 
+        type string;
+        description "
+        IP precendece attribute.";
+    }   
+     
+    typedef mpls-exp-type { 
+        type uint8 { 
+            range "0..7";
+        }
+        description "
+        MPLS Experimental bits.
+        ";
+    }
+    typedef discard-class-type { 
+        type uint8 { 
+            range "0..7";
+        }
+        description "
+        Discard behavior identifier.
+        ";
+    }   
+    typedef dei-type {
+        type boolean;
+        description "
+        Frame relay DEI.
+        ";
+    }   
+
+    typedef flow-record-type{
+        type string { length "1..255";}        
+        description "
+        Flow record.";
+    }
+    typedef fr-de-type {
+        type empty;        
+        description "
+        Frame relay DE type definition.";
+    }
+    
+    typedef wlan-user-priority-type {
+        type uint8 { range "0..7";}
+        description "
+        Wlan user priority value.";
+    }
+    
+    typedef class-map-type {
+        type string { length "1..64";}
+        description "
+        Class-map name.";
+    }
+    typedef application-type {
+        type string;
+        description "
+        Application name.";
+    }
+    typedef qos-group-type {
+        type uint16 { 
+            range "0..99";
+        }
+        description "
+        QoS Group value.
+        ";
+    }  
+     
+    typedef vlan-type { 
+        type uint16 {
+            range "1..4095";
+        }
+        description "
+        Vlan ID.
+        ";
+    } 
+}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-datastores.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-datastores.yang
deleted file mode 100644
index 9e875ab6a..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-datastores.yang
+++ /dev/null
@@ -1,117 +0,0 @@
-module ietf-datastores {
-  yang-version 1.1;
-  namespace "urn:ietf:params:xml:ns:yang:ietf-datastores";
-  prefix ds;
-
-  organization
-    "IETF Network Modeling (NETMOD) Working Group";
-
-  contact
-    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
-
-     WG List:  <mailto:netmod@ietf.org>
-
-     Author:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>
-
-     Author:   Juergen Schoenwaelder
-               <mailto:j.schoenwaelder@jacobs-university.de>
-
-     Author:   Phil Shafer
-               <mailto:phil@juniper.net>
-
-     Author:   Kent Watsen
-               <mailto:kwatsen@juniper.net>
-
-     Author:   Rob Wilton
-               <rwilton@cisco.com>";
-
-  description
-    "This YANG module defines a set of identities for identifying
-     datastores.
-
-     Copyright (c) 2018 IETF Trust and the persons identified as
-     authors of the code.  All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject to
-     the license terms contained in, the Simplified BSD License set
-     forth in Section 4.c of the IETF Trust's Legal Provisions
-     Relating to IETF Documents
-     (https://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 8342
-     (https://www.rfc-editor.org/info/rfc8342); see the RFC itself
-     for full legal notices.";
-
-  revision 2018-02-14 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 8342: Network Management Datastore Architecture (NMDA)";
-  }
-
-  /*
-   * Identities
-   */
-
-  identity datastore {
-    description
-      "Abstract base identity for datastore identities.";
-  }
-
-  identity conventional {
-    base datastore;
-    description
-      "Abstract base identity for conventional configuration
-       datastores.";
-  }
-
-  identity running {
-    base conventional;
-    description
-      "The running configuration datastore.";
-  }
-
-  identity candidate {
-    base conventional;
-    description
-      "The candidate configuration datastore.";
-  }
-
-  identity startup {
-    base conventional;
-    description
-      "The startup configuration datastore.";
-  }
-
-  identity intended {
-    base conventional;
-    description
-      "The intended configuration datastore.";
-  }
-
-  identity dynamic {
-    base datastore;
-    description
-      "Abstract base identity for dynamic configuration datastores.";
-  }
-
-  identity operational {
-    base datastore;
-    description
-      "The operational state datastore.";
-  }
-
-  /*
-   * Type definitions
-   */
-
-  typedef datastore-ref {
-    type identityref {
-      base datastore;
-    }
-    description
-      "A datastore identity reference.";
-  }
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-inet-types.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-inet-types.yang
deleted file mode 100644
index 2f14270de..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-inet-types.yang
+++ /dev/null
@@ -1,457 +0,0 @@
-module ietf-inet-types {
-
-  namespace "urn:ietf:params:xml:ns:yang:ietf-inet-types";
-  prefix "inet";
-
-  organization
-   "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-  contact
-   "WG Web:   <http://tools.ietf.org/wg/netmod/>
-    WG List:  <mailto:netmod@ietf.org>
-
-    WG Chair: David Kessens
-              <mailto:david.kessens@nsn.com>
-
-    WG Chair: Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>
-
-    Editor:   Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>";
-
-  description
-   "This module contains a collection of generally useful derived
-    YANG data types for Internet addresses and related things.
-
-    Copyright (c) 2013 IETF Trust and the persons identified as
-    authors of the code.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-    without modification, is permitted pursuant to, and subject
-    to the license terms contained in, the Simplified BSD License
-    set forth in Section 4.c of the IETF Trust's Legal Provisions
-    Relating to IETF Documents
-    (http://trustee.ietf.org/license-info).
-
-    This version of this YANG module is part of RFC 6991; see
-    the RFC itself for full legal notices.";
-
-  revision 2013-07-15 {
-    description
-     "This revision adds the following new data types:
-      - ip-address-no-zone
-      - ipv4-address-no-zone
-      - ipv6-address-no-zone";
-    reference
-     "RFC 6991: Common YANG Data Types";
-  }
-
-  revision 2010-09-24 {
-    description
-     "Initial revision.";
-    reference
-     "RFC 6021: Common YANG Data Types";
-  }
-
-  /*** collection of types related to protocol fields ***/
-
-  typedef ip-version {
-    type enumeration {
-      enum unknown {
-        value "0";
-        description
-         "An unknown or unspecified version of the Internet
-          protocol.";
-      }
-      enum ipv4 {
-        value "1";
-        description
-         "The IPv4 protocol as defined in RFC 791.";
-      }
-      enum ipv6 {
-        value "2";
-        description
-         "The IPv6 protocol as defined in RFC 2460.";
-      }
-    }
-    description
-     "This value represents the version of the IP protocol.
-
-      In the value set and its semantics, this type is equivalent
-      to the InetVersion textual convention of the SMIv2.";
-    reference
-     "RFC  791: Internet Protocol
-      RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
-      RFC 4001: Textual Conventions for Internet Network Addresses";
-  }
-
-  typedef dscp {
-    type uint8 {
-      range "0..63";
-    }
-    description
-     "The dscp type represents a Differentiated Services Code Point
-      that may be used for marking packets in a traffic stream.
-      In the value set and its semantics, this type is equivalent
-      to the Dscp textual convention of the SMIv2.";
-    reference
-     "RFC 3289: Management Information Base for the Differentiated
-                Services Architecture
-      RFC 2474: Definition of the Differentiated Services Field
-                (DS Field) in the IPv4 and IPv6 Headers
-      RFC 2780: IANA Allocation Guidelines For Values In
-                the Internet Protocol and Related Headers";
-  }
-
-  typedef ipv6-flow-label {
-    type uint32 {
-      range "0..1048575";
-    }
-    description
-     "The ipv6-flow-label type represents the flow identifier or Flow
-      Label in an IPv6 packet header that may be used to
-      discriminate traffic flows.
-
-      In the value set and its semantics, this type is equivalent
-      to the IPv6FlowLabel textual convention of the SMIv2.";
-    reference
-     "RFC 3595: Textual Conventions for IPv6 Flow Label
-      RFC 2460: Internet Protocol, Version 6 (IPv6) Specification";
-  }
-
-  typedef port-number {
-    type uint16 {
-      range "0..65535";
-    }
-    description
-     "The port-number type represents a 16-bit port number of an
-      Internet transport-layer protocol such as UDP, TCP, DCCP, or
-      SCTP.  Port numbers are assigned by IANA.  A current list of
-      all assignments is available from <http://www.iana.org/>.
-
-      Note that the port number value zero is reserved by IANA.  In
-      situations where the value zero does not make sense, it can
-      be excluded by subtyping the port-number type.
-      In the value set and its semantics, this type is equivalent
-      to the InetPortNumber textual convention of the SMIv2.";
-    reference
-     "RFC  768: User Datagram Protocol
-      RFC  793: Transmission Control Protocol
-      RFC 4960: Stream Control Transmission Protocol
-      RFC 4340: Datagram Congestion Control Protocol (DCCP)
-      RFC 4001: Textual Conventions for Internet Network Addresses";
-  }
-
-  /*** collection of types related to autonomous systems ***/
-
-  typedef as-number {
-    type uint32;
-    description
-     "The as-number type represents autonomous system numbers
-      which identify an Autonomous System (AS).  An AS is a set
-      of routers under a single technical administration, using
-      an interior gateway protocol and common metrics to route
-      packets within the AS, and using an exterior gateway
-      protocol to route packets to other ASes.  IANA maintains
-      the AS number space and has delegated large parts to the
-      regional registries.
-
-      Autonomous system numbers were originally limited to 16
-      bits.  BGP extensions have enlarged the autonomous system
-      number space to 32 bits.  This type therefore uses an uint32
-      base type without a range restriction in order to support
-      a larger autonomous system number space.
-
-      In the value set and its semantics, this type is equivalent
-      to the InetAutonomousSystemNumber textual convention of
-      the SMIv2.";
-    reference
-     "RFC 1930: Guidelines for creation, selection, and registration
-                of an Autonomous System (AS)
-      RFC 4271: A Border Gateway Protocol 4 (BGP-4)
-      RFC 4001: Textual Conventions for Internet Network Addresses
-      RFC 6793: BGP Support for Four-Octet Autonomous System (AS)
-                Number Space";
-  }
-
-  /*** collection of types related to IP addresses and hostnames ***/
-
-  typedef ip-address {
-    type union {
-      type inet:ipv4-address;
-      type inet:ipv6-address;
-    }
-    description
-     "The ip-address type represents an IP address and is IP
-      version neutral.  The format of the textual representation
-      implies the IP version.  This type supports scoped addresses
-      by allowing zone identifiers in the address format.";
-    reference
-     "RFC 4007: IPv6 Scoped Address Architecture";
-  }
-
-  typedef ipv4-address {
-    type string {
-      pattern
-        '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-      +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-      + '(%[\p{N}\p{L}]+)?';
-    }
-    description
-      "The ipv4-address type represents an IPv4 address in
-       dotted-quad notation.  The IPv4 address may include a zone
-       index, separated by a % sign.
-
-       The zone index is used to disambiguate identical address
-       values.  For link-local addresses, the zone index will
-       typically be the interface index number or the name of an
-       interface.  If the zone index is not present, the default
-       zone of the device will be used.
-
-       The canonical format for the zone index is the numerical
-       format";
-  }
-
-  typedef ipv6-address {
-    type string {
-      pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-            + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-            + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-            + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-            + '(%[\p{N}\p{L}]+)?';
-      pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-            + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-            + '(%.+)?';
-    }
-    description
-     "The ipv6-address type represents an IPv6 address in full,
-      mixed, shortened, and shortened-mixed notation.  The IPv6
-      address may include a zone index, separated by a % sign.
-
-      The zone index is used to disambiguate identical address
-      values.  For link-local addresses, the zone index will
-      typically be the interface index number or the name of an
-      interface.  If the zone index is not present, the default
-      zone of the device will be used.
-
-      The canonical format of IPv6 addresses uses the textual
-      representation defined in Section 4 of RFC 5952.  The
-      canonical format for the zone index is the numerical
-      format as described in Section 11.2 of RFC 4007.";
-    reference
-     "RFC 4291: IP Version 6 Addressing Architecture
-      RFC 4007: IPv6 Scoped Address Architecture
-      RFC 5952: A Recommendation for IPv6 Address Text
-                Representation";
-  }
-
-  typedef ip-address-no-zone {
-    type union {
-      type inet:ipv4-address-no-zone;
-      type inet:ipv6-address-no-zone;
-    }
-    description
-     "The ip-address-no-zone type represents an IP address and is
-      IP version neutral.  The format of the textual representation
-      implies the IP version.  This type does not support scoped
-      addresses since it does not allow zone identifiers in the
-      address format.";
-    reference
-     "RFC 4007: IPv6 Scoped Address Architecture";
-  }
-
-  typedef ipv4-address-no-zone {
-    type inet:ipv4-address {
-      pattern '[0-9\.]*';
-    }
-    description
-      "An IPv4 address without a zone index.  This type, derived from
-       ipv4-address, may be used in situations where the zone is
-       known from the context and hence no zone index is needed.";
-  }
-
-  typedef ipv6-address-no-zone {
-    type inet:ipv6-address {
-      pattern '[0-9a-fA-F:\.]*';
-    }
-    description
-      "An IPv6 address without a zone index.  This type, derived from
-       ipv6-address, may be used in situations where the zone is
-       known from the context and hence no zone index is needed.";
-    reference
-     "RFC 4291: IP Version 6 Addressing Architecture
-      RFC 4007: IPv6 Scoped Address Architecture
-      RFC 5952: A Recommendation for IPv6 Address Text
-                Representation";
-  }
-
-  typedef ip-prefix {
-    type union {
-      type inet:ipv4-prefix;
-      type inet:ipv6-prefix;
-    }
-    description
-     "The ip-prefix type represents an IP prefix and is IP
-      version neutral.  The format of the textual representations
-      implies the IP version.";
-  }
-
-  typedef ipv4-prefix {
-    type string {
-      pattern
-         '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-       +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-       + '/(([0-9])|([1-2][0-9])|(3[0-2]))';
-    }
-    description
-     "The ipv4-prefix type represents an IPv4 address prefix.
-      The prefix length is given by the number following the
-      slash character and must be less than or equal to 32.
-
-      A prefix length value of n corresponds to an IP address
-      mask that has n contiguous 1-bits from the most
-      significant bit (MSB) and all other bits set to 0.
-
-      The canonical format of an IPv4 prefix has all bits of
-      the IPv4 address set to zero that are not part of the
-      IPv4 prefix.";
-  }
-
-  typedef ipv6-prefix {
-    type string {
-      pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-            + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-            + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-            + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-            + '(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))';
-      pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-            + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-            + '(/.+)';
-    }
-    description
-     "The ipv6-prefix type represents an IPv6 address prefix.
-      The prefix length is given by the number following the
-      slash character and must be less than or equal to 128.
-
-      A prefix length value of n corresponds to an IP address
-      mask that has n contiguous 1-bits from the most
-      significant bit (MSB) and all other bits set to 0.
-
-      The IPv6 address should have all bits that do not belong
-      to the prefix set to zero.
-
-      The canonical format of an IPv6 prefix has all bits of
-      the IPv6 address set to zero that are not part of the
-      IPv6 prefix.  Furthermore, the IPv6 address is represented
-      as defined in Section 4 of RFC 5952.";
-    reference
-     "RFC 5952: A Recommendation for IPv6 Address Text
-                Representation";
-  }
-
-  /*** collection of domain name and URI types ***/
-
-  typedef domain-name {
-    type string {
-      length "1..253";
-      pattern
-        '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
-      + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
-      + '|\.';
-    }
-    description
-     "The domain-name type represents a DNS domain name.  The
-      name SHOULD be fully qualified whenever possible.
-
-      Internet domain names are only loosely specified.  Section
-      3.5 of RFC 1034 recommends a syntax (modified in Section
-      2.1 of RFC 1123).  The pattern above is intended to allow
-      for current practice in domain name use, and some possible
-      future expansion.  It is designed to hold various types of
-      domain names, including names used for A or AAAA records
-      (host names) and other records, such as SRV records.  Note
-      that Internet host names have a stricter syntax (described
-      in RFC 952) than the DNS recommendations in RFCs 1034 and
-      1123, and that systems that want to store host names in
-      schema nodes using the domain-name type are recommended to
-      adhere to this stricter standard to ensure interoperability.
-
-      The encoding of DNS names in the DNS protocol is limited
-      to 255 characters.  Since the encoding consists of labels
-      prefixed by a length bytes and there is a trailing NULL
-      byte, only 253 characters can appear in the textual dotted
-      notation.
-
-      The description clause of schema nodes using the domain-name
-      type MUST describe when and how these names are resolved to
-      IP addresses.  Note that the resolution of a domain-name value
-      may require to query multiple DNS records (e.g., A for IPv4
-      and AAAA for IPv6).  The order of the resolution process and
-      which DNS record takes precedence can either be defined
-      explicitly or may depend on the configuration of the
-      resolver.
-
-      Domain-name values use the US-ASCII encoding.  Their canonical
-      format uses lowercase US-ASCII characters.  Internationalized
-      domain names MUST be A-labels as per RFC 5890.";
-    reference
-     "RFC  952: DoD Internet Host Table Specification
-      RFC 1034: Domain Names - Concepts and Facilities
-      RFC 1123: Requirements for Internet Hosts -- Application
-                and Support
-      RFC 2782: A DNS RR for specifying the location of services
-                (DNS SRV)
-      RFC 5890: Internationalized Domain Names in Applications
-                (IDNA): Definitions and Document Framework";
-  }
-
-  typedef host {
-    type union {
-      type inet:ip-address;
-      type inet:domain-name;
-    }
-    description
-     "The host type represents either an IP address or a DNS
-      domain name.";
-  }
-
-  typedef uri {
-    type string;
-    description
-     "The uri type represents a Uniform Resource Identifier
-      (URI) as defined by STD 66.
-
-      Objects using the uri type MUST be in US-ASCII encoding,
-      and MUST be normalized as described by RFC 3986 Sections
-      6.2.1, 6.2.2.1, and 6.2.2.2.  All unnecessary
-      percent-encoding is removed, and all case-insensitive
-      characters are set to lowercase except for hexadecimal
-      digits, which are normalized to uppercase as described in
-      Section 6.2.2.1.
-
-      The purpose of this normalization is to help provide
-      unique URIs.  Note that this normalization is not
-      sufficient to provide uniqueness.  Two URIs that are
-      textually distinct after this normalization may still be
-      equivalent.
-
-      Objects using the uri type may restrict the schemes that
-      they permit.  For example, 'data:' and 'urn:' schemes
-      might not be appropriate.
-
-      A zero-length URI is not a valid URI.  This can be used to
-      express 'URI absent' where required.
-
-      In the value set and its semantics, this type is equivalent
-      to the Uri SMIv2 textual convention defined in RFC 5017.";
-    reference
-     "RFC 3986: Uniform Resource Identifier (URI): Generic Syntax
-      RFC 3305: Report from the Joint W3C/IETF URI Planning Interest
-                Group: Uniform Resource Identifiers (URIs), URLs,
-                and Uniform Resource Names (URNs): Clarifications
-                and Recommendations
-      RFC 5017: MIB Textual Conventions for Uniform Resource
-                Identifiers (URIs)";
-  }
-
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-interfaces.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-interfaces.yang
deleted file mode 100644
index ad64425f7..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-interfaces.yang
+++ /dev/null
@@ -1,725 +0,0 @@
-module ietf-interfaces {
-
-  namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
-  prefix if;
-
-  import ietf-yang-types {
-    prefix yang;
-  }
-
-  organization
-    "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-  contact
-    "WG Web:   <http://tools.ietf.org/wg/netmod/>
-     WG List:  <mailto:netmod@ietf.org>
-
-     WG Chair: Thomas Nadeau
-               <mailto:tnadeau@lucidvision.com>
-
-     WG Chair: Juergen Schoenwaelder
-               <mailto:j.schoenwaelder@jacobs-university.de>
-
-     Editor:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>";
-
-  description
-    "This module contains a collection of YANG definitions for
-     managing network interfaces.
-
-     Copyright (c) 2014 IETF Trust and the persons identified as
-     authors of the code.  All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject
-     to the license terms contained in, the Simplified BSD License
-     set forth in Section 4.c of the IETF Trust's Legal Provisions
-     Relating to IETF Documents
-     (http://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 7223; see
-     the RFC itself for full legal notices.";
-
-  revision 2014-05-08 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 7223: A YANG Data Model for Interface Management";
-  }
-
-  /*
-   * Typedefs
-   */
-
-  typedef interface-ref {
-    type leafref {
-      path "/if:interfaces/if:interface/if:name";
-    }
-    description
-      "This type is used by data models that need to reference
-       configured interfaces.";
-  }
-
-  typedef interface-state-ref {
-    type leafref {
-      path "/if:interfaces-state/if:interface/if:name";
-    }
-    description
-      "This type is used by data models that need to reference
-       the operationally present interfaces.";
-  }
-
-  /*
-   * Identities
-   */
-
-  identity interface-type {
-    description
-      "Base identity from which specific interface types are
-       derived.";
-  }
-
-  /*
-   * Features
-   */
-
-  feature arbitrary-names {
-    description
-      "This feature indicates that the device allows user-controlled
-       interfaces to be named arbitrarily.";
-  }
-  feature pre-provisioning {
-    description
-      "This feature indicates that the device supports
-       pre-provisioning of interface configuration, i.e., it is
-       possible to configure an interface whose physical interface
-       hardware is not present on the device.";
-  }
-
-  feature if-mib {
-    description
-      "This feature indicates that the device implements
-       the IF-MIB.";
-    reference
-      "RFC 2863: The Interfaces Group MIB";
-  }
-
-  /*
-   * Configuration data nodes
-   */
-
-  container interfaces {
-    description
-      "Interface configuration parameters.";
-
-    list interface {
-      key "name";
-
-      description
-        "The list of configured interfaces on the device.
-
-         The operational state of an interface is available in the
-         /interfaces-state/interface list.  If the configuration of a
-         system-controlled interface cannot be used by the system
-         (e.g., the interface hardware present does not match the
-         interface type), then the configuration is not applied to
-         the system-controlled interface shown in the
-         /interfaces-state/interface list.  If the configuration
-         of a user-controlled interface cannot be used by the system,
-         the configured interface is not instantiated in the
-         /interfaces-state/interface list.";
-
-     leaf name {
-        type string;
-        description
-          "The name of the interface.
-
-           A device MAY restrict the allowed values for this leaf,
-           possibly depending on the type of the interface.
-           For system-controlled interfaces, this leaf is the
-           device-specific name of the interface.  The 'config false'
-           list /interfaces-state/interface contains the currently
-           existing interfaces on the device.
-
-           If a client tries to create configuration for a
-           system-controlled interface that is not present in the
-           /interfaces-state/interface list, the server MAY reject
-           the request if the implementation does not support
-           pre-provisioning of interfaces or if the name refers to
-           an interface that can never exist in the system.  A
-           NETCONF server MUST reply with an rpc-error with the
-           error-tag 'invalid-value' in this case.
-
-           If the device supports pre-provisioning of interface
-           configuration, the 'pre-provisioning' feature is
-           advertised.
-
-           If the device allows arbitrarily named user-controlled
-           interfaces, the 'arbitrary-names' feature is advertised.
-
-           When a configured user-controlled interface is created by
-           the system, it is instantiated with the same name in the
-           /interface-state/interface list.";
-      }
-
-      leaf description {
-        type string;
-        description
-          "A textual description of the interface.
-
-           A server implementation MAY map this leaf to the ifAlias
-           MIB object.  Such an implementation needs to use some
-           mechanism to handle the differences in size and characters
-           allowed between this leaf and ifAlias.  The definition of
-           such a mechanism is outside the scope of this document.
-
-           Since ifAlias is defined to be stored in non-volatile
-           storage, the MIB implementation MUST map ifAlias to the
-           value of 'description' in the persistently stored
-           datastore.
-
-           Specifically, if the device supports ':startup', when
-           ifAlias is read the device MUST return the value of
-           'description' in the 'startup' datastore, and when it is
-           written, it MUST be written to the 'running' and 'startup'
-           datastores.  Note that it is up to the implementation to
-
-           decide whether to modify this single leaf in 'startup' or
-           perform an implicit copy-config from 'running' to
-           'startup'.
-
-           If the device does not support ':startup', ifAlias MUST
-           be mapped to the 'description' leaf in the 'running'
-           datastore.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAlias";
-      }
-
-      leaf type {
-        type identityref {
-          base interface-type;
-        }
-        mandatory true;
-        description
-          "The type of the interface.
-
-           When an interface entry is created, a server MAY
-           initialize the type leaf with a valid value, e.g., if it
-           is possible to derive the type from the name of the
-           interface.
-
-           If a client tries to set the type of an interface to a
-           value that can never be used by the system, e.g., if the
-           type is not supported or if the type does not match the
-           name of the interface, the server MUST reject the request.
-           A NETCONF server MUST reply with an rpc-error with the
-           error-tag 'invalid-value' in this case.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifType";
-      }
-
-      leaf enabled {
-        type boolean;
-        default "true";
-        description
-          "This leaf contains the configured, desired state of the
-           interface.
-
-           Systems that implement the IF-MIB use the value of this
-           leaf in the 'running' datastore to set
-           IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
-           has been initialized, as described in RFC 2863.
-
-
-
-           Changes in this leaf in the 'running' datastore are
-           reflected in ifAdminStatus, but if ifAdminStatus is
-           changed over SNMP, this leaf is not affected.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-      }
-
-      leaf link-up-down-trap-enable {
-        if-feature if-mib;
-        type enumeration {
-          enum enabled {
-            value 1;
-          }
-          enum disabled {
-            value 2;
-          }
-        }
-        description
-          "Controls whether linkUp/linkDown SNMP notifications
-           should be generated for this interface.
-
-           If this node is not configured, the value 'enabled' is
-           operationally used by the server for interfaces that do
-           not operate on top of any other interface (i.e., there are
-           no 'lower-layer-if' entries), and 'disabled' otherwise.";
-        reference
-          "RFC 2863: The Interfaces Group MIB -
-                     ifLinkUpDownTrapEnable";
-      }
-    }
-  }
-
-  /*
-   * Operational state data nodes
-   */
-
-  container interfaces-state {
-    config false;
-    description
-      "Data nodes for the operational state of interfaces.";
-
-    list interface {
-      key "name";
-
-
-
-
-
-      description
-        "The list of interfaces on the device.
-
-         System-controlled interfaces created by the system are
-         always present in this list, whether they are configured or
-         not.";
-
-      leaf name {
-        type string;
-        description
-          "The name of the interface.
-
-           A server implementation MAY map this leaf to the ifName
-           MIB object.  Such an implementation needs to use some
-           mechanism to handle the differences in size and characters
-           allowed between this leaf and ifName.  The definition of
-           such a mechanism is outside the scope of this document.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifName";
-      }
-
-      leaf type {
-        type identityref {
-          base interface-type;
-        }
-        mandatory true;
-        description
-          "The type of the interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifType";
-      }
-
-      leaf admin-status {
-        if-feature if-mib;
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-            description
-              "Not ready to pass packets and not in some test mode.";
-          }
-
-
-
-          enum testing {
-            value 3;
-            description
-              "In some test mode.";
-          }
-        }
-        mandatory true;
-        description
-          "The desired state of the interface.
-
-           This leaf has the same read semantics as ifAdminStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-      }
-
-      leaf oper-status {
-        type enumeration {
-          enum up {
-            value 1;
-            description
-              "Ready to pass packets.";
-          }
-          enum down {
-            value 2;
-            description
-              "The interface does not pass any packets.";
-          }
-          enum testing {
-            value 3;
-            description
-              "In some test mode.  No operational packets can
-               be passed.";
-          }
-          enum unknown {
-            value 4;
-            description
-              "Status cannot be determined for some reason.";
-          }
-          enum dormant {
-            value 5;
-            description
-              "Waiting for some external event.";
-          }
-          enum not-present {
-            value 6;
-            description
-              "Some component (typically hardware) is missing.";
-          }
-          enum lower-layer-down {
-            value 7;
-            description
-              "Down due to state of lower-layer interface(s).";
-          }
-        }
-        mandatory true;
-        description
-          "The current operational state of the interface.
-
-           This leaf has the same semantics as ifOperStatus.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
-      }
-
-      leaf last-change {
-        type yang:date-and-time;
-        description
-          "The time the interface entered its current operational
-           state.  If the current state was entered prior to the
-           last re-initialization of the local network management
-           subsystem, then this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifLastChange";
-      }
-
-      leaf if-index {
-        if-feature if-mib;
-        type int32 {
-          range "1..2147483647";
-        }
-        mandatory true;
-        description
-          "The ifIndex value for the ifEntry represented by this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifIndex";
-      }
-
-      leaf phys-address {
-        type yang:phys-address;
-        description
-          "The interface's address at its protocol sub-layer.  For
-           example, for an 802.x interface, this object normally
-           contains a Media Access Control (MAC) address.  The
-           interface's media-specific modules must define the bit
-
-
-           and byte ordering and the format of the value of this
-           object.  For interfaces that do not have such an address
-           (e.g., a serial line), this node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
-      }
-
-      leaf-list higher-layer-if {
-        type interface-state-ref;
-        description
-          "A list of references to interfaces layered on top of this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf-list lower-layer-if {
-        type interface-state-ref;
-        description
-          "A list of references to interfaces layered underneath this
-           interface.";
-        reference
-          "RFC 2863: The Interfaces Group MIB - ifStackTable";
-      }
-
-      leaf speed {
-        type yang:gauge64;
-        units "bits/second";
-        description
-            "An estimate of the interface's current bandwidth in bits
-             per second.  For interfaces that do not vary in
-             bandwidth or for those where no accurate estimation can
-             be made, this node should contain the nominal bandwidth.
-             For interfaces that have no concept of bandwidth, this
-             node is not present.";
-        reference
-          "RFC 2863: The Interfaces Group MIB -
-                     ifSpeed, ifHighSpeed";
-      }
-
-
-
-
-
-
-
-
-
-      container statistics {
-        description
-          "A collection of interface-related statistics objects.";
-
-        leaf discontinuity-time {
-          type yang:date-and-time;
-          mandatory true;
-          description
-            "The time on the most recent occasion at which any one or
-             more of this interface's counters suffered a
-             discontinuity.  If no such discontinuities have occurred
-             since the last re-initialization of the local management
-             subsystem, then this node contains the time the local
-             management subsystem re-initialized itself.";
-        }
-
-        leaf in-octets {
-          type yang:counter64;
-          description
-            "The total number of octets received on the interface,
-             including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
-        }
-
-        leaf in-unicast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were not addressed to a
-             multicast or broadcast address at this sub-layer.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
-        }
-
-
-
-
-        leaf in-broadcast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a broadcast
-             address at this sub-layer.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInBroadcastPkts";
-        }
-
-        leaf in-multicast-pkts {
-          type yang:counter64;
-          description
-            "The number of packets, delivered by this sub-layer to a
-             higher (sub-)layer, that were addressed to a multicast
-             address at this sub-layer.  For a MAC-layer protocol,
-             this includes both Group and Functional addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCInMulticastPkts";
-        }
-
-        leaf in-discards {
-          type yang:counter32;
-          description
-            "The number of inbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being deliverable to a higher-layer
-             protocol.  One possible reason for discarding such a
-             packet could be to free up buffer space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-
-
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
-        }
-
-        leaf in-errors {
-          type yang:counter32;
-          description
-            "For packet-oriented interfaces, the number of inbound
-             packets that contained errors preventing them from being
-             deliverable to a higher-layer protocol.  For character-
-             oriented or fixed-length interfaces, the number of
-             inbound transmission units that contained errors
-             preventing them from being deliverable to a higher-layer
-             protocol.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInErrors";
-        }
-
-        leaf in-unknown-protos {
-          type yang:counter32;
-          description
-            "For packet-oriented interfaces, the number of packets
-             received via the interface that were discarded because
-             of an unknown or unsupported protocol.  For
-             character-oriented or fixed-length interfaces that
-             support protocol multiplexing, the number of
-             transmission units received via the interface that were
-             discarded because of an unknown or unsupported protocol.
-             For any interface that does not support protocol
-             multiplexing, this counter is not present.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
-        }
-
-
-
-
-
-        leaf out-octets {
-          type yang:counter64;
-          description
-            "The total number of octets transmitted out of the
-             interface, including framing characters.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
-        }
-
-        leaf out-unicast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted, and that were not addressed
-             to a multicast or broadcast address at this sub-layer,
-             including those that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
-        }
-
-        leaf out-broadcast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted, and that were addressed to a
-             broadcast address at this sub-layer, including those
-             that were discarded or not sent.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutBroadcastPkts";
-        }
-
-
-        leaf out-multicast-pkts {
-          type yang:counter64;
-          description
-            "The total number of packets that higher-level protocols
-             requested be transmitted, and that were addressed to a
-             multicast address at this sub-layer, including those
-             that were discarded or not sent.  For a MAC-layer
-             protocol, this includes both Group and Functional
-             addresses.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB -
-                       ifHCOutMulticastPkts";
-        }
-
-        leaf out-discards {
-          type yang:counter32;
-          description
-            "The number of outbound packets that were chosen to be
-             discarded even though no errors had been detected to
-             prevent their being transmitted.  One possible reason
-             for discarding such a packet could be to free up buffer
-             space.
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
-        }
-
-        leaf out-errors {
-          type yang:counter32;
-          description
-            "For packet-oriented interfaces, the number of outbound
-             packets that could not be transmitted because of errors.
-             For character-oriented or fixed-length interfaces, the
-             number of outbound transmission units that could not be
-             transmitted because of errors.
-
-
-
-
-             Discontinuities in the value of this counter can occur
-             at re-initialization of the management system, and at
-             other times as indicated by the value of
-             'discontinuity-time'.";
-          reference
-            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
-        }
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-netconf-monitoring.yang
deleted file mode 100644
index 8d2380e72..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-netconf-monitoring.yang
+++ /dev/null
@@ -1,558 +0,0 @@
-module ietf-netconf-monitoring {
-
-  namespace "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring";
-  prefix "ncm";
-
-  import ietf-yang-types { prefix yang; }
-  import ietf-inet-types { prefix inet; }
-
-  organization
-    "IETF NETCONF (Network Configuration) Working Group";
-
-  contact
-    "WG Web:   <http://tools.ietf.org/wg/netconf/>
-     WG List:  <mailto:netconf@ietf.org>
-
-     WG Chair: Mehmet Ersue
-               <mailto:mehmet.ersue@nsn.com>
-
-     WG Chair: Bert Wijnen
-               <mailto:bertietf@bwijnen.net>
-
-     Editor:   Mark Scott
-               <mailto:mark.scott@ericsson.com>
-
-     Editor:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>";
-
-  description
-    "NETCONF Monitoring Module.
-     All elements in this module are read-only.
-
-     Copyright (c) 2010 IETF Trust and the persons identified as
-     authors of the code. All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject
-     to the license terms contained in, the Simplified BSD
-     License set forth in Section 4.c of the IETF Trust's
-     Legal Provisions Relating to IETF Documents
-     (http://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 6022; see
-     the RFC itself for full legal notices.";
-
-  revision 2010-10-04 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 6022: YANG Module for NETCONF Monitoring";
-  }
-
-  typedef netconf-datastore-type {
-    type enumeration {
-      enum running;
-      enum candidate;
-      enum startup;
-    }
-    description
-      "Enumeration of possible NETCONF datastore types.";
-    reference
-      "RFC 4741: NETCONF Configuration Protocol";
-  }
-
-  identity transport {
-    description
-      "Base identity for NETCONF transport types.";
-  }
-
-  identity netconf-ssh {
-    base transport;
-    description
-      "NETCONF over Secure Shell (SSH).";
-    reference
-      "RFC 4742: Using the NETCONF Configuration Protocol
-                 over Secure SHell (SSH)";
-  }
-
-  identity netconf-soap-over-beep {
-    base transport;
-    description
-      "NETCONF over Simple Object Access Protocol (SOAP) over
-       Blocks Extensible Exchange Protocol (BEEP).";
-    reference
-      "RFC 4743: Using NETCONF over the Simple Object
-                 Access Protocol (SOAP)";
-  }
-
-  identity netconf-soap-over-https {
-    base transport;
-    description
-      "NETCONF over Simple Object Access Protocol (SOAP)
-      over Hypertext Transfer Protocol Secure (HTTPS).";
-    reference
-      "RFC 4743: Using NETCONF over the Simple Object
-                 Access Protocol (SOAP)";
-  }
-
-  identity netconf-beep {
-    base transport;
-    description
-      "NETCONF over Blocks Extensible Exchange Protocol (BEEP).";
-    reference
-      "RFC 4744: Using the NETCONF Protocol over the
-                 Blocks Extensible Exchange Protocol (BEEP)";
-  }
-
-  identity netconf-tls {
-    base transport;
-    description
-      "NETCONF over Transport Layer Security (TLS).";
-    reference
-      "RFC 5539: NETCONF over Transport Layer Security (TLS)";
-  }
-
-  identity schema-format {
-    description
-      "Base identity for data model schema languages.";
-  }
-
-  identity xsd {
-    base schema-format;
-    description
-      "W3C XML Schema Definition.";
-    reference
-      "W3C REC REC-xmlschema-1-20041028:
-         XML Schema Part 1: Structures";
-  }
-
-  identity yang {
-    base schema-format;
-    description
-      "The YANG data modeling language for NETCONF.";
-    reference
-      "RFC 6020:  YANG - A Data Modeling Language for the
-                  Network Configuration Protocol (NETCONF)";
-  }
-
-  identity yin {
-    base schema-format;
-    description
-      "The YIN syntax for YANG.";
-    reference
-      "RFC 6020:  YANG - A Data Modeling Language for the
-                  Network Configuration Protocol (NETCONF)";
-  }
-
-  identity rng {
-    base schema-format;
-    description
-      "Regular Language for XML Next Generation (RELAX NG).";
-    reference
-      "ISO/IEC 19757-2:2008: RELAX NG";
-  }
-
-  identity rnc {
-    base schema-format;
-    description
-      "Relax NG Compact Syntax";
-    reference
-      "ISO/IEC 19757-2:2008: RELAX NG";
-  }
-
-  grouping common-counters {
-    description
-      "Counters that exist both per session, and also globally,
-       accumulated from all sessions.";
-
-    leaf in-rpcs {
-      type yang:zero-based-counter32;
-      description
-        "Number of correct <rpc> messages received.";
-    }
-    leaf in-bad-rpcs {
-      type yang:zero-based-counter32;
-      description
-        "Number of messages received when an <rpc> message was expected,
-         that were not correct <rpc> messages.  This includes XML parse
-         errors and errors on the rpc layer.";
-    }
-    leaf out-rpc-errors {
-      type yang:zero-based-counter32;
-      description
-        "Number of <rpc-reply> messages sent that contained an
-         <rpc-error> element.";
-    }
-    leaf out-notifications {
-      type yang:zero-based-counter32;
-      description
-        "Number of <notification> messages sent.";
-    }
-  }
-
-  container netconf-state {
-    config false;
-    description
-      "The netconf-state container is the root of the monitoring
-       data model.";
-
-    container capabilities {
-      description
-        "Contains the list of NETCONF capabilities supported by the
-         server.";
-
-      leaf-list capability {
-        type inet:uri;
-        description
-          "List of NETCONF capabilities supported by the server.";
-      }
-    }
-
-    container datastores {
-      description
-        "Contains the list of NETCONF configuration datastores.";
-
-      list datastore {
-        key name;
-        description
-          "List of NETCONF configuration datastores supported by
-           the NETCONF server and related information.";
-
-        leaf name {
-          type netconf-datastore-type;
-          description
-            "Name of the datastore associated with this list entry.";
-        }
-        container locks {
-          presence
-            "This container is present only if the datastore
-             is locked.";
-          description
-            "The NETCONF <lock> and <partial-lock> operations allow
-             a client to lock specific resources in a datastore.  The
-             NETCONF server will prevent changes to the locked
-             resources by all sessions except the one that acquired
-             the lock(s).
-
-             Monitoring information is provided for each datastore
-             entry including details such as the session that acquired
-             the lock, the type of lock (global or partial) and the
-             list of locked resources.  Multiple locks per datastore
-             are supported.";
-
-          grouping lock-info {
-            description
-              "Lock related parameters, common to both global and
-               partial locks.";
-
-            leaf locked-by-session {
-              type uint32;
-              mandatory true;
-              description
-                "The session ID of the session that has locked
-                 this resource.  Both a global lock and a partial
-                 lock MUST contain the NETCONF session-id.
-
-                 If the lock is held by a session that is not managed
-                 by the NETCONF server (e.g., a CLI session), a session
-                 id of 0 (zero) is reported.";
-              reference
-                "RFC 4741: NETCONF Configuration Protocol";
-            }
-            leaf locked-time {
-              type yang:date-and-time;
-              mandatory true;
-              description
-                "The date and time of when the resource was
-                 locked.";
-            }
-          }
-
-          choice lock-type {
-            description
-              "Indicates if a global lock or a set of partial locks
-               are set.";
-
-            container global-lock {
-              description
-                "Present if the global lock is set.";
-              uses lock-info;
-            }
-
-            list partial-lock {
-              key lock-id;
-              description
-                "List of partial locks.";
-              reference
-                "RFC 5717: Partial Lock Remote Procedure Call (RPC) for
-                           NETCONF";
-
-              leaf lock-id {
-                type uint32;
-                description
-                  "This is the lock id returned in the <partial-lock>
-                   response.";
-              }
-              uses lock-info;
-              leaf-list select {
-                type yang:xpath1.0;
-                min-elements 1;
-                description
-                  "The xpath expression that was used to request
-                   the lock.  The select expression indicates the
-                   original intended scope of the lock.";
-              }
-              leaf-list locked-node {
-                type instance-identifier;
-                description
-                  "The list of instance-identifiers (i.e., the
-                   locked nodes).
-
-                   The scope of the partial lock is defined by the list
-                   of locked nodes.";
-              }
-            }
-          }
-        }
-      }
-    }
-
-    container schemas {
-      description
-        "Contains the list of data model schemas supported by the
-         server.";
-
-      list schema {
-        key "identifier version format";
-
-        description
-          "List of data model schemas supported by the server.";
-
-        leaf identifier {
-          type string;
-          description
-            "Identifier to uniquely reference the schema.  The
-             identifier is used in the <get-schema> operation and may
-             be used for other purposes such as file retrieval.
-
-             For modeling languages that support or require a data
-             model name (e.g., YANG module name) the identifier MUST
-             match that name.  For YANG data models, the identifier is
-             the name of the module or submodule.  In other cases, an
-             identifier such as a filename MAY be used instead.";
-        }
-        leaf version {
-          type string;
-          description
-            "Version of the schema supported.  Multiple versions MAY be
-             supported simultaneously by a NETCONF server.  Each
-             version MUST be reported individually in the schema list,
-             i.e., with same identifier, possibly different location,
-             but different version.
-
-             For YANG data models, version is the value of the most
-             recent YANG 'revision' statement in the module or
-             submodule, or the empty string if no 'revision' statement
-             is present.";
-        }
-        leaf format {
-          type identityref {
-            base schema-format;
-          }
-          description
-            "The data modeling language the schema is written
-             in (currently xsd, yang, yin, rng, or rnc).
-             For YANG data models, 'yang' format MUST be supported and
-             'yin' format MAY also be provided.";
-        }
-        leaf namespace {
-          type inet:uri;
-          mandatory true;
-          description
-            "The XML namespace defined by the data model.
-
-             For YANG data models, this is the module's namespace.
-             If the list entry describes a submodule, this field
-             contains the namespace of the module to which the
-             submodule belongs.";
-        }
-        leaf-list location {
-          type union {
-            type enumeration {
-              enum "NETCONF";
-            }
-            type inet:uri;
-          }
-          description
-            "One or more locations from which the schema can be
-             retrieved.  This list SHOULD contain at least one
-             entry per schema.
-
-             A schema entry may be located on a remote file system
-             (e.g., reference to file system for ftp retrieval) or
-             retrieved directly from a server supporting the
-             <get-schema> operation (denoted by the value 'NETCONF').";
-        }
-      }
-    }
-
-    container sessions {
-      description
-        "The sessions container includes session-specific data for
-         NETCONF management sessions.  The session list MUST include
-         all currently active NETCONF sessions.";
-
-      list session {
-        key session-id;
-        description
-          "All NETCONF sessions managed by the NETCONF server
-           MUST be reported in this list.";
-
-        leaf session-id {
-          type uint32 {
-            range "1..max";
-          }
-          description
-            "Unique identifier for the session.  This value is the
-             NETCONF session identifier, as defined in RFC 4741.";
-          reference
-            "RFC 4741: NETCONF Configuration Protocol";
-        }
-        leaf transport {
-          type identityref {
-            base transport;
-          }
-          mandatory true;
-          description
-            "Identifies the transport for each session, e.g.,
-            'netconf-ssh', 'netconf-soap', etc.";
-        }
-        leaf username  {
-          type string;
-          mandatory true;
-          description
-            "The username is the client identity that was authenticated
-            by the NETCONF transport protocol.  The algorithm used to
-            derive the username is NETCONF transport protocol specific
-            and in addition specific to the authentication mechanism
-            used by the NETCONF transport protocol.";
-        }
-        leaf source-host {
-          type inet:host;
-          description
-            "Host identifier of the NETCONF client.  The value
-             returned is implementation specific (e.g., hostname,
-             IPv4 address, IPv6 address)";
-        }
-        leaf login-time {
-          type yang:date-and-time;
-          mandatory true;
-          description
-            "Time at the server at which the session was established.";
-        }
-        uses common-counters {
-          description
-            "Per-session counters.  Zero based with following reset
-             behaviour:
-               - at start of a session
-               - when max value is reached";
-        }
-      }
-    }
-
-    container statistics {
-      description
-        "Statistical data pertaining to the NETCONF server.";
-
-      leaf netconf-start-time {
-        type yang:date-and-time;
-        description
-          "Date and time at which the management subsystem was
-           started.";
-      }
-      leaf in-bad-hellos {
-        type yang:zero-based-counter32;
-        description
-          "Number of sessions silently dropped because an
-          invalid <hello> message was received.  This includes <hello>
-          messages with a 'session-id' attribute, bad namespace, and
-          bad capability declarations.";
-      }
-      leaf in-sessions {
-        type yang:zero-based-counter32;
-        description
-          "Number of sessions started.  This counter is incremented
-           when a <hello> message with a <session-id> is sent.
-
-          'in-sessions' - 'in-bad-hellos' =
-              'number of correctly started netconf sessions'";
-      }
-      leaf dropped-sessions {
-        type yang:zero-based-counter32;
-        description
-          "Number of sessions that were abnormally terminated, e.g.,
-           due to idle timeout or transport close.  This counter is not
-           incremented when a session is properly closed by a
-           <close-session> operation, or killed by a <kill-session>
-           operation.";
-      }
-      uses common-counters {
-        description
-          "Global counters, accumulated from all sessions.
-           Zero based with following reset behaviour:
-             - re-initialization of NETCONF server
-             - when max value is reached";
-      }
-    }
-  }
-
-  rpc get-schema {
-    description
-      "This operation is used to retrieve a schema from the
-       NETCONF server.
-
-       Positive Response:
-         The NETCONF server returns the requested schema.
-
-       Negative Response:
-         If requested schema does not exist, the <error-tag> is
-         'invalid-value'.
-
-         If more than one schema matches the requested parameters, the
-         <error-tag> is 'operation-failed', and <error-app-tag> is
-         'data-not-unique'.";
-
-    input {
-      leaf identifier {
-        type string;
-        mandatory true;
-        description
-          "Identifier for the schema list entry.";
-      }
-      leaf version {
-        type string;
-        description
-          "Version of the schema requested.  If this parameter is not
-           present, and more than one version of the schema exists on
-           the server, a 'data-not-unique' error is returned, as
-           described above.";
-      }
-      leaf format {
-        type identityref {
-          base schema-format;
-        }
-        description
-           "The data modeling language of the schema.  If this
-            parameter is not present, and more than one formats of
-            the schema exists on the server, a 'data-not-unique' error
-            is returned, as described above.";
-      }
-    }
-    output {
-        anyxml data {
-          description
-            "Contains the schema content.";
-      }
-    }
-  }
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-restconf-monitoring.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-restconf-monitoring.yang
deleted file mode 100644
index e87b00baf..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-restconf-monitoring.yang
+++ /dev/null
@@ -1,150 +0,0 @@
-module ietf-restconf-monitoring {
-  namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring";
-  prefix "rcmon";
-
-  import ietf-yang-types { prefix yang; }
-  import ietf-inet-types { prefix inet; }
-
-  organization
-    "IETF NETCONF (Network Configuration) Working Group";
-
-  contact
-    "WG Web:   <https://datatracker.ietf.org/wg/netconf/>
-     WG List:  <mailto:netconf@ietf.org>
-
-     Author:   Andy Bierman
-               <mailto:andy@yumaworks.com>
-
-     Author:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>
-
-     Author:   Kent Watsen
-               <mailto:kwatsen@juniper.net>";
-
-  description
-    "This module contains monitoring information for the
-     RESTCONF protocol.
-
-     Copyright (c) 2017 IETF Trust and the persons identified as
-     authors of the code.  All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject
-     to the license terms contained in, the Simplified BSD License
-     set forth in Section 4.c of the IETF Trust's Legal Provisions
-     Relating to IETF Documents
-     (http://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 8040; see
-     the RFC itself for full legal notices.";
-
-  revision 2017-01-26 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 8040: RESTCONF Protocol.";
-  }
-
-  container restconf-state {
-    config false;
-    description
-      "Contains RESTCONF protocol monitoring information.";
-
-    container capabilities {
-      description
-        "Contains a list of protocol capability URIs.";
-
-      leaf-list capability {
-        type inet:uri;
-        description
-          "A RESTCONF protocol capability URI.";
-      }
-    }
-
-    container streams {
-      description
-        "Container representing the notification event streams
-         supported by the server.";
-       reference
-         "RFC 5277, Section 3.4, <streams> element.";
-
-      list stream {
-        key name;
-        description
-          "Each entry describes an event stream supported by
-           the server.";
-
-        leaf name {
-          type string;
-          description
-            "The stream name.";
-          reference
-            "RFC 5277, Section 3.4, <name> element.";
-        }
-
-        leaf description {
-          type string;
-          description
-            "Description of stream content.";
-          reference
-            "RFC 5277, Section 3.4, <description> element.";
-        }
-
-        leaf replay-support {
-          type boolean;
-          default false;
-          description
-            "Indicates if replay buffer is supported for this stream.
-             If 'true', then the server MUST support the 'start-time'
-             and 'stop-time' query parameters for this stream.";
-          reference
-            "RFC 5277, Section 3.4, <replaySupport> element.";
-        }
-
-        leaf replay-log-creation-time {
-          when "../replay-support" {
-            description
-              "Only present if notification replay is supported.";
-          }
-          type yang:date-and-time;
-          description
-            "Indicates the time the replay log for this stream
-             was created.";
-          reference
-            "RFC 5277, Section 3.4, <replayLogCreationTime>
-             element.";
-        }
-
-        list access {
-          key encoding;
-          min-elements 1;
-          description
-            "The server will create an entry in this list for each
-             encoding format that is supported for this stream.
-             The media type 'text/event-stream' is expected
-             for all event streams.  This list identifies the
-             subtypes supported for this stream.";
-
-          leaf encoding {
-            type string;
-            description
-              "This is the secondary encoding format within the
-               'text/event-stream' encoding used by all streams.
-               The type 'xml' is supported for XML encoding.
-               The type 'json' is supported for JSON encoding.";
-          }
-
-          leaf location {
-            type inet:uri;
-            mandatory true;
-            description
-              "Contains a URL that represents the entry point
-               for establishing notification delivery via
-               server-sent events.";
-          }
-        }
-      }
-    }
-  }
-
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-library.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-yang-library.yang
deleted file mode 100644
index dac53a1d0..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-library.yang
+++ /dev/null
@@ -1,544 +0,0 @@
-module ietf-yang-library {
-  yang-version 1.1;
-  namespace "urn:ietf:params:xml:ns:yang:ietf-yang-library";
-  prefix yanglib;
-
-  import ietf-yang-types {
-    prefix yang;
-    reference
-      "RFC 6991: Common YANG Data Types";
-  }
-  import ietf-inet-types {
-    prefix inet;
-    reference
-      "RFC 6991: Common YANG Data Types";
-  }
-  import ietf-datastores {
-    prefix ds;
-    reference
-      "RFC 8342: Network Management Datastore Architecture
-                 (NMDA)";
-  }
-
-  organization
-    "IETF NETCONF (Network Configuration) Working Group";
-  contact
-    "WG Web:   <https://datatracker.ietf.org/wg/netconf/>
-     WG List:  <mailto:netconf@ietf.org>
-
-     Author:   Andy Bierman
-               <mailto:andy@yumaworks.com>
-
-     Author:   Martin Bjorklund
-               <mailto:mbj@tail-f.com>
-
-     Author:   Juergen Schoenwaelder
-               <mailto:j.schoenwaelder@jacobs-university.de>
-
-     Author:   Kent Watsen
-               <mailto:kent+ietf@watsen.net>
-
-     Author:   Robert Wilton
-               <mailto:rwilton@cisco.com>";
-  description
-    "This module provides information about the YANG modules,
-     datastores, and datastore schemas used by a network
-     management server.
-     The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
-     NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
-     'MAY', and 'OPTIONAL' in this document are to be interpreted as
-     described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
-     they appear in all capitals, as shown here.
-
-     Copyright (c) 2019 IETF Trust and the persons identified as
-     authors of the code.  All rights reserved.
-
-     Redistribution and use in source and binary forms, with or
-     without modification, is permitted pursuant to, and subject
-     to the license terms contained in, the Simplified BSD License
-     set forth in Section 4.c of the IETF Trust's Legal Provisions
-     Relating to IETF Documents
-     (https://trustee.ietf.org/license-info).
-
-     This version of this YANG module is part of RFC 8525; see
-     the RFC itself for full legal notices.";
-
-  revision 2019-01-04 {
-    description
-      "Added support for multiple datastores according to the
-       Network Management Datastore Architecture (NMDA).";
-    reference
-      "RFC 8525: YANG Library";
-  }
-  revision 2016-04-09 {
-    description
-      "Initial revision.";
-    reference
-      "RFC 7895: YANG Module Library";
-  }
-
-  /*
-   * Typedefs
-   */
-
-  typedef revision-identifier {
-    type string {
-      pattern '\d{4}-\d{2}-\d{2}';
-    }
-    description
-      "Represents a specific date in YYYY-MM-DD format.";
-  }
-
-  /*
-   * Groupings
-   */
-  grouping module-identification-leafs {
-    description
-      "Parameters for identifying YANG modules and submodules.";
-    leaf name {
-      type yang:yang-identifier;
-      mandatory true;
-      description
-        "The YANG module or submodule name.";
-    }
-    leaf revision {
-      type revision-identifier;
-      description
-        "The YANG module or submodule revision date.  If no revision
-         statement is present in the YANG module or submodule, this
-         leaf is not instantiated.";
-    }
-  }
-
-  grouping location-leaf-list {
-    description
-      "Common leaf-list parameter for the locations of modules and
-       submodules.";
-    leaf-list location {
-      type inet:uri;
-      description
-        "Contains a URL that represents the YANG schema
-         resource for this module or submodule.
-
-         This leaf will only be present if there is a URL
-         available for retrieval of the schema for this entry.";
-    }
-  }
-
-  grouping module-implementation-parameters {
-    description
-      "Parameters for describing the implementation of a module.";
-    leaf-list feature {
-      type yang:yang-identifier;
-      description
-        "List of all YANG feature names from this module that are
-         supported by the server, regardless whether they are defined
-         in the module or any included submodule.";
-    }
-    leaf-list deviation {
-      type leafref {
-        path "../../module/name";
-      }
-
-      description
-        "List of all YANG deviation modules used by this server to
-         modify the conformance of the module associated with this
-         entry.  Note that the same module can be used for deviations
-         for multiple modules, so the same entry MAY appear within
-         multiple 'module' entries.
-
-         This reference MUST NOT (directly or indirectly)
-         refer to the module being deviated.
-
-         Robust clients may want to make sure that they handle a
-         situation where a module deviates itself (directly or
-         indirectly) gracefully.";
-    }
-  }
-
-  grouping module-set-parameters {
-    description
-      "A set of parameters that describe a module set.";
-    leaf name {
-      type string;
-      description
-        "An arbitrary name of the module set.";
-    }
-    list module {
-      key "name";
-      description
-        "An entry in this list represents a module implemented by the
-         server, as per Section 5.6.5 of RFC 7950, with a particular
-         set of supported features and deviations.";
-      reference
-        "RFC 7950: The YANG 1.1 Data Modeling Language";
-      uses module-identification-leafs;
-      leaf namespace {
-        type inet:uri;
-        mandatory true;
-        description
-          "The XML namespace identifier for this module.";
-      }
-      uses location-leaf-list;
-      list submodule {
-        key "name";
-        description
-          "Each entry represents one submodule within the
-           parent module.";
-        uses module-identification-leafs;
-        uses location-leaf-list;
-      }
-      uses module-implementation-parameters;
-    }
-    list import-only-module {
-      key "name revision";
-      description
-        "An entry in this list indicates that the server imports
-         reusable definitions from the specified revision of the
-         module but does not implement any protocol-accessible
-         objects from this revision.
-
-         Multiple entries for the same module name MAY exist.  This
-         can occur if multiple modules import the same module but
-         specify different revision dates in the import statements.";
-      leaf name {
-        type yang:yang-identifier;
-        description
-          "The YANG module name.";
-      }
-      leaf revision {
-        type union {
-          type revision-identifier;
-          type string {
-            length "0";
-          }
-        }
-        description
-          "The YANG module revision date.
-           A zero-length string is used if no revision statement
-           is present in the YANG module.";
-      }
-      leaf namespace {
-        type inet:uri;
-        mandatory true;
-        description
-          "The XML namespace identifier for this module.";
-      }
-      uses location-leaf-list;
-      list submodule {
-        key "name";
-        description
-          "Each entry represents one submodule within the
-           parent module.";
-        uses module-identification-leafs;
-        uses location-leaf-list;
-      }
-    }
-  }
-
-  grouping yang-library-parameters {
-    description
-      "The YANG library data structure is represented as a grouping
-       so it can be reused in configuration or another monitoring
-       data structure.";
-    list module-set {
-      key "name";
-      description
-        "A set of modules that may be used by one or more schemas.
-
-         A module set does not have to be referentially complete,
-         i.e., it may define modules that contain import statements
-         for other modules not included in the module set.";
-      uses module-set-parameters;
-    }
-    list schema {
-      key "name";
-      description
-        "A datastore schema that may be used by one or more
-         datastores.
-
-         The schema must be valid and referentially complete, i.e.,
-         it must contain modules to satisfy all used import
-         statements for all modules specified in the schema.";
-      leaf name {
-        type string;
-        description
-          "An arbitrary name of the schema.";
-      }
-      leaf-list module-set {
-        type leafref {
-          path "../../module-set/name";
-        }
-        description
-          "A set of module-sets that are included in this schema.
-           If a non-import-only module appears in multiple module
-           sets, then the module revision and the associated features
-           and deviations must be identical.";
-      }
-    }
-    list datastore {
-      key "name";
-      description
-        "A datastore supported by this server.
-
-         Each datastore indicates which schema it supports.
-
-         The server MUST instantiate one entry in this list per
-         specific datastore it supports.
-         Each datastore entry with the same datastore schema SHOULD
-         reference the same schema.";
-      leaf name {
-        type ds:datastore-ref;
-        description
-          "The identity of the datastore.";
-      }
-      leaf schema {
-        type leafref {
-          path "../../schema/name";
-        }
-        mandatory true;
-        description
-          "A reference to the schema supported by this datastore.
-           All non-import-only modules of the schema are implemented
-           with their associated features and deviations.";
-      }
-    }
-  }
-
-  /*
-   * Top-level container
-   */
-
-  container yang-library {
-    config false;
-    description
-      "Container holding the entire YANG library of this server.";
-    uses yang-library-parameters;
-    leaf content-id {
-      type string;
-      mandatory true;
-      description
-        "A server-generated identifier of the contents of the
-         '/yang-library' tree.  The server MUST change the value of
-         this leaf if the information represented by the
-         '/yang-library' tree, except '/yang-library/content-id', has
-         changed.";
-    }
-  }
-
-  /*
-   * Notifications
-   */
-
-  notification yang-library-update {
-    description
-      "Generated when any YANG library information on the
-       server has changed.";
-    leaf content-id {
-      type leafref {
-        path "/yanglib:yang-library/yanglib:content-id";
-      }
-      mandatory true;
-      description
-        "Contains the YANG library content identifier for the updated
-         YANG library at the time the notification is generated.";
-    }
-  }
-
-  /*
-   * Legacy groupings
-   */
-
-  grouping module-list {
-    status deprecated;
-    description
-      "The module data structure is represented as a grouping
-       so it can be reused in configuration or another monitoring
-       data structure.";
-
-    grouping common-leafs {
-      status deprecated;
-      description
-        "Common parameters for YANG modules and submodules.";
-      leaf name {
-        type yang:yang-identifier;
-        status deprecated;
-        description
-          "The YANG module or submodule name.";
-      }
-      leaf revision {
-        type union {
-          type revision-identifier;
-          type string {
-            length "0";
-          }
-        }
-        status deprecated;
-        description
-          "The YANG module or submodule revision date.
-           A zero-length string is used if no revision statement
-           is present in the YANG module or submodule.";
-      }
-    }
-
-    grouping schema-leaf {
-      status deprecated;
-      description
-        "Common schema leaf parameter for modules and submodules.";
-      leaf schema {
-        type inet:uri;
-        description
-          "Contains a URL that represents the YANG schema
-           resource for this module or submodule.
-
-           This leaf will only be present if there is a URL
-           available for retrieval of the schema for this entry.";
-      }
-    }
-    list module {
-      key "name revision";
-      status deprecated;
-      description
-        "Each entry represents one revision of one module
-         currently supported by the server.";
-      uses common-leafs {
-        status deprecated;
-      }
-      uses schema-leaf {
-        status deprecated;
-      }
-      leaf namespace {
-        type inet:uri;
-        mandatory true;
-        status deprecated;
-        description
-          "The XML namespace identifier for this module.";
-      }
-      leaf-list feature {
-        type yang:yang-identifier;
-        status deprecated;
-        description
-          "List of YANG feature names from this module that are
-           supported by the server, regardless of whether they are
-           defined in the module or any included submodule.";
-      }
-      list deviation {
-        key "name revision";
-        status deprecated;
-
-        description
-          "List of YANG deviation module names and revisions
-           used by this server to modify the conformance of
-           the module associated with this entry.  Note that
-           the same module can be used for deviations for
-           multiple modules, so the same entry MAY appear
-           within multiple 'module' entries.
-
-           The deviation module MUST be present in the 'module'
-           list, with the same name and revision values.
-           The 'conformance-type' value will be 'implement' for
-           the deviation module.";
-        uses common-leafs {
-          status deprecated;
-        }
-      }
-      leaf conformance-type {
-        type enumeration {
-          enum implement {
-            description
-              "Indicates that the server implements one or more
-               protocol-accessible objects defined in the YANG module
-               identified in this entry.  This includes deviation
-               statements defined in the module.
-
-               For YANG version 1.1 modules, there is at most one
-               'module' entry with conformance type 'implement' for a
-               particular module name, since YANG 1.1 requires that
-               at most one revision of a module is implemented.
-
-               For YANG version 1 modules, there SHOULD NOT be more
-               than one 'module' entry for a particular module
-               name.";
-          }
-          enum import {
-            description
-              "Indicates that the server imports reusable definitions
-               from the specified revision of the module but does
-               not implement any protocol-accessible objects from
-               this revision.
-
-               Multiple 'module' entries for the same module name MAY
-               exist.  This can occur if multiple modules import the
-               same module but specify different revision dates in
-               the import statements.";
-          }
-        }
-        mandatory true;
-        status deprecated;
-        description
-          "Indicates the type of conformance the server is claiming
-           for the YANG module identified by this entry.";
-      }
-      list submodule {
-        key "name revision";
-        status deprecated;
-        description
-          "Each entry represents one submodule within the
-           parent module.";
-        uses common-leafs {
-          status deprecated;
-        }
-        uses schema-leaf {
-          status deprecated;
-        }
-      }
-    }
-  }
-
-  /*
-   * Legacy operational state data nodes
-   */
-
-  container modules-state {
-    config false;
-    status deprecated;
-    description
-      "Contains YANG module monitoring information.";
-    leaf module-set-id {
-      type string;
-      mandatory true;
-      status deprecated;
-      description
-        "Contains a server-specific identifier representing
-         the current set of modules and submodules.  The
-         server MUST change the value of this leaf if the
-         information represented by the 'module' list instances
-         has changed.";
-    }
-    uses module-list {
-      status deprecated;
-    }
-  }
-
-  /*
-   * Legacy notifications
-   */
-
-  notification yang-library-change {
-    status deprecated;
-    description
-      "Generated when the set of modules and submodules supported
-       by the server has changed.";
-    leaf module-set-id {
-      type leafref {
-        path "/yanglib:modules-state/yanglib:module-set-id";
-      }
-      mandatory true;
-      status deprecated;
-      description
-        "Contains the module-set-id value representing the
-         set of modules and submodules supported at the server
-         at the time the notification is generated.";
-    }
-  }
-}
diff --git a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-smiv2.yang b/profiles/bundles/yang/ietf/0.1.6/ietf-yang-smiv2.yang
deleted file mode 100644
index 5127e22f7..000000000
--- a/profiles/bundles/yang/ietf/0.1.6/ietf-yang-smiv2.yang
+++ /dev/null
@@ -1,146 +0,0 @@
-module ietf-yang-smiv2 {
-
-  namespace "urn:ietf:params:xml:ns:yang:ietf-yang-smiv2";
-  prefix "smiv2";
-
-  organization
-   "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-  contact
-   "WG Web:   <http://tools.ietf.org/wg/netmod/>
-    WG List:  <mailto:netmod@ietf.org>
-
-    WG Chair: David Kessens
-              <mailto:david.kessens@nsn.com>
-
-    WG Chair: Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>
-
-    Editor:   Juergen Schoenwaelder
-              <mailto:j.schoenwaelder@jacobs-university.de>";
-
-  description
-   "This module defines YANG extensions that are used to translate
-    SMIv2 concepts into YANG.
-
-    Copyright (c) 2012 IETF Trust and the persons identified as
-    authors of the code.  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-    without modification, is permitted pursuant to, and subject
-    to the license terms contained in, the Simplified BSD License
-    set forth in Section 4.c of the IETF Trust's Legal Provisions
-    Relating to IETF Documents
-    (http://trustee.ietf.org/license-info).
-
-    This version of this YANG module is part of RFC 6643; see
-    the RFC itself for full legal notices.";
-
-  revision 2012-06-22 {
-    description
-     "Initial revision.";
-    reference
-     "RFC 6643: Translation of Structure of Management Information
-      Version 2 (SMIv2) MIB Modules to YANG Modules";
-  }
-
-  identity object-identity {
-    description
-     "Base identity for all SMIv2 OBJECT-IDENTITYs.";
-  }
-
-  typedef opaque {
-    type binary;
-    description
-     "The Opaque type supports the capability to pass arbitrary ASN.1
-      syntax.  A value is encoded using the ASN.1 Basic Encoding Rules
-      into a string of octets.  This, in turn, is encoded as an OCTET
-      STRING, in effect 'double-wrapping' the original ASN.1 value.
-
-      In the value set and its semantics, this type is equivalent to
-      the Opaque type of the SMIv2.  This type exists in the SMIv2
-      solely for backward-compatibility reasons and this is also
-      true for this YANG data type.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-  extension display-hint {
-    argument "format";
-    description
-     "The display-hint statement takes as an argument the DISPLAY-HINT
-      assigned to an SMIv2 textual convention.";
-    reference
-     "RFC 2579: Textual Conventions for SMIv2";
-  }
-
-  extension max-access {
-    argument "access";
-    description
-     "The max-access statement takes as an argument the MAX-ACCESS
-      assigned to an SMIv2 object definition.
-
-      The MAX-ACCESS value is SMIv2 specific and has no impact on
-      the access provided to YANG objects through protocols such
-      as NETCONF.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-  extension defval {
-    argument "value";
-    description
-     "The defval statement takes as an argument a default value
-      defined by an SMIv2 DEFVAL clause.  Note that the value is in
-      the SMIv2 value space defined by the SMIv2 syntax of the
-      corresponding object and not in the YANG value space
-      defined by the corresponding YANG data type.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-  extension implied {
-    argument "index";
-    description
-     "If an SMIv2 INDEX object is preceded by the IMPLIED keyword, then
-      the implied statement is present in the YANG module and takes as
-      an argument the name of the IMPLIED index object.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-   }
-
-  extension alias {
-    argument "descriptor";
-    description
-     "The alias statement introduces an SMIv2 descriptor.  The body of
-      the alias statement is expected to contain an oid statement that
-      provides the numeric OID associated with the descriptor.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-  extension oid {
-    argument "value";
-    description
-     "The oid statement takes as an argument the object identifier
-      assigned to an SMIv2 definition.  The object identifier value
-      is written in decimal dotted notation.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-  extension subid {
-    argument "value";
-    description
-     "The subid statement takes as an argument the last sub-identifier
-      of the object identifier assigned to an SMIv2 definition.  The
-      sub-identifier value is a single positive decimal natural number.
-      The subid statement may not be used as a substatement to any
-      top-level node in a YANG document.  The subid substatement may
-      be used only as a substatement to a node having a parent node
-      defined with either an smiv2:oid or smiv2:subid substatement.";
-    reference
-     "RFC 2578: Structure of Management Information Version 2 (SMIv2)";
-  }
-
-}
diff --git a/profiles/services/gnmi-0.4.0.json b/profiles/services/gnmi-0.4.0.json
index 7ae671540..feae79927 100644
--- a/profiles/services/gnmi-0.4.0.json
+++ b/profiles/services/gnmi-0.4.0.json
@@ -1,10 +1,10 @@
 {
   "name": "gnmi",
-  "version": "0.4.0.5",
+  "version": "0.4.0-post5",
   "author": "Cisco",
   "copyright": "Cisco",
   "description": "YDK gNMI service profile",
-  "long_description": "This YANG Development Kit (YDK) service package provides APIs for gNMI protocol.",
+  "long_description": "This YANG Development Kit (YDK) bundle provides APIs for OpenConfig YANG models. YDK facilitates the use of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles.  This YDK bundle for OpenConfig models uses the YDK core package and additional model bundles.  You can find the SDK documentation at http://ydk.cisco.com/py/docs  You can find more details on YDK at http://ydk.io",
   "dependency": [
     {
       "name": "ydk",
diff --git a/profiles/test/cisco-iosxe-demo.json b/profiles/test/cisco-iosxe-demo.json
deleted file mode 100644
index b2620e99a..000000000
--- a/profiles/test/cisco-iosxe-demo.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "cisco-iosxe-demo",
-    "version": "16.9.3",
-    "core_version":"0.8.5",
-    "author": "Yan",
-    "copyright": "Cisco Systems",
-    "description": "YDK Demo profile for YDK demo on Cisco IOS XE 16.9.3",
-    "models": {
-        "dir": [
-	        "profiles/bundles/yang/cisco-ios-xe"
-        ]
-    }
-}
diff --git a/profiles/test/cisco-iosxr-demo.json b/profiles/test/cisco-iosxr-demo.json
deleted file mode 100644
index 6bbbf50af..000000000
--- a/profiles/test/cisco-iosxr-demo.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "cisco-iosxr-demo",
-    "version": "6.7.3",
-    "core_version":"0.8.5",
-    "author": "Yan",
-    "copyright": "Cisco Systems",
-    "description": "YDK Demo profile for YDK demo on Cisco IOS XR 6.7.3",
-    "models": {
-        "dir": [
-	        "profiles/bundles/yang/cisco-iosxr"
-        ]
-    }
-}
diff --git a/profiles/test/deviation.json b/profiles/test/deviation.json
index fe945842c..aca698b5c 100644
--- a/profiles/test/deviation.json
+++ b/profiles/test/deviation.json
@@ -1,7 +1,7 @@
 {
     "name": "deviation",
     "version": "0.1.0",
-    "core_version": "0.5.1",
+    "ydk_version":"0.5.1",
     "author": "Cisco",
     "copyright": "Cisco",
     "description": "YDK Test Profile",
diff --git a/profiles/test/opendaylight.json b/profiles/test/opendaylight.json
index abecb05fa..e407da228 100644
--- a/profiles/test/opendaylight.json
+++ b/profiles/test/opendaylight.json
@@ -1,7 +1,7 @@
 {
     "name": "opendaylight",
     "version": "0.0.1",
-    "core_version": "0.5.3",
+    "ydk_version":"0.5.3",
     "author": "Cisco",
     "copyright": "Cisco",
     "description": "YDK Test Profile",
diff --git a/profiles/test/ydktest-augmentation.json b/profiles/test/ydktest-augmentation.json
index 1dc433414..e111d6586 100644
--- a/profiles/test/ydktest-augmentation.json
+++ b/profiles/test/ydktest-augmentation.json
@@ -1,7 +1,7 @@
 {
    "name":"augmentation",
    "version":"0.1.0",
-   "core_version": "0.5.5",
+   "ydk_version":"0.4.1",
    "author":"Cisco",
    "copyright":"Cisco",
    "description":"YDK Test Profile",
diff --git a/profiles/test/ydktest-cpp-new.json b/profiles/test/ydktest-cpp-new.json
index 0eaf0a85d..7da0830e7 100644
--- a/profiles/test/ydktest-cpp-new.json
+++ b/profiles/test/ydktest-cpp-new.json
@@ -1,7 +1,7 @@
 {
     "name": "ydktest-new",
     "version":"0.1.0",
-    "core_version": "0.5.0",
+    "ydk_version":"0.5.0",
     "author": "Cisco",
     "copyright": "Cisco",
     "description": "YDK Test Profile",
diff --git a/profiles/test/ydktest-cpp.json b/profiles/test/ydktest-cpp.json
index fd4659872..7646e22d3 100644
--- a/profiles/test/ydktest-cpp.json
+++ b/profiles/test/ydktest-cpp.json
@@ -1,14 +1,13 @@
 {
     "name": "ydktest",
-    "version":"0.1.1",
+    "version":"0.1.0",
     "core_version":"0.8.1",
     "author": "Cisco",
     "copyright": "Cisco",
     "description": "YDK Test Profile",
     "models": {
-        "file": [
+    "file": [
             "sdk/cpp/core/tests/models/ietf-interfaces@2014-05-08.yang",
-            "sdk/cpp/core/tests/models/ietf-netconf-monitoring@2010-10-04.yang",
             "sdk/cpp/core/tests/models/main@2015-11-17.yang",
             "sdk/cpp/core/tests/models/main-aug1@2015-11-17.yang",
             "sdk/cpp/core/tests/models/openconfig-bgp-common-multiprotocol.yang",
@@ -40,7 +39,6 @@
             "sdk/cpp/core/tests/models/ydktest-types@2016-05-23.yang",
             "sdk/cpp/core/tests/models/oc-pattern@2015-11-17.yang",
             "sdk/cpp/core/tests/models/iana-crypt-hash@2014-08-06.yang",
-
             "yang/ietf/ietf-inet-types@2013-07-15.yang",
             "yang/ietf/ietf-yang-types@2013-07-15.yang",
             "yang/ietf/iana-if-type.yang",
@@ -50,8 +48,8 @@
             "yang/ietf/ietf-system.yang"
         ],
 
-        "dir": [
-            "yang/ydktest-augmentation"
-        ]
+    "dir": [
+        "yang/ydktest-augmentation"
+    ]
     }
 }
diff --git a/profiles/test/ydktest.json b/profiles/test/ydktest.json
index f7af12eaf..af4fa7c1e 100644
--- a/profiles/test/ydktest.json
+++ b/profiles/test/ydktest.json
@@ -1,21 +1,13 @@
 {
     "name": "ydktest",
-    "version": "0.5.1.dev1",
-    "core_version":"0.5.5",
+    "version": "0.5.1",
+    "ydk_version":"0.5.5",
     "author": "Cisco",
     "copyright": "Cisco",
     "description": "YDK Test Profile",
     "models": {
-    "file": [
-          "sdk/cpp/core/tests/models/ydktest-filterread@2015-11-17.yang",
-          "sdk/cpp/core/tests/models/ydktest-sanity-augm@2015-11-17.yang",
-          "sdk/cpp/core/tests/models/ydktest-sanity-submodule@2016-04-25.yang",
-          "sdk/cpp/core/tests/models/ydktest-sanity-typedefs@2018-01-30.yang",
-          "sdk/cpp/core/tests/models/ydktest-sanity-types@2016-04-11.yang",
-          "sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang",
-          "sdk/cpp/core/tests/models/ydktest-types@2016-05-23.yang",
-          "sdk/cpp/core/tests/models/oc-pattern@2015-11-17.yang",
-          "yang/ietf/ietf-yang-types@2013-07-15.yang"
-      ]
+    "dir": [
+        "/sdk/cpp/core/tests/models"
+        ]
     }
 }
diff --git a/requirements.txt b/requirements.txt
index 73214c513..19037a96f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,6 @@
-pyang>=2.5.3
-MarkupSafe>=1.1.1
-Jinja2>=2.11.3
-pybind11==2.6.2
-Sphinx>=1.5.6
-sphinx-rtd-theme>=0.1.9
-GitPython>=2.1.15
-rstr>=2.2.6
-wheel>=0.37.1
-packaging>=20.8
+pyang==1.6
+Sphinx==1.4a1
+sphinx-rtd-theme==0.1.9
+GitPython==2.1.15
+rstr==2.2.6
+wheel==0.34.2
diff --git a/sdk/_docsgen_common/about_ydk.rst b/sdk/_docsgen_common/about_ydk.rst
index ea95dfe08..140e9f130 100644
--- a/sdk/_docsgen_common/about_ydk.rst
+++ b/sdk/_docsgen_common/about_ydk.rst
@@ -1,74 +1,33 @@
-..
-  #  YDK-YANG Development Kit
-  #  Copyright 2016 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 About YDK
 =========
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The YDK allows generate YANG model API and provides services to apply generated API over various communication protocols.
-Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
-YDK provides CRUD and protocol specific services over above protocols.
-YDK also provides codec services to translate API models to/from XML and JSON encoded strings.
 
-The YDK is a multi-language software. Currently supported languages are Python, Go, and C++.
+A Software Development Kit that provides API's that are modeled in YANG.
 
 License
 -------
-Copyright 2016-2019 Cisco Systems. All rights reserved
+Copyright 2016 Cisco Systems. All rights reserved
 
-Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
-See the NOTICE file distributed with this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at:
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at:
 
     `http://www.apache.org/licenses/LICENSE-2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
-
-Some of the source files in this release have been modified by Yan Gorelik, YDK Solutions.
-All modifications in original files under CiscoDevNet domain introduced since October 2019 are copyrighted
-and protected under Apache License, Version 2.0.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License.
 
 Version
 -------
 Version : version-id
 
-This YDK documentation was generated using
-`ydk-gen/generate.py <https://github.com/CiscoDevNet/ydk-gen/blob/master/generate.py>`_ script.
+This ydk-language-version is generated using `ydk-gen <https://github.com/CiscoDevNet/ydk-gen>`_.
 
-To check out this version of ydk-gen use the below commands:
+To check out the version of ydk-gen used to generate this ydk-language-version, use the below commands:
 
-.. code-block:: sh
+.. code-block:: bash
+    :linenos:
 
     $ git clone repo-url
     $ git checkout commit-id
 
-Release Changes
----------------
- - `Changelog <https://github.com/CiscoDevNet/ydk-gen/blob/master/CHANGES.md>`_
+
+Changelog
+----------
+ - `Changelog <https://github.com/CiscoDevNet/ydk-language-version/blob/master/CHANGES.md>`_
diff --git a/sdk/cpp/CHANGES.md b/sdk/cpp/CHANGES.md
index e6e1cd201..fd7e089bc 100644
--- a/sdk/cpp/CHANGES.md
+++ b/sdk/cpp/CHANGES.md
@@ -1,57 +1,4 @@
-### 2023-01-31 version 0.8.6.4
-
-#### New features and enhancements
-  * install_ydk.sh: Installation of Python YDK packages should not require root access ([#1069](https://github.com/CiscoDevNet/ydk-gen/issues/1069))
-  * Expanded unit test cases to retrieve list elements
-
-#### Resolved GitHub issues
-  * CodecService fails to decode XML in python when referencing namespace prefix ([#1071](https://github.com/CiscoDevNet/ydk-gen/issues/1071))
-  * not_eq is a c++ keyword ([#1080](https://github.com/CiscoDevNet/ydk-gen/issues/1080))
-  * libyang issue with arguments that are swapped ([#1081](https://github.com/CiscoDevNet/ydk-gen/issues/1081))
-
-### Resolved non-GitHub issues
-  * Fixed and tested C++ sample apps
-
-
-### 2022-07-31 version 0.8.6.3
-
-#### Resolved GitHub issues
-  * IndexError on decoding empty string value in JSON payload ([#1061](https://github.com/CiscoDevNet/ydk-gen/issues/1061))
-  * ExecutorService fails on non-ietf RPC with Libyang error ([#1067](https://github.com/CiscoDevNet/ydk-gen/issues/1067))
-
-
-### 2022-03-31 version 0.8.6.2
-
-#### New features and enhancements
-  * Added support for MacOS Big Sur
-
-#### Resolved GitHub issues
-  * getting YCodecError when leaf value has string 'sftp://' ([#1056](https://github.com/CiscoDevNet/ydk-gen/issues/1056))
-  * vrf route-target leaf stitching(bool) fails as invalid ([#1059](https://github.com/CiscoDevNet/ydk-gen/issues/1059))
-
-#### Resolved non-GitHub issues
-  * Corrected few Codacy issues
-  * Addressed segmentation fault error when required modules are not loaded.
-  * Provided patch for catch.hpp, which ensures definition of constant SIGSTKSZ
-
-
-### 2021-05-30 version 0.8.5.2
-
-#### Resolved GitHub issues
-  * Version numbers in bundle resolver to comply with PEP 440 ([#1007](https://github.com/CiscoDevNet/ydk-gen/issues/1007))
-  * The Executor Service fails to return module content to user ([#1035](https://github.com/CiscoDevNet/ydk-gen/issues/1035))
-  * Docker base image python error ([#1036](https://github.com/CiscoDevNet/ydk-gen/issues/1036))
-  * XmlSubtreeCodec fails encode leaf-list data ([#1045](https://github.com/CiscoDevNet/ydk-gen/issues/1045))
-  * C++ CodecService fails to encode non-top level entity to XML subtree ([#1049](https://github.com/CiscoDevNet/ydk-gen/issues/1049))
-
-#### Other resolved issues and enhancements
-  * Fixed few minor bugs in C++ code
-  * Added installation of flex and bison for CentOS platform
-  * Added scripts for local unit testing of YDK release
-  * Tested YDK on Windows 10 using Windows Subsystem for Linux and Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) virtual machines.
-
-
-### 2020-09-30 version 0.8.5
+### 2020-07-30 version 0.8.5
 
 #### New features and enhancements
   * Added Entity class member function to clone entity object
@@ -67,8 +14,6 @@
   * create_datanode in Path API returns incorrect object and sets incorrect value ([#1003](https://github.com/CiscoDevNet/ydk-gen/issues/1003))
   * create_datanode rejects absolute paths with a leading "/" as defined in RFC 7950 ([#1005](https://github.com/CiscoDevNet/ydk-gen/issues/1005))
   * Path API create_datanode rejects valid value ([#1006](https://github.com/CiscoDevNet/ydk-gen/issues/1006))
-  * data tag not recognized when attribute present ([#1021](https://github.com/CiscoDevNet/ydk-gen/issues/1021))
-  * c++ generated bundle class fails to compile in gcc when model contains leaf 'minor' ([#1024](https://github.com/CiscoDevNet/ydk-gen/issues/1024))
 
 #### Bundle improvements
   * Updated cisco-ios-xr bundle to support Cisco IOS XR 6.6.3
@@ -345,7 +290,7 @@
 * Add support for choosing either a per-device or a common cache for storing downloaded yang models ([#502](https://github.com/CiscoDevNet/ydk-gen/pull/502))
 * Introduced encoding/decoding subtree XML in `CodecService` and changed `CRUDService` to use XML subtree filtering to create filters for the `read` operation ([#489](https://github.com/CiscoDevNet/ydk-gen/pull/489))
 * Added support for non-standard RPCs as well in path API ([#498](https://github.com/CiscoDevNet/ydk-gen/pull/498))
-* Add ability to generate Linux and MacOS packages in cmake using [cpack](https://cmake.org/Wiki/CMake:Packaging_With_CPack) ([#466](https://github.com/CiscoDevNet/ydk-gen/pull/466))
+* Add ability to generate Linux and Mac OSX packages in cmake using [cpack](https://cmake.org/Wiki/CMake:Packaging_With_CPack) ([#466](https://github.com/CiscoDevNet/ydk-gen/pull/466))
 
 #### ydk-gen
 * Updated [`cisco-ios-xr`](https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_2_2.json) to support Cisco IOS XR 6.2.2 release
@@ -393,7 +338,7 @@
   * RestconfServiceProvider
   * OpenDaylightServiceProvider
 * Introduced support for netconf service ([#341](https://github.com/CiscoDevNet/ydk-gen/pull/341), [#352](https://github.com/CiscoDevNet/ydk-gen/pull/352))
-* Released ydk-cpp for MacOS platform (on [Homebrew](https://github.com/CiscoDevNet/homebrew-ydk)) and on Ubuntu platform (on [Lauchpad](https://launchpad.net/~ydk)) ([#362](https://github.com/CiscoDevNet/ydk-gen/pull/362), [#322](https://github.com/CiscoDevNet/ydk-gen/pull/322))
+* Released ydk-cpp for OSX platform (on [Homebrew](https://github.com/CiscoDevNet/homebrew-ydk)) and on Ubuntu platform (on [Lauchpad](https://launchpad.net/~ydk)) ([#362](https://github.com/CiscoDevNet/ydk-gen/pull/362), [#322](https://github.com/CiscoDevNet/ydk-gen/pull/322))
 * Added support for generated CRUD model tests based on bundles ([#354](https://github.com/CiscoDevNet/ydk-gen/pull/354))
 * Improved negative test cases and added support for netconf operations on leafs and leaf-lists ([#324](https://github.com/CiscoDevNet/ydk-gen/pull/324))
 
diff --git a/sdk/cpp/README.md b/sdk/cpp/README.md
index ccbb77de4..b65780588 100644
--- a/sdk/cpp/README.md
+++ b/sdk/cpp/README.md
@@ -36,13 +36,12 @@
 **Table of Contents**
 
 - [Overview](#overview)
-- [Backward Compatibility](#backward-compatibility)
 - [Docker](#docker)
-- [System Requirements](#system-requirements)
-- [Core Installation](#core-installation)
-  - [Installation script](#installation-script)
-  - [Building from source](#building-from-source)
-- [Adding gNMI service](#adding-gnmi-service)
+- [How to Install](#how-to-install)
+  - [System Requirements](#system-requirements)
+  - [Quick Install](#quick-install)
+  - [Installing from source](#installing-from-source)    
+    - [Building YDK](#building-ydk)
 - [Documentation and Support](#documentation-and-support)
 - [Release Notes](#release-notes)
 
@@ -57,192 +56,246 @@ Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
 YDK provides CRUD and protocol specific service over above protocols.
 YDK also provides Codec service to translate API models to/from XML and JSON encoded strings.
 
-## Backward Compatibility
+## Docker
 
-The YDK-0.8.6 core is backward compatible with all previously generated model bundles starting from release of YDK-0.7.3.
-However the YDK-0.8.6 generates different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling of YList objects.
+Currently the [docker image](https://docs.docker.com/engine/reference/run/) for ydk-cpp is not been generated.
+Please use [ydk-gen](https://github.com/ygorelik/ydk-gen/tree/0.8.5#docker>) docker image, which has complete environment for ydk-cpp based development.
 
-**NOTE.** Starting from release 0.8.6 the YDK does not support Python2 interpreter as it was deprecated.
+## How to Install
 
-## Docker
+You can install YDK-Cpp on MacOS or Linux platforms. It is not currently supported on Windows.
 
-Currently the [docker image](https://docs.docker.com/engine/reference/run/) for ydk-cpp is not been generated.
-Please use [ydk-gen](https://github.com/CiscoDevNet/ydk-gen#docker>) docker image, which has complete environment for ydk-cpp based development.
+### System Requirements
+
+#### Linux
+##### Ubuntu (Debian-based)
+
+The following packages must be present in your system before installing YDK-Cpp:
+
+```
+$ sudo apt-get install gdebi-core python3-dev libtool-bin
+$ sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
+```
 
-The docker image is automatically built with the latest ydk-gen commit.
-This docker can be used to run ydk-gen without installing anything natively on your platform.
+Install gcc-5 for Xenial (Ubuntu 16.04.4):
 
-To use the docker image, [install docker](https://docs.docker.com/install/) on your system, run the below command.
-See the [docker documentation](https://docs.docker.com/engine/reference/run/) for more details.
+```
+$ # Upgrade compiler to gcc 5.*
+$ sudo apt-get install gcc-5 g++-5 -y > /dev/null
+$ sudo ln -sf /usr/bin/g++-5 /usr/bin/g++
+$ sudo ln -sf /usr/bin/gcc-5 /usr/bin/gcc
+```
+
+#### CentOS-7.x (Fedora-based)
+
+The following packages must be present in your system before installing YDK-Cpp:
 
 ```
-docker run -it ydksolutions/ydk-gen:0.8.6.4
+$ sudo yum install epel-release
+$ sudo yum install libxml2-devel libxslt-devel libssh-devel libtool gcc-c++ pcre-devel cmake3 python36-devel
 ```
 
-## System Requirements
+if your gcc compiler version is below 4.8.1, install gcc-5 and g++-5
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x 
- - MacOS up to 11.6.2 (Big Sur)
+```
+$ yum install centos-release-scl -y > /dev/null
+$ yum install devtoolset-4-gcc* -y > /dev/null
+$ ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
+$ ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
+```
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check [this](https://www.windowscentral.com/install-windows-subsystem-linux-windows-10) for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+#### Mac OSX
 
-On supported platforms the YDK can be installed using [installation script](#installation-script).
-On other platforms the YDK should be installed manually [from source](#building-from-source).
-For both the methods the user must install `git` package prior to the installation procedure.
+It is recommended to install [homebrew](http://brew.sh) and Xcode command line tools on your system before installing YDK-Cpp:
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+```
+$ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+$ brew install pkg-config libssh libxml2 xml2 curl pcre cmake
+$ xcode-select --install
+```
 
-## Core Installation
+#### Libssh installation
 
-### Installation script
+Please note that libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. Therefore, if after installation of libssh package you find that the `libssh_threads.a` library is missing,
+please downgrade the installation of libssh to version 0.7.6, or upgrade to 0.8.1 or higher. Example:
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
+```
+$ wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+$ tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
+$ mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
+$ cmake ..
+$ sudo make install
+```
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-For different location the PYTHON_VENV environment variable should be set to that location.
+### gNMI Requirements
 
-**NOTE.** It is strongly recommended to use Python virtual environment on Centos/RHEL and Mac platforms.
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
 
-Here is simple example of core YDK installation for C++ programming language and Python virtual environment:
+#### Install protobuf and protoc
 
 ```
-git clone https://github.com/CiscoDevNet/ydk-gen.git
-cd ydk-gen
-export YDKGEN_HOME=`pwd`  # optional
-export PYTHON_VENV=$HOME/ydk_vne  # optional
-./install_ydk.sh --cpp --core --venv
+    wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+    unzip protobuf-cpp-3.5.0.zip
+    cd protobuf-3.5.0
+    ./configure
+    make
+    make check
+    sudo make install
+    sudo ldconfig
 ```
 
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this:
+#### Install gRPC
 
 ```
-./install_ydk.sh --help
-usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-Options and arguments:
-  --cpp                 install YDK for C++ programming language;
-                        requires sudo access for dependencies and libraries installation
-  --go                  install YDK for Go programming language
-  --py|--python         install YDK for Python programming language
-  --all                 install YDK for all available programming languages;
-                        requires sudo access for dependencies and libraries installation
-  -v|--venv             create python virtual environment
-  -c|--core             install YDK core package
-  -s|--service gnmi     install gNMI service package
-  -n|--no-deps          skip installation of dependencies;
-                        applicable only with --cpp and --all options
-  -h|--help             print this help message and exit
+    git clone -b v1.9.1 https://github.com/grpc/grpc
+    cd grpc
+    git submodule update --init
+    make
+    sudo make install
+    sudo ldconfig
+    cd -
+```
+
+#### Run-time environment
 
-Environment variables:
-YDKGEN_HOME         specifies location of ydk-gen git repository;
-                    if not set, $HOME/ydk-gen is assumed
-PYTHON_VENV         specifies location of python virtual environment;
-                    if not set, $HOME/venv is assumed
-GOROOT              specifies installation directory of go software;
-                    if not set, /usr/local/go is assumed
-GOPATH              specifies location of go source directory;
-                    if not set, $HOME/go is assumed
-C_INCLUDE_PATH      location of C include files;
-                    if not set, /usr/local/include is assumed
-CPLUS_INCLUDE_PATH  location of C++ include files;
-                    if not set, /usr/local/include is assumed
-CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                    if not set, default system library location is assumed
+There is an open issue with gRPC on Centos/Fedora, which requires an extra step before running any YDK gNMI application. See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_
+for details. As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
+
+```
+    PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
 ```
 
-If user environment is different from the default one (different Python installation or different
-location of libraries) then building from source method should be used.
+### Quick Install
+#### Linux
+##### Ubuntu (Debian-based)
 
-## Building from source
+You can install the latest YDK core package using prebuilt binaries for Xenial and Bionic distributions.
+For other Ubuntu distributions it is recommended to build core libraries from source.
 
-### Environment variables
+For Xenial (Ubuntu 16.04.4, gcc-5.5.0):
 
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the header location must be specified explicitly (in below commands the default location is shown):
 ```
-  export C_INCLUDE_PATH=/usr/local/include
-  export CPLUS_INCLUDE_PATH=/usr/local/include
+$ wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+$ sudo gdebi libydk-0.8.5-1.amd64.deb
 ```
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
 
-### Installing third party dependencies
+For Bionic (Ubuntu 18.04.1, gcc-7.4.0):
 
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script. 
-The script will also install Python virtual environment in default or specified location, when '--venv' is specified.
+```
+$ wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+$ sudo gdebi libydk-0.8.5-1.amd64.deb
+```
 
+##### CentOS-7.x (Fedora-based)
+
+You can install the latest YDK core package using prebuilt binaries.
+The C++ code was compiled with default gcc compiler version, which is 4.8.5. For other gcc compiler versions
+it is recommended to build `libydk` library [from source](#installing-from-source).
+
+```
+$ sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 ```
-# Clone ydk-gen from GitHub
-git clone https://github.com/CiscoDevNet/ydk-gen.git
-cd ydk-gen
 
-# Define optional environment variables and install dependencies
-export YDKGEN_HOME=`pwd`  
-export PYTHON_VENV=$HOME/ydk_venv
-./install_ydk.sh   # also builds Python virtual environment
+#### MacOS  
+
+You can install the latest YDK core package using prebuilt binaries.
+The prebuilt `libydk` package was compiled in MacOS-10.11.6 with clang-8.0.0 compiler.
+For other C++ compilers it is recommended to build `libydk` [from source](#installing-from-source).
+
 ```
+$ curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+$ sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+```
+
+### gNMI Service Installation
 
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
- 
-### Installing core components
+#### Install gNMI service library
 
+##### Linux
+
+For Ubuntu/Xenial:
+
+```
+$ wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+$ sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 ```
-# If created, activate Python virtual environment
-source $PYTHON_VENV/bin/activate
 
-# Generate and install YDK core library
-python3 generate.py -is --core --cpp
+For Ubuntu/Bionic:
+
+```
+$ wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+$ sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 ```
 
-## Adding gNMI Service
+For CentOS
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package. 
+```
+   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
+```
 
-### gNMI service installation
+##### MacOS
+
+```
+$ curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+$ sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
+```
 
-Here is simple example how gNMI service package and Python virtual environment could be added:
+### Installing from source
+#### Building YDK
+
+YDK uses ``cmake`` as the build system of choice. To install the core package, execute:
 
 ```
-cd ydk-gen
-./install_ydk.sh --cpp --service gnmi -v
+ydk-cpp$ cd core/ydk
+core$ mkdir build && cd build
+build$ cmake .. && make
+build$ sudo make install
 ```
 
-### Runtime environment
+Once you have installed the core package, you can install one or more model bundles.  Note that some bundles have dependencies on other bundles.  Those dependencies are captured in the bundle packages used for quick installation. To install the `ietf` bundle, execute:
+
+```
+core$ cd ../../ietf
+ietf$ mkdir build && cd build
+build$ cmake .. && make
+build$ sudo make install
+```
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on [GRPC GitHub](https://github.com/grpc/grpc/issues/10942#issuecomment-312565041) for details.
-As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
+To install the `openconfig` bundle, execute:
 
 ```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+ietf$ cd ../openconfig
+openconfig$ mkdir build && cd build
+build$ cmake .. && make
+build$ sudo make install
+```
+
+To install the `cisco-ios-xr` bundle, execute:
+
+```
+openconfig$ cd ../cisco-ios-xr
+cisco-ios-xr$ mkdir build && cd build
+build$ cmake .. && make
+build$ sudo make install
+```
+
+To install the `cisco-ios-xe` bundle, execute:
+
+```
+openconfig$ cd ../cisco-ios-xe
+cisco-ios-xe$ mkdir build && cd build
+build$ cmake .. && make
+build$ sudo make install
 ```
 
 ## Documentation and Support
-- Read the [API documentation](http://ydk.cisco.com/cpp/docs) (release 0.8.3) for details on how to use the API and specific models
+- Read the [API documentation](http://ydk.cisco.com/cpp/docs) for details on how to use the API and specific models
 - Samples can be found under the [samples directory](https://github.com/CiscoDevNet/ydk-cpp/tree/master/core/samples)
 - Additional samples can be found in the [YDK-Cpp samples repository](https://github.com/CiscoDevNet/ydk-cpp-samples) (coming soon)
-- Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with YDK users and developers
+- Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with other users and with the makers of YDK
+- Additional YDK information can be found at [ydk.io](http://ydk.io)
 
 ## Release Notes
-The current YDK release version is 0.8.6.4.
-
-YDK is licensed under the Apache 2.0 License.
+The current YDK release version is 0.8.5. YDK-Cpp is licensed under the Apache 2.0 License.
diff --git a/sdk/cpp/core/CMakeLists.txt b/sdk/cpp/core/CMakeLists.txt
index cb9b12b04..175d3bfa9 100644
--- a/sdk/cpp/core/CMakeLists.txt
+++ b/sdk/cpp/core/CMakeLists.txt
@@ -1,16 +1,15 @@
 cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(SET CMP0048 NEW)
-project(ydk VERSION 0.8.6 LANGUAGES C CXX)
+project(ydk VERSION 0.8.5 LANGUAGES C CXX)
 
 set(YDK_DESCRIPTION "YANG Development Kit Library. The library for  YDK API.")
 
 # CPack Dynamic Settings
 set (CPACK_PACKAGE_NAME "libydk")
-set (CPACK_PACKAGE_BUILD "4")
-set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}.${CPACK_PACKAGE_BUILD}")
-set (CPACK_LIBRARY_NAME "ydk-${CPACK_PACKAGE_VERSION}")
-set (CPACK_LIBRARY_TARGET "lib${CPACK_LIBRARY_NAME}.a")
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "YDK C++ Core Library")
+set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+set (CPACK_PACKAGE_RELEASE "1")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "YDK Core Library")
+# set (CPACK_PACKAGE_DESCRIPTION_SUMMARY ${YDK_DESCRIPTION})
 
 # CPack Static Settings
 set (CPACK_PACKAGE_DESCRIPTION "An SDK that provides API's that are modeled in YANG.
@@ -65,7 +64,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
         # libydk_0.6.0-0.1.alpha_amd64.deb   // Debian
         set (CPACK_PACKAGE_FILE_NAME
-            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 
     # Linux Fedora
     elseif(${LSB_RELEASE_ID_SHORT} MATCHES "CentOS")
@@ -75,7 +74,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
         set (CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
         set (CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
-        set (CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_BUILD})
+        set (CPACK_RPM_PACKAGE_RELEASE ${CPACK_PACKAGE_RELEASE})
         set (CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
         set (CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
         set (CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
@@ -89,7 +88,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         # <name>-<version>-<release>.<architecture>.(src).rpm
         # libydk-0.6.0-0.1.alpha.x86_64.rpm  // RPM
         set (CPACK_PACKAGE_FILE_NAME
-            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
     endif()
 endif()
 
@@ -367,7 +366,7 @@ include(ExternalProject)
 ExternalProject_Add(project_libnetconf
     PREFIX "${CMAKE_CURRENT_BINARY_DIR}/project_libnetconf"
     URL "https://github.com/ygorelik/libnetconf/archive/master.zip"
-    CONFIGURE_COMMAND ./configure --enable-debug
+    CONFIGURE_COMMAND ./configure
     BUILD_COMMAND "make"
     INSTALL_DIR "${libnetconf_location}"
     INSTALL_COMMAND mkdir -p ${libnetconf_headers_location}/libnetconf && cp ${libnetconf_headers} ${libnetconf_headers_location}/libnetconf
@@ -451,9 +450,9 @@ include_directories(
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_library(${CPACK_LIBRARY_NAME} STATIC ${libydk_src} ${libnetconf_inc_objs} ${libyang_inc_objs})
+add_library(ydk STATIC ${libydk_src} ${libnetconf_inc_objs} ${libyang_inc_objs})
 
-target_link_libraries(${CPACK_LIBRARY_NAME}
+target_link_libraries(ydk
     ${LIBXML2_LIBRARIES}
     ${LIBSSH_LIBRARIES}
     ${curl_location}
@@ -467,15 +466,15 @@ target_link_libraries(${CPACK_LIBRARY_NAME}
     ${dl_location}
 )
 
-set_property(TARGET ${CPACK_LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
-set_property(TARGET ${CPACK_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+set_property(TARGET ydk PROPERTY CXX_STANDARD 11)
+set_property(TARGET ydk PROPERTY CXX_STANDARD_REQUIRED ON)
 set(libyang_extension_lib
 	${libyang_build_location}/src/extensions/libyang_ext_test${CMAKE_SHARED_LIBRARY_SUFFIX}
 	${libyang_build_location}/src/extensions/metadata${CMAKE_SHARED_LIBRARY_SUFFIX}
 	${libyang_build_location}/src/extensions/nacm${CMAKE_SHARED_LIBRARY_SUFFIX}
 )
 
-install(TARGETS ${CPACK_LIBRARY_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS ydk DESTINATION ${LIB_INSTALL_DIR})
 install(FILES ${libydk_install_headers} DESTINATION ${INCLUDE_INSTALL_DIR})
 install(FILES ${SPDLOG_HEADERS} DESTINATION ${spdlog_include_location})
 install(FILES ${SPDLOG_DETAILS_HEADERS} DESTINATION ${spdlog_details_include_location})
@@ -484,16 +483,6 @@ install(FILES ${SPDLOG_FMT_BUNDLED_HEADERS} DESTINATION ${spdlog_fmt_bundled_inc
 install(FILES ${SPDLOG_SINKS_HEADERS} DESTINATION ${spdlog_sinks_include_location})
 install(FILES ${libyang_extension_lib} DESTINATION ${LIBYANG_EXT_PLUGINS_DIR})
 
-SET( legacy_link   ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libydk.a)
-SET( legacy_target ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${CPACK_LIBRARY_TARGET})
-ADD_CUSTOM_COMMAND( TARGET ${CPACK_LIBRARY_NAME}
-                    COMMAND echo "Creating symbolic link ${legacy_link}"
-                    COMMAND rm -f ${legacy_link}
-                    COMMAND ln -s ${CPACK_LIBRARY_TARGET} ${legacy_link}
-                    DEPENDS install ${CPACK_LIBRARY_NAME}
-                  )
-ADD_CUSTOM_TARGET( install_legacy DEPENDS ${legacy_target} )
-
 # generate doxygen documentation for ydk_core API
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
diff --git a/sdk/cpp/core/docsgen/api/path/sessions/netconf_session.rst b/sdk/cpp/core/docsgen/api/path/sessions/netconf_session.rst
index 5a8c01291..0c0143a7b 100644
--- a/sdk/cpp/core/docsgen/api/path/sessions/netconf_session.rst
+++ b/sdk/cpp/core/docsgen/api/path/sessions/netconf_session.rst
@@ -1,36 +1,10 @@
-..
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 NetconfSession
 ==============
 
 
 .. cpp:class:: ydk::path::NetconfSession : public path::Session
 
-    Implementation of :cpp:class:`Session<Session>` for the `Netconf <https://tools.ietf.org/html/rfc6241>`_ protocol.
+    Implementation of :cpp:class:`Session<Session>` for the `netconf <https://tools.ietf.org/html/rfc6241>`_ protocol.
 
     .. cpp:function:: NetconfSession(\
         const std::string& address, \
@@ -42,15 +16,16 @@ NetconfSession
         bool common_cache = false, \
         int timeout = -1)
 
-        Constructs an instance of the `NetconfSession` to connect to a server which **has** to support model download.
+        Constructs an instance of the ``NetconfSession`` to connect to a server which **has** to support model download
 
-        :param address: IP address of the device supporting a Netconf interface.
-        :param username: Username to log in to the device.
-        :param password: Password to log in to the device.
-        :param port: Device port used to access the Netconf interface. Default value is 830.
+        :param address: IP address of the device supporting a netconf interface
+        :param username: Username to log in to the device
+        :param password: Password to log in to the device
+        :param port: Device port used to access the netconf interface. Default value is 830
+        :param protocol: ``ssh`` or ``tcp``.
         :param on_demand: Enable on demand downloading by default.
         :param common_cache: Use different directories for different connections by default.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: NetconfSession(\
         const path::Repository& repo, \
@@ -62,16 +37,16 @@ NetconfSession
         bool on_demand = true, \
         int timeout = -1)
 
-        Constructs an instance of the `NetconfSession` using the provided :cpp:class:`Repository<Repository>`.
+        Constructs an instance of the ``NetconfSession`` using the provided :cpp:class:`Repository<Repository>`
 
-        :param repo: Reference to an instance of :cpp:class:`Repository<Repository>`.
-        :param address: IP address of the device supporting a Netconf interface.
-        :param username: Username to log in to the device.
-        :param password: Password to log in to the device.
-        :param port: Device port used to access the Netconf interface. Default value is 830.
-        :param protocol: supported string values are "ssh" and "tcp".
+        :param repo: Reference to an instance of :cpp:class:`Repository<Repository>`
+        :param address: IP address of the device supporting a netconf interface
+        :param username: Username to log in to the device
+        :param password: Password to log in to the device
+        :param port: Device port used to access the netconf interface. Default value is 830
+        :param protocol: ``ssh`` or ``tcp``.
         :param on_demand: Enable on demand downloading by default.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: NetconfSession(\
         const std::string& address, \
@@ -83,16 +58,16 @@ NetconfSession
         bool common_cache = false, \
         int timeout = -1)
 
-        Constructs an instance of the `NetconfSession` to connect to a server which **has** to support model download.
+        Constructs an instance of the ``NetconfSession`` to connect to a server which **has** to support model download
 
-        :param address: IP address of the device supporting a Netconf interface.
-        :param username: Username to log in to the device.
+        :param address: IP address of the device supporting a netconf interface
+        :param username: Username to log in to the device
         :param private_key_path: Path to private key file.
         :param public_key_path: Path to public key file.
-        :param port: Device port used to access the Netconf interface. Default value is 830.
+        :param port: Device port used to access the netconf interface. Default value is 830
         :param on_demand: Enable on demand downloading by default.
         :param common_cache: Use different directories for different connections by default.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: NetconfSession(\
         const path::Repository& repo, \
@@ -104,22 +79,22 @@ NetconfSession
         bool on_demand = true, \
         int timeout = -1)
 
-        Constructs an instance of the `NetconfSession` using the provided :cpp:class:`Repository<Repository>`.
+        Constructs an instance of the ``NetconfSession`` using the provided :cpp:class:`Repository<Repository>`
 
-        :param repo: Reference to an instance of :cpp:class:`Repository<Repository>`.
-        :param address: IP address of the device supporting a Netconf interface.
-        :param username: Username to log in to the device.
-        :param private_key_path: Path to private key file.
+        :param repo: Reference to an instance of :cpp:class:`Repository<Repository>`
+        :param address: IP address of the device supporting a netconf interface
+        :param username: Username to log in to the device
+        :param private_key_path: Path to private key file
         :param public_key_path: Path to public key file.
-        :param port: Device port used to access the Netconf interface. Default value is 830.
+        :param port: Device port used to access the netconf interface. Default value is 830
         :param on_demand: Enable on demand downloading by default.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: path::RootSchemaNode& get_root_schema() const
 
-        Returns the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` tree supported by this instance of the `NetconfSession`.
+        Returns the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` tree supported by this instance of the ``NetconfSession``.
 
-        :return: Pointer to the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` or `nullptr` if one could not be created.
+        :return: Pointer to the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` or ``nullptr`` if one could not be created.
 
     .. cpp:function:: std::shared_ptr<path::DataNode> invoke(path::Rpc& rpc) const
 
@@ -128,10 +103,9 @@ NetconfSession
         :param rpc: Reference to the :cpp:class:`Rpc<Rpc>` node.
         :return: Shared pointer to the :cpp:class:`DataNode<DataNode>` representing the output.
 
-    .. cpp:function:: std::shared_ptr<path::DataNode> invoke(path::DataNode& datanode) const
+   .. cpp:function:: std::shared_ptr<path::DataNode> invoke(path::DataNode& datanode) const
 
-        Invokes or executes the given DataNode containing a YANG 1.1 action and returns a :cpp:class:`DataNode<DataNode>` pointer,
-        if the action has an output modeled in YANG.
+        Invokes or executes the given DataNode containing a YANG 1.1 action and returns a :cpp:class:`DataNode<DataNode>` pointer if the action has an output modeled in YANG.
 
         :param datanode: Reference to the :cpp:class:`DataNode<DataNode>` node.
         :return: Pointer to the :cpp:class:`DataNode<DataNode>` representing the output.
@@ -145,6 +119,8 @@ NetconfSession
 
     .. cpp:function:: std::vector<std::string> get_capabilities() const
 
-        Gets string representation of the Netconf server's capabilities.
+        Returns a vector of the client's capabilities
+
+        :return: A vector of ``std::string`` representing the client/server capabilities
 
-        :return: A vector of ``std::string`` representing the Netconf server capabilities.
+    .. cpp:function:: ~NetconfSession()
diff --git a/sdk/cpp/core/docsgen/api/path/sessions/restconf_session.rst b/sdk/cpp/core/docsgen/api/path/sessions/restconf_session.rst
index ddb48a89f..39ca0ee76 100644
--- a/sdk/cpp/core/docsgen/api/path/sessions/restconf_session.rst
+++ b/sdk/cpp/core/docsgen/api/path/sessions/restconf_session.rst
@@ -1,37 +1,12 @@
-..
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 RestconfSession
 ===============
 
+
 .. cpp:class:: ydk::path::RestconfSession : public path::Session
 
-    Implementation of :cpp:class:`Session<Session>` for the `Restconf <https://tools.ietf.org/html/draft-ietf-netconf-restconf-18>`_ protocol.
+    Implementation of :cpp:class:`Session<Session>` for the `restconf <https://tools.ietf.org/html/draft-ietf-netconf-restconf-18>`_ protocol.
 
-    .. cpp:function:: RestconfSession(\
+    .. cpp:function::RestconfSession(\
         path::Repository& repo,\
         const std::string& address,\
         const std::string& username,\
@@ -41,39 +16,39 @@ RestconfSession
         const std::string & config_url_root = "/data",\
         const std::string & state_url_root = "/data")
 
-        Constructs an instance of the `RestconfSession` to connect to a Restconf server.
+        Constructs an instance of the ``RestconfSession`` to connect to a restconf server
 
-        :param repo: Reference to an instance of :cpp:class:`path::Repository<Repository>`.
-        :param address: IP address of the device supporting a Restconf interface.
-        :param username: Username to log in to the device.
-        :param password: Password to log in to the device.
-        :param port: Device port used to access the Restconf interface. Default value is 80
-        :param encoding: Type of encoding to be used for the payload. Default is :cpp:enumerator:`JSON<EncodingFormat::JSON>`.
-        :param config_url_root: To provider backwards compatibility with older drafts of Restconf RFC, this can be "/config" or "/data" (which is the default).
-        :param state_url_root: To provider backwards compatibility with older drafts of Restconf RFC, this can be "/operational" or "/data" (which is the default).
+        :param repo: Reference to an instance of :cpp:class:`path::Repository<Repository>`
+        :param address: IP address of the device supporting a restconf interface
+        :param username: Username to log in to the device
+        :param password: Password to log in to the device
+        :param port: Device port used to access the restconf interface. Default value is 80
+        :param encoding: Type of encoding to be used for the payload. Default is :cpp:enumerator:`JSON<EncodingFormat::JSON>`
+        :param config_url_root: To provider backwards compatibility with older drafts of restconf RFC, this can be "/config" or "/data" (which is the default)
+        :param state_url_root: To provider backwards compatibility with older drafts of restconf RFC, this can be "/operational" or "/data" (which is the default)
 
-    .. cpp:function:: RestconfSession(\
+    .. cpp:function::RestconfSession(\
         std::shared_ptr<RestconfClient> client,\
-        std::shared_ptr<RootSchemaNode> root_schema,\
+        std::shared_ptr<RootSchemaNode> root_schema
         const std::string& edit_method,\
         EncodingFormat encoding = EncodingFormat::JSON,\
         const std::string & config_url_root = "/data",\
         const std::string & state_url_root = "/data")
 
-        Constructs an instance of the `RestconfSession` to connect to a Restconf server.
+        Constructs an instance of the ``RestconfSession`` to connect to a restconf server
 
         :param client: Pointer to a `RestconfClient<ydk::RestconfClient>`.
         :param root_schema: Pointer to a `RootSchemaNode<RootSchemaNode>`.
         :param edit_method: Username to log in to the device.
-        :param encoding: Type of encoding to be used for the payload. Default is :cpp:enumerator:`JSON<EncodingFormat::JSON>`.
-        :param config_url_root: To provider backwards compatibility with older drafts of Restconf RFC, this can be "/config" or "/data" (which is the default).
-        :param state_url_root: To provider backwards compatibility with older drafts of Restconf RFC, this can be "/operational" or "/data" (which is the default).
+        :param encoding: Type of encoding to be used for the payload. Default is :cpp:enumerator:`JSON<EncodingFormat::JSON>`,
+        :param config_url_root: To provider backwards compatibility with older drafts of restconf RFC, this can be "/config" or "/data" (which is the default)
+        :param state_url_root: To provider backwards compatibility with older drafts of restconf RFC, this can be "/operational" or "/data" (which is the default)
 
     .. cpp:function:: path::RootSchemaNode& get_root_schema() const
 
-        Returns the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` tree supported by this instance of the `RestconfSession`.
+        Returns the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` tree supported by this instance of the ``RestconfSession``.
 
-        :return: Reference to the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` or `nullptr` if one could not be created.
+        :return: Reference to the :cpp:class:`RootSchemaNode<path::RootSchemaNode>` or ``nullptr`` if one could not be created.
 
     .. cpp:function:: std::shared_ptr<DataNode> invoke(path::Rpc& rpc) const
 
@@ -82,8 +57,4 @@ RestconfSession
         :param rpc: Reference to the :cpp:class:`Rpc<Rpc>` node.
         :return: Pointer to the :cpp:class:`DataNode<DataNode>` representing the output.
 
-    .. cpp:function:: std::vector<std::string> get_capabilities() const
-
-        Gets string representation of the Restconf server's capabilities.
-
-        :return: A vector of ``std::string`` representing the Restconf server capabilities.
+    .. cpp:function:: ~RestconfSession()
diff --git a/sdk/cpp/core/docsgen/api/path/sessions/session.rst b/sdk/cpp/core/docsgen/api/path/sessions/session.rst
index e9fc22ff3..5b640d5e7 100644
--- a/sdk/cpp/core/docsgen/api/path/sessions/session.rst
+++ b/sdk/cpp/core/docsgen/api/path/sessions/session.rst
@@ -1,41 +1,16 @@
-..
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 Session
 =======
 
+
 .. cpp:class:: ydk::path::Session
 
-    Abstract base class to model sessions.
+    Abstract session base class.
 
     .. cpp:function:: virtual RootSchemaNode& get_root_schema() const
 
-        Returns the :cpp:class:`RootSchemaNode<RootSchemaNode>` tree supported by this instance of the `Session`.
+        Returns the :cpp:class:`RootSchemaNode<RootSchemaNode>` tree supported by this instance of the ``Session``.
 
-        :return: Reference to the :cpp:class:`RootSchemaNode<RootSchemaNode>` or `nullptr` if one could not be created.
+        :return: Reference to the :cpp:class:`RootSchemaNode<RootSchemaNode>` or ``nullptr`` if one could not be created.
 
     .. cpp:function:: virtual std::shared_ptr<path::DataNode> invoke(path::Rpc& rpc) const
 
@@ -44,8 +19,4 @@ Session
         :param rpc: Reference to the :cpp:class:`Rpc<Rpc>` node.
         :return: Pointer to the :cpp:class:`DataNode<DataNode>` representing the output.
 
-    .. cpp:function:: virtual std::vector<std::string> get_capabilities() const
-
-        Gets string representation of server's capabilities.
-
-        :return: A vector of ``std::string`` representing the server capabilities.
+    .. cpp:function:: virtual ~Session()
diff --git a/sdk/cpp/core/docsgen/api/ydk/providers/netconf_provider.rst b/sdk/cpp/core/docsgen/api/ydk/providers/netconf_provider.rst
index b93296aab..edc182c4e 100644
--- a/sdk/cpp/core/docsgen/api/ydk/providers/netconf_provider.rst
+++ b/sdk/cpp/core/docsgen/api/ydk/providers/netconf_provider.rst
@@ -25,7 +25,7 @@ NetconfServiceProvider
         :param protocol: ``ssh`` or ``tcp``.
         :param on_demand: On demand downloading by default.
         :param common_cache: Use common caching directory if enabled.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: NetconfServiceProvider(\
         const path::Repository& repo, \
@@ -65,7 +65,7 @@ NetconfServiceProvider
         :param public_key_path: Either relative or absolute path to public key file.
         :param port: Device port used to access the netconf interface. Default value is 830.
         :param on_demand: On demand downloading by default.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: NetconfServiceProvider(\
         std::string address, \
@@ -86,7 +86,7 @@ NetconfServiceProvider
         :param port: Device port used to access the netconf interface. Default value is 830
         :param on_demand: On demand downloading by default.
         :param common_cache: Use common caching directory if enabled.
-        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking
 
     .. cpp:function:: EncodingFormat get_encoding() const
 
diff --git a/sdk/cpp/core/docsgen/api/ydk/services/netconf_service.rst b/sdk/cpp/core/docsgen/api/ydk/services/netconf_service.rst
index 086df2b6b..7ed074e30 100644
--- a/sdk/cpp/core/docsgen/api/ydk/services/netconf_service.rst
+++ b/sdk/cpp/core/docsgen/api/ydk/services/netconf_service.rst
@@ -73,7 +73,7 @@ Netconf Service
 
         :param provider: An instance of :cpp:class:`NetconfServiceProvider<NetconfServiceProvider>`.
         :param confirmed: An optional argument.
-        :param confirm_timeout: The timeout in microseconds, -1 for infinite timeout, 0 for non-blocking.
+        :param confirm_timeout: An optional argument.
         :param persist: An optional argument.
         :param persist_id: An optional argument.
         :return: **true**, if the operation succeeds, **false** - otherwise.
diff --git a/sdk/cpp/core/docsgen/api/ydk/types.rst b/sdk/cpp/core/docsgen/api/ydk/types.rst
index 74134f485..32a85b682 100644
--- a/sdk/cpp/core/docsgen/api/ydk/types.rst
+++ b/sdk/cpp/core/docsgen/api/ydk/types.rst
@@ -151,7 +151,7 @@ YANG leaf, leaf-list, and list
 
     .. cpp:function:: std::vector<YLeaf> getYLeafs() const
 
-        Access function to get all elements in the YLeafList.
+        Access function to get all elements in the YLeafList
 
 .. cpp:class:: ydk::YList
 
@@ -163,13 +163,6 @@ YANG leaf, leaf-list, and list
 
         :param key_names: list of strings, which represent names of keys for the list entities, including empty list.
         
-    .. cpp:function:: bool has_key(const std::string& key) const
-
-       Checks if list element with given key is present in the `YList`.
-
-        :param key: ``strings``, which represent list entity key(s).
-        :return: ``true``, if element with matching key is in the list, ``false`` - otherwise.
-
     .. cpp:function:: std::shared_ptr<Entity> operator [] (const std::string& key) const
 
         Gets `YList` entity, which has matching `key` value.
diff --git a/sdk/cpp/core/docsgen/getting_started.rst b/sdk/cpp/core/docsgen/getting_started.rst
index a23f16e2b..b178acada 100644
--- a/sdk/cpp/core/docsgen/getting_started.rst
+++ b/sdk/cpp/core/docsgen/getting_started.rst
@@ -32,202 +32,222 @@ Getting Started
 Overview
 ========
 
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API
-and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers,
-plus one or more module bundles that are based on YANG models.
+The YANG Development Kit (YDK) is a Software Development Kit that provides API's that are modeled in YANG. The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles that are based on YANG models.
 
-Backward Compatibility
-======================
+How to Install
+==============
 
-The Python YDK-0.8.6 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
-However the YDK-0.8.6 generates slightly different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling YList objects.
+You can install YDK-Cpp on Linux or MacOS.  It is currently not supported on Windows.
 
-Docker
-======
+System Requirements
+-------------------
 
-A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-gen installed.
-This be used to run ydk-gen without installing anything natively on your platform.
+Linux
+~~~~~
 
-To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command.
-See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
+**Ubuntu (Debian-based)**
 
-  docker run -it ydksolutions/ydk-gen:0.8.6.4
+The following packages must be present in your system before installing YDK-Cpp:
 
+.. code-block:: sh
 
-System Requirements
-===================
+   # Linux dependencies
+   sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev libtool-bin cmake
+   sudo apt-get install python3-dev
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
+   # gcc-5 and g++5 for modern c++
+   sudo apt-get install gcc-5 g++-5 -y > /dev/null
+   sudo ln -f -s /usr/bin/g++-5 /usr/bin/g++
+   sudo ln -f -s /usr/bin/gcc-5 /usr/bin/gcc
 
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x
- - MacOS up to 11.6.2 (Big Sur)
+**CentOS-7 (Fedora-based)**
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check `this <https://www.windowscentral.com/install-windows-subsystem-linux-windows-10>`_ for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+The following packages must be present in your system before installing YDK-Cpp:
 
-On supported platforms the YDK can be installed using `Installation Script`_.
-On other platforms the YDK should be installed manually `Building from source`_.
-For both the methods the user must install `git` package prior to the installation procedure.
+.. code-block:: sh
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+   # Linux dependencies
+   sudo yum install epel-release
+   sudo yum install libxml2-devel libxslt-devel libssh-devel libtool pcre-devel cmake3 wget
+   sudo yum install gcc-g++ python36-devel
 
-**NOTE.** Due to GitHub issue `#1050 <https://github.com/CiscoDevNet/ydk-gen/issues/1050>`_ YDK is not supported with Python 3.9.x.
+If installed gcc compiler version is lowers than 4.8.1, upgrade the compiler to gcc-5
 
-.. _howto-install:
+.. code-block:: sh
+
+   # gcc-5 and g++5 for modern c++
+   sudo yum install centos-release-scl -y > /dev/null
+   sudo yum install devtoolset-4-gcc* -y > /dev/null
+   sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/cc
+   sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/c++
+   sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
+   sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
 
-Core Installation
-=================
+MacOS
+~~~~~
 
-Installation Script
+It is recommended to install `homebrew <http://brew.sh>`_ and Xcode command line tools on your system before installing YDK-Cpp:
+
+.. code-block:: sh
+
+   /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+   brew install curl libssh pcre xml2 cmake
+   xcode-select --install
+
+Libssh Installation
 -------------------
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
+The libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. If after installation of libssh package the `libssh_threads.a` is missing, please downgrade the installation to libssh-0.7.6,
+or upgrade to libssh-0.8.1 or higher.
+
+gNMI Requirements
+-----------------
+
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-If user has different location, the PYTHON_VENV environment variable should be set to that location.
+Install Protobuf and Protoc
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Here is simple example of core YDK installation for C++ programming language and Python virtual environment:
+.. code-block:: sh
+
+   wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+   unzip protobuf-cpp-3.5.0.zip
+   cd protobuf-3.5.0
+   ./configure
+   make
+   sudo make install
+   sudo ldconfig
+   cd -
+
+**Install gRPC**
 
 .. code-block:: sh
 
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-    export YDKGEN_HOME=`pwd`  # optional
-    export PYTHON_VENV=$HOME/ydk_vne  # optional
-    ./install_ydk.sh --core --cpp --venv
-
-
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this::
-
-    ./install_ydk.sh --help
-    usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-    Options and arguments:
-      --cpp                 install YDK for C++ programming language;
-                            requires sudo access for dependencies and libraries installation
-      --go                  install YDK for Go programming language
-      --py|--python         install YDK for Python programming language
-      --all                 install YDK for all available programming languages;
-                            requires sudo access for dependencies and libraries installation
-      -v|--venv             create python virtual environment
-      -c|--core             install YDK core package
-      -s|--service gnmi     install gNMI service package
-      -n|--no-deps          skip installation of dependencies;
-                            applicable only with --cpp and --all options
-      -h|--help             print this help message and exit
-
-    Environment variables:
-    YDKGEN_HOME         specifies location of ydk-gen git repository;
-                        if not set, $HOME/ydk-gen is assumed
-    PYTHON_VENV         specifies location of python virtual environment;
-                        if not set, $HOME/venv is assumed
-    GOROOT              specifies installation directory of go software;
-                        if not set, /usr/local/go is assumed
-    GOPATH              specifies location of go source directory;
-                        if not set, $HOME/go is assumed
-    C_INCLUDE_PATH      location of C include files;
-                        if not set, /usr/local/include is assumed
-    CPLUS_INCLUDE_PATH  location of C++ include files;
-                        if not set, /usr/local/include is assumed
-    CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                        if not set, default system library location is assumed
-
-
-If user environment is different from the default one (different Python installation or different
-location of libraries), then building from source method should be used.
-
-Building from source
---------------------
-
-Environment variables
-~~~~~~~~~~~~~~~~~~~~~
-
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the header location must be specified explicitly (in below commands the default location is shown)::
-
-  export C_INCLUDE_PATH=/usr/local/include
-  export CPLUS_INCLUDE_PATH=/usr/local/include
-
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
-
-Installing third party dependencies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script.
-
-    # Clone ydk-gen from GitHub
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-
-    # Define optional environment variables and install dependencies
-    export YDKGEN_HOME=`pwd`
-    export PYTHON_VENV=$HOME/ydk_venv
-    ./install_ydk.sh --venv
-
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
-
-Installing core components
+   git clone -b v1.9.1 https://github.com/grpc/grpc
+   cd grpc
+   git submodule update --init
+   make
+   sudo make install
+   sudo ldconfig
+   cd -
+
+Quick YDK Installation
+----------------------
+
+Install prebuilt libraries
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Please follow this procedure to install YDK core components for C++ apps development::
+**Ubuntu**
 
-    # If created, activate Python virtual environment
-    source $PYTHON_VENV/bin/activate
+Download and install YDK core library - `libydk`. You can install the library using prebuilt debian packages for Xenial and Bionic LTS distributions.
+For other Ubuntu distributions it is recommended to build core library from source.
+The prebuilt libraries compiled with specific C/C++ compilers versions, which corresponds to default one for the Linux disribution.
+If your compiler is different from specified one, it is recommended to build the packages from source.
 
-    # Generate and install YDK core library
-    python3 generate.py -is --core --cpp
+For Xenial (Ubuntu 16.04.4, gcc-5.5.0):
 
-Adding gNMI Service
--------------------
+.. code-block:: sh
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package.
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+   sudo gdebi libydk-0.8.5-1.amd64.deb
 
-gNMI Service installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
+For Bionic (Ubuntu 18.04.1, gcc-7.4.0):
 
-Here is simple example, how gNMI service package with Python virtual environment could be added::
+.. code-block:: sh
 
-    cd ydk-gen
-    ./install_ydk.sh --cpp --service gnmi --venv
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+   sudo gdebi libydk-0.8.5-1.amd64.deb
 
+**CentOS**
 
-gNMI runtime environment
-~~~~~~~~~~~~~~~~~~~~~~~~
+The prebuilt package compiled with default version - gcc-4.8.5.
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
-As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+.. code-block:: sh
+
+   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+**MacOS**
 
+The prebuilt packages compiled with C++ compiler Clang-8.0.0, which is default version for MacOS 10.12.
+
+.. code-block:: sh
+
+   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5-beta/libydk-0.8.5-Darwin.pkg
+   sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+
+gNMI Service Installation
+-------------------------
+
+Installing YDK gNMI library
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Ubuntu**
+
+For Xenial (Ubuntu 16.04.4):
+
+.. code-block:: sh
+
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+   sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+
+For Bionic (Ubuntu 18.04.1):
+
+.. code-block:: sh
+
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+   sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+
+**CentOS**
+
+The prebuilt package compiled with default version - gcc-4.8.5.
+
+.. code-block:: sh
+
+   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
+
+**MacOS**
+
+The prebuilt packages compiled with C++ compiler Clang-8.0.0.
+
+.. code-block:: sh
+
+   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+   sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
+
+Set runtime environment
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The YDK based application runtime environment must include setting of **LD_LIBRARY_PATH** variable:
+
+.. code-block:: sh
+
+   PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
+
+Installing from source
+----------------------
+
+In order to build YDK components from source, download or clone source files from `YDK-Cpp repository <https://github.com/CiscoDevNet/ydk-cpp>`_
+
+Installing YDK core library
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+YDK uses ``cmake`` as the build system of choice. To install the ``core`` package, execute:
+
+.. code-block:: sh
+
+  $ cd ydk-cpp/core/ydk
+  ydk$ mkdir build && cd build
+  build$ cmake .. && make
+  build$ sudo make install
 
 Installing model bundles
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once you have installed the `core` package, you can install one or more model bundles.
-Note that some bundles have dependencies on other bundles.
-Those dependencies are captured in the bundle packages used for quick installation.
+Once you have installed the ``core`` package, you can install one or more model bundles.  Note that some bundles have dependencies on other bundles.  Those dependencies are captured in the bundle packages used for quick installation.
 
-To install the `ietf` bundle, execute:
+To install the ``ietf`` bundle, execute:
 
 .. code-block:: sh
 
@@ -236,7 +256,7 @@ To install the `ietf` bundle, execute:
   build$ cmake .. && make
   build$ sudo make install
 
-To install the `openconfig` bundle, execute:
+To install the ``openconfig`` bundle, execute:
 
 .. code-block:: sh
 
@@ -245,7 +265,7 @@ To install the `openconfig` bundle, execute:
   build$ cmake .. && make
   build$ sudo make install
 
-To install the `cisco-ios-xr` bundle, execute:
+To install the ``cisco-ios-xr`` bundle, execute:
 
 .. code-block:: sh
 
@@ -255,7 +275,7 @@ To install the `cisco-ios-xr` bundle, execute:
   build$ sudo make install
 
 Installing YDK gNMI library
----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Optionally the YDK gNMI Service library can be installed. Prior to this installation the YDK core library must be installed (see above).
 
@@ -271,9 +291,7 @@ Optionally the YDK gNMI Service library can be installed. Prior to this installa
 Samples
 =======
 
-To get started using the YDK API, there are sample apps available in the
-`YDK-Cpp samples repository <https://github.com/CiscoDevNet/ydk-cpp/tree/master/core/ydk/samples>`_.
-For example, to run the `bgp_create.cpp` sample execute:
+To get started using the YDK API, there are sample apps available in the `YDK-Cpp samples repository <https://github.com/CiscoDevNet/ydk-cpp/tree/master/core/ydk/samples>`_. For example, to run the ``bgp_create.cpp`` sample execute:
 
 .. code-block:: sh
 
@@ -286,10 +304,3 @@ Documentation and Support
 =========================
 - Numerous additional samples can be found in the `YDK-Cpp samples repository <https://github.com/CiscoDevNet/ydk-cpp/tree/master/core/ydk/samples>`_
 - Join the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ to connect with other users and with the makers of YDK
-
-Release Notes
-=============
-
-The current YDK release version is 0.8.6.4.
-
-YDK is licensed under the Apache 2.0 License.
diff --git a/sdk/cpp/core/docsgen/guides/restconf_https.rst b/sdk/cpp/core/docsgen/guides/restconf_https.rst
index 2ab427cb2..ec4d0543d 100644
--- a/sdk/cpp/core/docsgen/guides/restconf_https.rst
+++ b/sdk/cpp/core/docsgen/guides/restconf_https.rst
@@ -54,7 +54,7 @@ The installation procedure on CentOS-7:
     sudo cp ~/myrestconf.crt /etc/pki/ca-trust/source/anchors/
     sudo update-ca-trust
 
-Getting MacOS to trust self-signed SSL Certificates:
+Getting Mac-OSX to trust self-signed SSL Certificates:
 
  1. Locate your CA certificate file.
  2. Open up Keychain Access.
diff --git a/sdk/cpp/core/samples/CMakeLists.txt b/sdk/cpp/core/samples/CMakeLists.txt
index 18f54a991..9d1a6cc26 100644
--- a/sdk/cpp/core/samples/CMakeLists.txt
+++ b/sdk/cpp/core/samples/CMakeLists.txt
@@ -9,6 +9,6 @@ foreach(sample IN LISTS samples)
     add_executable(${sample} ${sample}.cpp)
     set_property(TARGET ${sample} PROPERTY CXX_STANDARD 11)
     set_property(TARGET ${sample} PROPERTY CXX_STANDARD_REQUIRED ON)
-    target_link_libraries(${sample} ${CPACK_LIBRARY_NAME})
+    target_link_libraries(${sample} ydk)
 
 endforeach(sample)
diff --git a/sdk/cpp/core/src/catch.hpp b/sdk/cpp/core/src/catch.hpp
index 32b0f94e2..6a0a58edc 100644
--- a/sdk/cpp/core/src/catch.hpp
+++ b/sdk/cpp/core/src/catch.hpp
@@ -6229,11 +6229,6 @@ namespace Catch {
 
 #include <signal.h>
 
-#ifndef SIGSTKSZ
-  // Patch for Linux distributions that do not define stack size environment variable
-  #define SIGSTKSZ 131072
-#endif
-
 namespace Catch {
 
     struct SignalDefs {
diff --git a/sdk/cpp/core/src/codec_provider.cpp b/sdk/cpp/core/src/codec_provider.cpp
index a50f1be10..97b014d05 100644
--- a/sdk/cpp/core/src/codec_provider.cpp
+++ b/sdk/cpp/core/src/codec_provider.cpp
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -99,16 +99,6 @@ path::RootSchemaNode& CodecServiceProvider::get_root_schema_for_bundle(const std
     return *(val);
 }
 
-bool CodecServiceProvider::has_root_schema_for_bundle(const std::string & bundle_name)
-{
-    if (user_provided_repo ||
-        m_root_schema_table.find(bundle_name) != m_root_schema_table.end())
-    {
-        return true;
-    }
-    return false;
-}
-
 void CodecServiceProvider::initialize_root_schema(const std::string & bundle_name, path::Repository & repo)
 {
     YLOG_DEBUG("Initializing root schema for {}", bundle_name);
diff --git a/sdk/cpp/core/src/codec_provider.hpp b/sdk/cpp/core/src/codec_provider.hpp
index 05616b7cc..03568761f 100644
--- a/sdk/cpp/core/src/codec_provider.hpp
+++ b/sdk/cpp/core/src/codec_provider.hpp
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -42,17 +42,16 @@ class CodecServiceProvider
 
     void initialize(const std::string & bundle_name, const std::string & models_path, augment_capabilities_function get_caps_func);
     path::RootSchemaNode& get_root_schema_for_bundle(const std::string & bundle_name);
-    bool has_root_schema_for_bundle(const std::string & bundle_name);
 
   private:
     void initialize_root_schema(const std::string & bundle_name, path::Repository & repo);
 
   public:
     EncodingFormat m_encoding;
-    bool user_provided_repo;
 
   private:
     std::map<std::string, std::shared_ptr<path::RootSchemaNode>> m_root_schema_table;
+    bool user_provided_repo;
     bool capabilities_augmented;
     path::Repository m_repo;
 };
diff --git a/sdk/cpp/core/src/codec_service.cpp b/sdk/cpp/core/src/codec_service.cpp
index 9ea180030..df9c7d27d 100644
--- a/sdk/cpp/core/src/codec_service.cpp
+++ b/sdk/cpp/core/src/codec_service.cpp
@@ -1,24 +1,25 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 
@@ -29,7 +30,6 @@
 #include "types.hpp"
 #include "logger.hpp"
 #include "xml_subtree_codec.hpp"
-#include "json_subtree_codec.hpp"
 
 namespace ydk
 {
@@ -54,18 +54,15 @@ std::string
 CodecService::encode(CodecServiceProvider & provider, Entity & entity, bool pretty, bool subtree)
 {
     path::RootSchemaNode& root_schema = get_root_schema(provider, entity);
-    if(subtree || !entity.is_top_level_class)
+    if(subtree)
     {
-        if (provider.m_encoding == EncodingFormat::XML)
-        {
-            XmlSubtreeCodec codec{};
-            return codec.encode(entity, root_schema);
-        }
-        else
+        if(provider.m_encoding != EncodingFormat::XML)
         {
-            JsonSubtreeCodec codec{};
-            return codec.encode(entity, root_schema, pretty);
+            YLOG_ERROR("Subtree option can only be used with XML encoding");
+            throw(YServiceProviderError("Subtree option can only be used with XML encoding"));
         }
+        XmlSubtreeCodec codec{};
+        return codec.encode(entity, root_schema);
     }
 
     path::DataNode& datanode = get_data_node_from_entity(entity, root_schema);
@@ -95,16 +92,13 @@ CodecService::decode(CodecServiceProvider & provider, const std::string & payloa
 {
     if(subtree)
     {
-        if (provider.m_encoding == EncodingFormat::XML)
+        if(provider.m_encoding != EncodingFormat::XML)
         {
-            XmlSubtreeCodec codec{};
-            return codec.decode(payload, entity);
-        }
-        else
-        {
-            JsonSubtreeCodec codec{};
-            return codec.decode(payload, entity);
+            YLOG_ERROR("Subtree option can only be used with XML encoding");
+            throw(YServiceProviderError("Subtree option can only be used with XML encoding"));
         }
+        XmlSubtreeCodec codec{};
+        return codec.decode(payload, entity);
     }
 
     path::RootSchemaNode& root_schema = get_root_schema(provider, *entity);
@@ -170,17 +164,6 @@ static std::string get_bundle_name(Entity & entity)
 static path::RootSchemaNode & get_root_schema(CodecServiceProvider & provider, Entity & entity)
 {
     auto const & bundle_name = get_bundle_name(entity);
-    if (bundle_name.empty() && !provider.user_provided_repo)
-    {
-        YLOG_ERROR("Failed to get bundle name from entity '{}'", entity.yang_name);
-        throw(YServiceProviderError("Failed to get bundle name from entity"));
-    }
-
-    if (provider.has_root_schema_for_bundle(bundle_name))
-    {
-        return provider.get_root_schema_for_bundle(bundle_name);
-    }
-
     provider.initialize(bundle_name, get_bundle_yang_models_location(entity), get_augment_capabilities_function(entity));
 
     path::RootSchemaNode& root_schema = provider.get_root_schema_for_bundle(bundle_name);
diff --git a/sdk/cpp/core/src/entity_data_node_walker.cpp b/sdk/cpp/core/src/entity_data_node_walker.cpp
index 85a89d14f..b3e87c919 100644
--- a/sdk/cpp/core/src/entity_data_node_walker.cpp
+++ b/sdk/cpp/core/src/entity_data_node_walker.cpp
@@ -1,5 +1,9 @@
+//
+// @file types.hpp
+// @brief Header for ydk entity
+//
 // YANG Development Kit
-// Copyright 2016-2022 Cisco Systems. All rights reserved
+// Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
@@ -18,11 +22,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
+//
 //////////////////////////////////////////////////////////////////
 
 #include <assert.h>
@@ -41,6 +41,8 @@ using namespace std;
 namespace ydk
 {
 static void populate_data_node(Entity & entity, path::DataNode & data_node);
+static void walk_children(Entity & entity, path::DataNode & data_node);
+static void populate_name_values(path::DataNode & parent_data_node, EntityPath & path);
 static bool data_node_is_leaf(path::DataNode & data_node);
 static bool data_node_is_list(path::DataNode & data_node);
 static string get_segment_path(const string & path);
@@ -67,12 +69,12 @@ path::DataNode& get_data_node_from_entity(Entity & entity, path::RootSchemaNode
     return root_data_node;
 }
 
-void walk_children(Entity & entity, path::DataNode & data_node)
+static void walk_children(Entity & entity, path::DataNode & data_node)
 {
     map<string, shared_ptr<Entity>> children = entity.get_children();
     vector<string> order = entity.get_order_of_children();
-    YLOG_DEBUG("Children count for path: '{}': {}", get_entity_path(entity, entity.parent).path, children.size());
-    YLOG_DEBUG("Children order count: {}", order.size());
+    YLOG_DEBUG("Children count for: {} : {}",get_entity_path(entity, entity.parent).path, children.size());
+    YLOG_DEBUG("Children order count : {}",order.size());
     if(order.size()>0)
     {
         for(auto child_seg : order)
@@ -124,7 +126,7 @@ static void populate_data_node(Entity & entity, path::DataNode & parent_data_nod
     walk_children(entity, *data_node);
 }
 
-void populate_name_values(path::DataNode & data_node, EntityPath & path)
+static void populate_name_values(path::DataNode & data_node, EntityPath & path)
 {
     YLOG_DEBUG("Leaf count: {}", path.value_paths.size());
     for(const pair<string, LeafData> & name_value : path.value_paths)
@@ -266,9 +268,8 @@ void get_entity_from_data_node(path::DataNode * node, shared_ptr<Entity> entity)
 
 static bool data_node_is_leaf(path::DataNode & data_node)
 {
-    auto keyword = data_node.get_schema_node().get_statement().keyword;
-	return (keyword == "leaf" || keyword == "leaf-list"
-            || keyword == "anyxml" || keyword == "anydata");
+    return (data_node.get_schema_node().get_statement().keyword == "leaf"
+            || data_node.get_schema_node().get_statement().keyword == "leaf-list");
 }
 
 static bool data_node_is_list(path::DataNode & data_node)
diff --git a/sdk/cpp/core/src/entity_data_node_walker.hpp b/sdk/cpp/core/src/entity_data_node_walker.hpp
index 74a27e29d..68881d62c 100644
--- a/sdk/cpp/core/src/entity_data_node_walker.hpp
+++ b/sdk/cpp/core/src/entity_data_node_walker.hpp
@@ -1,9 +1,9 @@
 //
-// @file entity_data_node_walker.hpp
-// @brief Header for YDK entity
+// @file entity.hpp
+// @brief Header for ydk entity
 //
 // YANG Development Kit
-// Copyright 2016-2022 Cisco Systems. All rights reserved
+// Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+//
 //////////////////////////////////////////////////////////////////
 
 #ifndef _WALKER_HPP_
@@ -41,8 +42,5 @@ path::DataNode& get_data_node_from_entity(Entity & entity, path::RootSchemaNode
 void get_entity_from_data_node(path::DataNode * node, std::shared_ptr<Entity> entity);
 
 YFilter get_data_node_yfilter(path::DataNode * node);
-
-void populate_name_values(path::DataNode & data_node, EntityPath & path);
-void walk_children(Entity & entity, path::DataNode & data_node);
 }
 #endif /* _WALKER_HPP_ */
diff --git a/sdk/cpp/core/src/executor_service.cpp b/sdk/cpp/core/src/executor_service.cpp
index fc1495221..6fc49bb3d 100644
--- a/sdk/cpp/core/src/executor_service.cpp
+++ b/sdk/cpp/core/src/executor_service.cpp
@@ -1,4 +1,4 @@
-// YANG Development Kit
+/// YANG Development Kit
 // Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
@@ -18,11 +18,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
+//
 //////////////////////////////////////////////////////////////////
 
 #include "entity_data_node_walker.hpp"
@@ -35,20 +31,23 @@
 
 using namespace std;
 
-namespace ydk {
+namespace ydk{
+
+static void walk_children(std::shared_ptr<Entity> entity, path::DataNode & rpc_input, std::string path);
+static void create_from_entity_path(std::shared_ptr<Entity> entity, path::DataNode & rpc_input, const std::string & path);
+static void create_from_children(std::map<string, std::shared_ptr<Entity>> & children, path::DataNode & rpc_input);
 
 ExecutorService::ExecutorService()
 {
 }
 
+
 ExecutorService::~ExecutorService()
 {
 }
 
-shared_ptr<Entity> ExecutorService::execute_rpc(
-    ServiceProvider& provider,
-    Entity & rpc_entity,
-    shared_ptr<Entity> top_entity)
+shared_ptr<Entity> ExecutorService::execute_rpc(ServiceProvider& provider,
+    Entity & rpc_entity, std::shared_ptr<Entity> top_entity)
 {
     // Get the operation - RPC Name
     auto const & operation = rpc_entity.get_segment_path();
@@ -60,19 +59,15 @@ shared_ptr<Entity> ExecutorService::execute_rpc(
 
     // Handle input
     auto input = rpc_entity.get_child_by_name("input", "");
-    if (input)
-    {
-        EntityPath input_path = get_entity_path(*input, input->parent);
-        populate_name_values(rpc_input, input_path);
-        walk_children(*input, rpc_input);
-    }
+    if(input != nullptr && (input->has_operation() || input->has_data() || input->is_presence_container))
+        walk_children(input, rpc_input, "");
 
     // Execute
     auto result_datanode = (*rpc)(provider.get_session());
 
     // Handle output
     auto output = rpc_entity.get_child_by_name("output", "");
-    if (output != nullptr && result_datanode != nullptr && top_entity != nullptr)
+    if (output != nullptr && result_datanode != nullptr)
     {
         auto filter = result_datanode->get_children()[0].get();
 
@@ -83,4 +78,64 @@ shared_ptr<Entity> ExecutorService::execute_rpc(
         return nullptr;
 }
 
+static void walk_children(std::shared_ptr<Entity> entity, path::DataNode & rpc_input, std::string path)
+{
+    if (entity != nullptr)
+    {
+        std::map<string, std::shared_ptr<Entity>> children = entity->get_children();
+        auto entity_path = get_entity_path(*entity, entity->parent);
+        YLOG_DEBUG("Children count for: {} : {}", entity_path.path, children.size());
+
+        if (path != "")
+            path = path + '/';
+
+        if (entity_path.path != "input")
+            path = path + entity_path.path;
+
+        YLOG_DEBUG("Path: {}", path);
+
+        for( auto const & child : children )
+        {
+            if(child.second->has_operation() || child.second->has_data() || child.second->is_presence_container)
+                walk_children(child.second, rpc_input, path);
+        }
+
+        // if there are leafs, create from entity path
+        if (entity_path.value_paths.size() != 0)
+            create_from_entity_path(entity, rpc_input, path);
+
+        create_from_children(children, rpc_input);
+    }
+}
+
+static void create_from_entity_path(std::shared_ptr<Entity> entity, path::DataNode & rpc_input, const std::string & path)
+{
+    auto entity_path = get_entity_path(*entity, entity->parent);
+
+    for (std::pair<std::string, LeafData> child : entity_path.value_paths)
+    {
+        YLOG_DEBUG("Creating leaf '{}' in {}", child.first, entity_path.path);
+
+        std::string temp_path = "";
+        if (path != "")
+            temp_path = path + '/';
+        temp_path = temp_path + child.first;
+        rpc_input.create_datanode(temp_path, child.second.value);
+    }
+}
+
+static void create_from_children(std::map<string, std::shared_ptr<Entity>> & children, path::DataNode & rpc_input)
+{
+    for( auto const & child : children )
+    {
+        if(child.second->has_operation() || child.second->has_data() || child.second->is_presence_container)
+        {
+            YLOG_DEBUG("Creating child '{}': {}",child.first,
+                get_entity_path(*(child.second), child.second->parent).path);
+
+            rpc_input.create_datanode(child.first);
+        }
+    }
+}
+
 }
diff --git a/sdk/cpp/core/src/json_subtree_codec.cpp b/sdk/cpp/core/src/json_subtree_codec.cpp
index bb32cbeac..2ca5e07be 100644
--- a/sdk/cpp/core/src/json_subtree_codec.cpp
+++ b/sdk/cpp/core/src/json_subtree_codec.cpp
@@ -369,9 +369,6 @@ static void check_and_set_node(Entity & entity, Entity * parent, const string &
             child->parent = parent;
         }
         decode_json(node_jvalue, *child, &entity);
-        if (child->ylist && child->ylist->ylist_key_names.size() > 0) {
-            child->ylist->review(child);
-        }
     }
     else {
         check_and_set_leaf(entity, parent, node_name, node_jvalue);
diff --git a/sdk/cpp/core/src/netconf_session.cpp b/sdk/cpp/core/src/netconf_session.cpp
index b2afb20f2..e081cf72a 100644
--- a/sdk/cpp/core/src/netconf_session.cpp
+++ b/sdk/cpp/core/src/netconf_session.cpp
@@ -1,6 +1,7 @@
-// YANG Development Kit
+/// YANG Development Kit
 // Copyright 2016 Cisco Systems. All rights reserved
-// -------------------------------------------------------------
+//
+////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -17,15 +18,10 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
-// -------------------------------------------------------------
+//
+//////////////////////////////////////////////////////////////////
 
 #include <libyang/libyang.h>
-#include <stdexcept>
 
 #include "common_utilities.hpp"
 #include "entity_data_node_walker.hpp"
@@ -121,7 +117,7 @@ NetconfSession::NetconfSession(const string& address,
     YLOG_INFO("Connected to {} on port {} using {} with timeout of {}", address, port, protocol, timeout);
 }
 
-// todo: decide whether or not to add TWO more signatures for
+// todo: decide whether or not to add TWO more signatures for 
 //       constructor to match above or just ONE more signature (go style)
 
 NetconfSession::NetconfSession(path::Repository& repo,
@@ -227,21 +223,7 @@ void NetconfSession::initialize_repo(path::Repository & repo, bool on_demand)
     auto lookup_table = capabilities_parser.get_lookup_table(server_capabilities);
 
     if (on_demand)
-    {
-        // Load ietf-netconf module features from server capabilities
-    	auto empty_caps_copy = capabilities_parser.parse(empty_caps);
-        for (auto cap : empty_caps_copy)
-        {
-            try {
-                auto server_cap = lookup_table.at(cap.module);
-                yang_caps.push_back(server_cap);
-                continue;
-            }
-            catch (const std::exception& e) {
-            	yang_caps.push_back(cap);
-            }
-        }
-    }
+        yang_caps = capabilities_parser.parse(empty_caps);
     else
         yang_caps = all_caps;
 
@@ -627,9 +609,9 @@ std::string get_netconf_output(const string & reply)
         return {};
     }
 
-    string rpc_output = extract_rpc_data(reply, "<data", "</data>");
+    string rpc_output = extract_rpc_data(reply, "<data>", "</data>");
     if (rpc_output.length() == reply.length()) {
-        rpc_output = extract_rpc_data(reply, "<nc:data", "</nc:data>");
+        rpc_output = extract_rpc_data(reply, "<nc:data>", "</nc:data>");
     }
 
     if (rpc_output.length() == reply.length())
@@ -678,7 +660,7 @@ extract_rpc_output(const string & reply)
 	string rpc_output = extract_rpc_data(reply, "<rpc-reply ", "</rpc-reply>");
     if (rpc_output.length() == reply.length()) {
         // Try with Netconf namespace prefix
-        rpc_output = extract_rpc_data(reply, "<nc:rpc-reply ", "</nc:rpc-reply>");
+    	rpc_output = extract_rpc_data(reply, "<nc:rpc-reply ", "</nc:rpc-reply>");
     }
 
     string reply_data = rpc_output;
@@ -723,9 +705,9 @@ handle_action_output(const string & reply, path::RootSchemaNode & root_schema, c
         return nullptr;
     }
 
-    string data = extract_rpc_data(reply, "<data", "</data>");
+    string data = extract_rpc_data(reply, "<data>", "</data>");
     if (data.length() == reply.length()) {
-        data = extract_rpc_data(reply, "<nc:data", "</nc:data>");
+        data = extract_rpc_data(reply, "<nc:data>", "</nc:data>");
         if (data.length() == reply.length()) {
             YLOG_INFO( "Could not locate start and/or end 'data' tag in the RPC reply");
             return nullptr;
@@ -771,7 +753,7 @@ static path::SchemaNode* get_schema_for_operation(path::RootSchemaNode & root_sc
 
 static void check_rpc_reply_for_error(const string& reply)
 {
-    if (reply.find("</rpc-error>") != string::npos)
+    if(reply.find("<rpc-error") != string::npos)
     {
         YLOG_ERROR("RPC error occurred:\n{}", reply);
         auto msg = extract_rpc_error(reply);
diff --git a/sdk/cpp/core/src/netconf_ssh_client.cpp b/sdk/cpp/core/src/netconf_ssh_client.cpp
index 4464a6f4f..57596c9a8 100644
--- a/sdk/cpp/core/src/netconf_ssh_client.cpp
+++ b/sdk/cpp/core/src/netconf_ssh_client.cpp
@@ -141,7 +141,6 @@ string NetconfSSHClient::execute_payload(const string & payload)
     YLOG_DEBUG("Netconf SSH Client: sending RPC");
     const nc_msgid msgid = nc_session_send_rpc(session, rpc);
     if (msgid == NULL) {
-        nc_rpc_free(rpc);
         YLOG_ERROR("Failed to send RPC\n{}", payload );
         throw(YClientError{"Failed to send RPC"});
     }
diff --git a/sdk/cpp/core/src/path/data_node.cpp b/sdk/cpp/core/src/path/data_node.cpp
index 9f4aa4b26..6b6f17333 100644
--- a/sdk/cpp/core/src/path/data_node.cpp
+++ b/sdk/cpp/core/src/path/data_node.cpp
@@ -1,7 +1,7 @@
-// YANG Development Kit
-// Copyright 2016-2019 Cisco Systems. All rights reserved
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
 //
-// -------------------------------------------------------------
+////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -23,7 +23,7 @@
 // All modifications in original under CiscoDevNet domain
 // introduced since October 2019 are copyrighted.
 // All rights reserved under Apache License, Version 2.0.
-// -------------------------------------------------------------
+////////////////////////////////////////////////////////////////
 
 #include "path_private.hpp"
 
@@ -66,9 +66,9 @@ ydk::path::DataNode::create_datanode(const std::string& path)
 ydk::path::DataNodeImpl::DataNodeImpl(DataNode* parent, lyd_node* node, const std::shared_ptr<RepositoryPtr> & repo): m_parent{parent}, m_node{node}, m_priv_repo{repo}
 {
     //add the children
-    if (m_node &&
-        !(m_node->schema->nodetype & (LYS_LEAF | LYS_LEAFLIST | LYS_ANYXML)) &&
-        m_node->child)
+    if(m_node && m_node->child && !(m_node->schema->nodetype == LYS_LEAF ||
+                          m_node->schema->nodetype == LYS_LEAFLIST ||
+                          m_node->schema->nodetype == LYS_ANYXML))
     {
         lyd_node *iter = nullptr;
         LY_TREE_FOR(m_node->child, iter) {
@@ -145,18 +145,7 @@ ydk::path::DataNodeImpl::create_datanode(const std::string& path, const std::str
         }
     }
     populate_new_schemas_from_path(path);
-
-    // Do not populate new schemas from URL value
-//    const char * cv = v.c_str();
-//    if ( !(strncmp(cv, "http://", strlen("http://")) &&
-//           strncmp(cv, "https://", strlen("https://")) &&
-//           strncmp(cv, "ftp://", strlen("ftp://")) &&
-//           strncmp(cv+1, "ftp://", strlen("ftp://")) ) )
-    auto url_pos = v.find("://");
-    if ( url_pos == std::string::npos || url_pos > 5 )
-    {
-        populate_new_schemas_from_path(v);
-    }
+    populate_new_schemas_from_path(v);
 
     return create_helper(path, v);
 }
@@ -252,7 +241,7 @@ ydk::path::DataNodeImpl::create_helper(const std::string& path, const std::strin
         if (i != segments.size() - 1)
         {
             YLOG_DEBUG("Creating new data path '{}' in '{}'", child_segment, cn->schema->name);
-            cn = lyd_new_path(cn, nullptr, child_segment.c_str(), nullptr, LYD_ANYDATA_CONSTSTRING, 0);
+            cn = lyd_new_path(cn, nullptr, child_segment.c_str(), nullptr, LYD_ANYDATA_SXML, 0);
         }
         else
         {
@@ -322,8 +311,8 @@ ydk::path::DataNodeImpl::set_value(const std::string& value)
     }
     else
     {
-        YLOG_ERROR("Trying to set value '{}' for a non leaf, anyxml, anydata node.", value);
-        throw(YInvalidArgumentError{"Cannot set value for Data Node"});
+        YLOG_ERROR("Trying to set value {} for a non leaf non anyxml node.", value);
+        throw(YInvalidArgumentError{"Cannot set value for this Data Node"});
     }
 }
 
@@ -390,9 +379,9 @@ ydk::path::DataNodeImpl::get_children() const
     std::vector<std::shared_ptr<DataNode>> ret{};
     //the ordering should be determined by the lyd_node
     lyd_node *iter;
-    if (m_node &&
-        !(m_node->schema->nodetype & (LYS_LEAF | LYS_LEAFLIST | LYS_ANYXML)) &&
-        m_node->child)
+    if(m_node && m_node->child && !(m_node->schema->nodetype == LYS_LEAF ||
+                          m_node->schema->nodetype == LYS_LEAFLIST ||
+                          m_node->schema->nodetype == LYS_ANYXML))
     {
         LY_TREE_FOR(m_node->child, iter){
             auto p = child_map.find(iter);
diff --git a/sdk/cpp/core/src/path/path.cpp b/sdk/cpp/core/src/path/path.cpp
index 06f0fc60f..c0d076cd6 100644
--- a/sdk/cpp/core/src/path/path.cpp
+++ b/sdk/cpp/core/src/path/path.cpp
@@ -1,7 +1,7 @@
-// YANG Development Kit
-// Copyright 2016-2019 Cisco Systems. All rights reserved
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
 //
-// -------------------------------------------------------------
+////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -23,7 +23,7 @@
 // All modifications in original under CiscoDevNet domain
 // introduced since October 2019 are copyrighted.
 // All rights reserved under Apache License, Version 2.0.
-// -------------------------------------------------------------
+////////////////////////////////////////////////////////////////
 
 #include <pcre.h>
 #include <fstream>
@@ -215,15 +215,9 @@ static std::shared_ptr<ydk::path::DataNode> perform_decode(ydk::path::RootSchema
 static struct lyd_node* create_lyd_node_for_rpc(ydk::path::RootSchemaNodeImpl & rs_impl, const std::string & rpc_path)
 {
     struct lyd_node* rpc = lyd_new_path(NULL, rs_impl.m_ctx, rpc_path.c_str(), NULL, LYD_ANYDATA_SXML, 0);
-    if (rpc == nullptr)
+    if( rpc == nullptr || ly_errno )
     {
-        if (ly_errno)
-        {
-            ydk::YLOG_ERROR( "RPC parsing failed with message {}", ly_errmsg());
-        }
-        else {
-            ydk::YLOG_ERROR( "RPC parsing failed. Please enable logging for more details.");
-        }
+        ydk::YLOG_ERROR( "Parsing failed with message {}", ly_errmsg());
         throw(ydk::path::YCodecError{ydk::path::YCodecError::Error::XML_INVAL});
     }
     return rpc;
@@ -310,19 +304,12 @@ ydk::path::Codec::decode(RootSchemaNode & root_schema, const std::string& buffer
     rs_impl.populate_new_schemas_from_payload(buffer, format);
 
     struct lyd_node *root = lyd_parse_mem(rs_impl.m_ctx, buffer.c_str(),
-                                          get_ly_format(format), LYD_OPT_TRUSTED |  LYD_OPT_GET);
+                get_ly_format(format), LYD_OPT_TRUSTED |  LYD_OPT_GET);
 
-    if (root == nullptr)
+    if( root == nullptr || ly_errno )
     {
-        if (ly_errno)
-        {
-            YLOG_ERROR( "Decoding failed with message: {}", ly_errmsg());
-        }
-        else {
-            YLOG_ERROR( "Decoding failed. Please enable logging for more details.");
-        }
-        auto error_code = (format==ydk::EncodingFormat::JSON) ? YCodecError::Error::JSON_INVAL : YCodecError::Error::XML_INVAL;
-        throw(YCodecError{error_code});
+        YLOG_ERROR( "Parsing failed with message {}", ly_errmsg());
+        throw(YCodecError{YCodecError::Error::XML_INVAL});
     }
     return perform_decode(rs_impl, root);
 }
@@ -339,15 +326,9 @@ ydk::path::Codec::decode_rpc_output(RootSchemaNode & root_schema, const std::str
 
     struct lyd_node* root = lyd_parse_mem(rs_impl.m_ctx, buffer.c_str(),
                 get_ly_format(format), LYD_OPT_TRUSTED |  LYD_OPT_RPCREPLY, rpc, NULL);
-    if (root == nullptr)
+    if( root == nullptr || ly_errno )
     {
-        if (ly_errno)
-        {
-            YLOG_ERROR( "Decoding failed with message: {}", ly_errmsg());
-        }
-        else {
-            YLOG_ERROR( "Decoding for RPC output failed. Please enable logging for more details.");
-        }
+        YLOG_ERROR( "Parsing failed with message {}", ly_errmsg());
         throw(YCodecError{YCodecError::Error::XML_INVAL});
     }
     auto dn = perform_decode(rs_impl, root);
@@ -370,16 +351,9 @@ ydk::path::Codec::decode_json_output(RootSchemaNode & root_schema, const std::ve
         rs_impl.populate_new_schemas_from_payload(buffer, ydk::EncodingFormat::JSON);
 
         struct lyd_node *dnode = lyd_parse_mem(rs_impl.m_ctx, buffer.c_str(), LYD_JSON, LYD_OPT_TRUSTED | LYD_OPT_GET);
-        if (dnode == nullptr)
-        {
-            if (ly_errno)
-            {
-                YLOG_ERROR( "Decoding failed with message: {}", ly_errmsg());
-            }
-            else {
-                YLOG_ERROR( "Decoding failed. Please enable logging for more details");
-            }
-            throw(YCodecError{YCodecError::Error::JSON_INVAL});
+        if (dnode == nullptr || ly_errno) {
+            YLOG_ERROR( "Parsing failed with message {}", ly_errmsg());
+            throw(YCodecError{YCodecError::Error::XML_INVAL});
         }
 
         // Attach first node to the root
diff --git a/sdk/cpp/core/src/path/repository.cpp b/sdk/cpp/core/src/path/repository.cpp
index 917e8cf36..52eb80d96 100644
--- a/sdk/cpp/core/src/path/repository.cpp
+++ b/sdk/cpp/core/src/path/repository.cpp
@@ -138,8 +138,7 @@ namespace ydk {
                 throw(YIllegalStateError{"Could not download model: " + model_name});
             }
             memcpy(enlarged_data, data, len);
-            enlarged_data[len] = '\0';
-            enlarged_data[len + 1] = '\0';
+            enlarged_data[len] = enlarged_data[len + 1] = '\0';
             return enlarged_data;
         }
 
diff --git a/sdk/cpp/core/src/path/root_schema_node.cpp b/sdk/cpp/core/src/path/root_schema_node.cpp
index 45c286683..3f8163fcf 100644
--- a/sdk/cpp/core/src/path/root_schema_node.cpp
+++ b/sdk/cpp/core/src/path/root_schema_node.cpp
@@ -64,6 +64,7 @@ using json = nlohmann::json;
         get_namespaces_from_xml_doc(root, namespaces);
 
         xmlFreeDoc(doc);
+        xmlCleanupParser();
 
         return namespaces;
     }
@@ -106,8 +107,7 @@ using json = nlohmann::json;
                 if (it->is_primitive())
                 {
                     auto v = it->dump();
-                    if (v.length() > 2 &&
-                        v.find("\"") == 0 && v.rfind("\"") == v.length()-1) {
+                    if (v.find("\"") == 0 && v.rfind("\"") == v.length()-1) {
                         v = v.substr(1, v.length()-2);
                     }
                     auto ns = path::segmentalize_module_names(v);
diff --git a/sdk/cpp/core/src/path/schema_node.cpp b/sdk/cpp/core/src/path/schema_node.cpp
index 9e31ca288..290cdaf02 100644
--- a/sdk/cpp/core/src/path/schema_node.cpp
+++ b/sdk/cpp/core/src/path/schema_node.cpp
@@ -1,7 +1,7 @@
-// YANG Development Kit
-// Copyright 2016-2019 Cisco Systems. All rights reserved
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
 //
-// -------------------------------------------------------------
+////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -18,12 +18,9 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
-// -------------------------------------------------------------
+//
+//////////////////////////////////////////////////////////////////
+
 
 #include "path_private.hpp"
 #include "../logger.hpp"
@@ -216,14 +213,14 @@ ydk::path::SchemaNodeImpl::get_statement() const
         s.keyword = "container";
         break;
     case LYS_CHOICE:
-        s.keyword = "choice";
-        break;
+    s.keyword = "choice";
+    break;
     case LYS_LEAF:
-        s.keyword = "leaf";
-        break;
+    s.keyword = "leaf";
+    break;
     case LYS_LEAFLIST:
-        s.keyword = "leaf-list";
-        break;
+    s.keyword = "leaf-list";
+    break;
     case LYS_LIST:
         if(m_node->nodetype & LYS_LEAFLIST)
         {
@@ -268,8 +265,6 @@ ydk::path::SchemaNodeImpl::get_statement() const
         s.keyword = "extension";
         break;
     case LYS_ANYDATA:
-        s.keyword = "anydata";
-        break;
     case LYS_UNKNOWN:
         break;
     }
diff --git a/sdk/cpp/core/src/path_api.hpp b/sdk/cpp/core/src/path_api.hpp
index ea9ef4bcf..7f864b2ed 100644
--- a/sdk/cpp/core/src/path_api.hpp
+++ b/sdk/cpp/core/src/path_api.hpp
@@ -1,24 +1,29 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//
+// @file path_api.hpp
+// @brief The main ydk public header.
+//
+// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #ifndef YDK_CORE_HPP
 #define YDK_CORE_HPP
@@ -313,6 +318,7 @@ struct YCoreError : public ydk::YError
     YCoreError();
 
     YCoreError(const std::string& msg);
+
 };
 
 
@@ -400,7 +406,6 @@ struct YCodecError : public YCoreError
 
         XML_MISS,     ///  missing XML object
         XML_INVAL,    ///  invalid XML object
-        JSON_INVAL,   ///  invalid JSON object
         XML_INCHAR,   /// invalid XML character
 
         EOF_ERR,      /// unexpected end of input data
@@ -1029,9 +1034,7 @@ class Session
     /// @param[in] pointer to the Rpc node
     /// @return The pointer to the DataNode representing the output.
     ///
-    virtual std::shared_ptr<DataNode> invoke(DataNode& rpc) const = 0;
-
-    virtual std::vector<std::string> get_capabilities() const = 0;
+    virtual std::shared_ptr<DataNode> invoke(DataNode& rpc) const = 0 ;
 };
 
 class NetconfSession : public Session {
@@ -1113,7 +1116,7 @@ class NetconfSession : public Session {
 
 
 class RestconfSession : public Session {
-  public:
+public:
     RestconfSession();
     RestconfSession(Repository & repo,
                     const std::string & address,
@@ -1133,24 +1136,23 @@ class RestconfSession : public Session {
 
     ~RestconfSession();
 
-    std::vector<std::string> get_capabilities() const;
     RootSchemaNode& get_root_schema() const;
     std::shared_ptr<DataNode> invoke(Rpc& rpc) const;
     std::shared_ptr<DataNode> invoke(DataNode& rpc) const;
 
-  private:
+private:
     void initialize(Repository & repo);
     std::shared_ptr<DataNode> handle_crud_edit(Rpc& rpc, const std::string & yfilter) const;
     std::shared_ptr<DataNode> handle_crud_read(Rpc& rpc) const;
-
-    std::shared_ptr<RestconfClient> client;
-    std::shared_ptr<RootSchemaNode> root_schema;
-    std::vector<std::string> server_capabilities;
-
-    EncodingFormat encoding;
-    std::string edit_method;
-    std::string config_url_root;
-    std::string state_url_root;
+private:
+        std::shared_ptr<RestconfClient> client;
+        std::shared_ptr<RootSchemaNode> root_schema;
+        std::vector<std::string> server_capabilities;
+
+        EncodingFormat encoding;
+        std::string edit_method;
+        std::string config_url_root;
+        std::string state_url_root;
 };
 
 
diff --git a/sdk/cpp/core/src/restconf_client.cpp b/sdk/cpp/core/src/restconf_client.cpp
index cbec4420b..36fa28ea9 100644
--- a/sdk/cpp/core/src/restconf_client.cpp
+++ b/sdk/cpp/core/src/restconf_client.cpp
@@ -42,7 +42,7 @@ static bool token_not_found(size_t token);
 
 
 RestconfClient::RestconfClient(const string & address, const string & username, const string & password,
-                        int port, const string & encoding, unsigned ssl_options)
+                        int port, const string & encoding, uint ssl_options)
     : curl(NULL), header_options_list(NULL), encoding(encoding), ssl_options(ssl_options)
 {
     protocol = (address.find("https://") == 0) ? "HTTPS" : "HTTP";
diff --git a/sdk/cpp/core/src/restconf_client.hpp b/sdk/cpp/core/src/restconf_client.hpp
index 4da3aa662..5cd69866c 100644
--- a/sdk/cpp/core/src/restconf_client.hpp
+++ b/sdk/cpp/core/src/restconf_client.hpp
@@ -38,7 +38,7 @@ class RestconfClient
 {
     public:
         RestconfClient(const std::string & address, const std::string & username, const std::string & password,
-                    int port, const std::string & encoding, unsigned ssl_options=0);
+                    int port, const std::string & encoding, uint ssl_options=0);
         ~RestconfClient();
 
         std::string execute(const std::string & yfilter, const std::string & url, const std::string & payload) const;
@@ -55,7 +55,7 @@ class RestconfClient
         std::string base_url;
         std::string encoding;
         std::string protocol;
-        unsigned ssl_options;
+        uint ssl_options;
 };
 }
 
diff --git a/sdk/cpp/core/src/restconf_session.cpp b/sdk/cpp/core/src/restconf_session.cpp
index 077286e8f..b2b1cad7a 100644
--- a/sdk/cpp/core/src/restconf_session.cpp
+++ b/sdk/cpp/core/src/restconf_session.cpp
@@ -1,24 +1,25 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 #include <sstream>
@@ -115,11 +116,6 @@ path::RootSchemaNode& RestconfSession::get_root_schema() const
     return *root_schema;
 }
 
-vector<string> RestconfSession::get_capabilities() const
-{
-    return server_capabilities;
-}
-
 std::shared_ptr<path::DataNode> RestconfSession::invoke(
     path::DataNode& rpc) const
 {
diff --git a/sdk/cpp/core/src/types.hpp b/sdk/cpp/core/src/types.hpp
index e0bf4cbcc..2dea83aba 100644
--- a/sdk/cpp/core/src/types.hpp
+++ b/sdk/cpp/core/src/types.hpp
@@ -1,24 +1,29 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//
+// @file types.hpp
+// @brief Header for ydk entity
+//
+// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #ifndef _TYPES_HPP_
 #define _TYPES_HPP_
@@ -143,7 +148,7 @@ class Entity {
     bool operator != (const Entity & other) const;
 
   public:
-    Entity* parent = nullptr;
+    Entity* parent;
     std::string yang_name;
     std::string yang_parent_name;
     YFilter yfilter;
@@ -153,7 +158,7 @@ class Entity {
     bool ignore_validation;
     std::vector<std::string> ylist_key_names;
     std::string ylist_key;
-    YList* ylist = nullptr;
+    YList* ylist;
 
     std::string get_ylist_key() const;
 };
@@ -303,6 +308,7 @@ class YLeaf
         yfilter = filter;
     };
 
+  public:
     void store_value(std::string && val);
     std::string get_bits_string() const;
 
@@ -370,7 +376,6 @@ class YList
     std::shared_ptr<Entity> operator [] (const std::size_t item) const;
     std::vector<std::shared_ptr<Entity>> entities() const;
     std::vector<std::string> keys() const;
-    bool has_key(const std::string& key) const;
     std::size_t len() const;
 
     void append(std::shared_ptr<Entity> ep);
@@ -395,8 +400,6 @@ std::ostream& operator<< (std::ostream& stream, const EntityPath& value);
 std::ostream& operator<< (std::ostream& stream, Entity& value);
 std::ostream& operator<< (std::ostream& stream, const LeafData& value);
 
-std::string get_bool_string(const std::string & value);
-
 enum class EncodingFormat {
     XML,
     JSON
diff --git a/sdk/cpp/core/src/validation_service.cpp b/sdk/cpp/core/src/validation_service.cpp
index 4fe53756e..c1127fbec 100644
--- a/sdk/cpp/core/src/validation_service.cpp
+++ b/sdk/cpp/core/src/validation_service.cpp
@@ -1,5 +1,5 @@
-// YANG Development Kit
-// Copyright 2016-2019 Cisco Systems. All rights reserved
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
@@ -38,10 +38,11 @@ ValidationService::validate(const path::Session& session, Entity& entity,
     path::RootSchemaNode& root_schema = session.get_root_schema();
     const path::DataNode& datanode = get_data_node_from_entity(entity, root_schema);
     const path::DataNode* dn = &datanode;
-    while (dn->get_parent())
+    while(dn!= nullptr && dn->get_parent()!=nullptr)
         dn = dn->get_parent();
 
     path::ValidationService path_validation_service{};
     path_validation_service.validate(*dn, option);
+
 }
 }
diff --git a/sdk/cpp/core/src/value.cpp b/sdk/cpp/core/src/value.cpp
index d250eb8d5..04fcdf325 100644
--- a/sdk/cpp/core/src/value.cpp
+++ b/sdk/cpp/core/src/value.cpp
@@ -1,24 +1,29 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//
+// @file value.hpp
+// @brief The main ydk public header.
+//
+// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 #include <sstream>
@@ -29,6 +34,8 @@
 
 namespace ydk {
 
+static std::string get_bool_string(const std::string & value);
+
 std::string to_str(YType t)
 {
 #define TOSTRING(t) case YType::t: return #t
diff --git a/sdk/cpp/core/src/value_list.cpp b/sdk/cpp/core/src/value_list.cpp
index 0d4e5cce8..ba8c81103 100644
--- a/sdk/cpp/core/src/value_list.cpp
+++ b/sdk/cpp/core/src/value_list.cpp
@@ -1,24 +1,29 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//
+// @file value.hpp
+// @brief The main ydk public header.
+//
+// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 #include <sstream>
@@ -254,15 +259,9 @@ std::vector<std::pair<std::string, LeafData> > YLeafList::get_name_leafdata() co
     std::vector<std::pair<std::string, LeafData> > name_values;
     for (auto value : values)
     {
-        auto leaf_name_data = value.get_name_leafdata();
-        auto val = value.get();
-        if (value.type == YType::boolean)
-        {
-            val = get_bool_string(val);
-        }
         name_values.push_back(
                             {
-                                (leaf_name_data.first+"[.=\""+val+"\"]"),
+                                (value.get_name_leafdata().first+"[.=\""+value.get()+"\"]"),
                                 {"", yfilter, value.is_set, value.value_namespace, value.value_namespace_prefix}
                             }
                             );
@@ -296,7 +295,7 @@ YList::build_key(shared_ptr<Entity> ep)
     vector< pair<string, LeafData> > name_leaf_data_vector = ep->get_name_leaf_data();
     for (auto ylist_key : ylist_key_names) {
         for (auto name_leaf_data : name_leaf_data_vector) {
-            if (ylist_key == name_leaf_data.first && !name_leaf_data.second.value.empty()) {
+            if (ylist_key == name_leaf_data.first) {
                 key = value_buffer.str();
                 if (key.length() > 0) {
                     value_buffer << ",";
@@ -352,13 +351,6 @@ YList::extend(initializer_list<shared_ptr<Entity>> ep_list)
     }
 }
 
-bool
-YList::has_key(const std::string& key) const
-{
-    auto it = entity_map.find(key);
-    return it != entity_map.end();
-}
-
 shared_ptr<Entity>
 YList::operator [] (const string& key) const
 {
diff --git a/sdk/cpp/core/src/xml_subtree_codec.cpp b/sdk/cpp/core/src/xml_subtree_codec.cpp
index 7fd830840..12be67f27 100644
--- a/sdk/cpp/core/src/xml_subtree_codec.cpp
+++ b/sdk/cpp/core/src/xml_subtree_codec.cpp
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -136,20 +136,11 @@ static void populate_xml_node(Entity & entity, const path::SchemaNode & parent_s
     walk_children(entity, *schema, child);
 }
 
-static const xmlChar* get_content_from_leafdata(string leaf_name, LeafData & leaf_data)
+static const xmlChar* get_content_from_leafdata(LeafData & leaf_data)
 {
     const xmlChar* content = NULL;
     if(leaf_data.is_set)
     {
-        string leaf_type = "leaf";
-        auto pos = leaf_name.find("[.=\"");
-        if (pos != string::npos) {
-            leaf_data.value = leaf_name.substr(pos+4, leaf_name.length()-pos-6);
-            leaf_name = leaf_name.substr(0, pos);
-            leaf_type = "leaf-list";
-        }
-        YLOG_DEBUG("XmlCodec: Creating {} node '{}' with value: '{}'",
-                   leaf_type, leaf_name, leaf_data.value);
         content = to_xmlchar(leaf_data.value);
     }
     else if(is_set(leaf_data.yfilter))
@@ -184,7 +175,7 @@ static void populate_xml_node_contents(const path::SchemaNode & parent_schema, E
         YLOG_DEBUG("XMLCodec: Creating child {} of {} with value: '{}', is_set: {}", name_value.first, parent_schema.get_path(),
                 leaf_data.value, leaf_data.is_set);
 
-        const xmlChar* content = get_content_from_leafdata(name_value.first, leaf_data);
+        const xmlChar* content = get_content_from_leafdata(leaf_data);
         if(leaf_to_be_created(leaf_data))
         {
             xmlNodePtr child = create_and_populate_xml_node(parent_schema, *schema, leaf_data.yfilter, xml_node, content);
@@ -217,7 +208,7 @@ std::shared_ptr<Entity> XmlSubtreeCodec::decode(const std::string & payload, std
 static void check_and_set_leaf(Entity & entity, Entity * parent, xmlNodePtr xml_node, xmlDocPtr doc)
 {
     string current_node_name{to_string(xml_node->name)};
-    if (xml_node->children == NULL)
+    if(xml_node->children == NULL)
     {
         YLOG_DEBUG("XMLCodec: Creating leaf '{}' with no value", current_node_name);
         entity.set_filter(current_node_name, YFilter::read);
@@ -321,9 +312,6 @@ static void check_and_set_node(Entity & entity, Entity * parent, xmlNodePtr xml_
             child->parent = parent;
         }
         decode_xml(doc, xml_node->children, *child, &entity, "");
-        if (child->ylist && child->ylist->ylist_key_names.size() > 0) {
-            child->ylist->review(child);
-        }
     }
     else {
         check_and_set_leaf(entity, parent, xml_node, doc);
diff --git a/sdk/cpp/core/src/ydk.cpp b/sdk/cpp/core/src/ydk.cpp
index 42b365172..8a81f326d 100644
--- a/sdk/cpp/core/src/ydk.cpp
+++ b/sdk/cpp/core/src/ydk.cpp
@@ -1,26 +1,28 @@
-/*  ----------------------------------------------------------------
- @file ydk.cpp
-
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//////////////////////////////////////////////////////////////////
+// @file ydk.cpp
+//
+// YANG Development Kit
+// Copyright 2017 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include "crud_service.hpp"
 #include "errors.hpp"
@@ -344,55 +346,89 @@ const char * ServiceProviderType(ServiceProvider provider) {
 
 ServiceProvider NetconfServiceProviderInit(
     YDKStatePtr state,
-    Repository repo,
+    const char * address,
+    const char * username,
+    const char * password,
+    int port,
+    const char * protocol)
+{
+    try
+    {
+        ydk::NetconfServiceProvider * real_provider = new ydk::NetconfServiceProvider(
+            address, username, password, port, protocol);
+        return static_cast<void*>(real_provider);
+    }
+    catch(...)
+    {
+        YDKState* real_state = static_cast<YDKState*>(state);
+        handle_error(real_state);
+        return NULL;
+    }
+}
+
+ServiceProvider NetconfServiceProviderInitWithOnDemand(
+    YDKStatePtr state,
     const char * address,
     const char * username,
     const char * password,
     int port,
     const char * protocol,
     boolean on_demand,
-    boolean common_cache,
-    int timeout,
-    const char * server_certificate_path, const char * private_key_path)
+    boolean common_cache)
 {
     try
     {
-        ydk::NetconfServiceProvider * real_provider;
-        if (repo)
-        {
-            ydk::path::Repository* real_repo = static_cast<ydk::path::Repository*>(repo);
-            if (server_certificate_path && *server_certificate_path)
-            {
-                real_provider = new ydk::NetconfServiceProvider(
-                    *real_repo,
-                    address, username,
-                    private_key_path, server_certificate_path,
-                    port, on_demand, timeout);
-            }
-            else
-            {
-                real_provider = new ydk::NetconfServiceProvider(
-                    *real_repo,
-                    address, username, password, port,
-                    protocol, on_demand, timeout);
-            }
-        }
-        else
-        {
-            if (server_certificate_path && *server_certificate_path)
-            {
-                real_provider = new ydk::NetconfServiceProvider(
-                    address, username,
-                    private_key_path, server_certificate_path,
-                    port, on_demand, common_cache, timeout);
-            }
-            else
-            {
-                real_provider = new ydk::NetconfServiceProvider(
-                    address, username, password, port,
-                    protocol, on_demand, common_cache, timeout);
-            }
-        }
+        ydk::NetconfServiceProvider * real_provider = new ydk::NetconfServiceProvider(
+            address, username, password, port, protocol, on_demand, common_cache);
+        return static_cast<void*>(real_provider);
+    }
+    catch(...)
+    {
+        YDKState* real_state = static_cast<YDKState*>(state);
+        handle_error(real_state);
+        return NULL;
+    }
+}
+
+ServiceProvider NetconfServiceProviderInitWithRepo(
+    YDKStatePtr state,
+    Repository repo,
+    const char * address,
+    const char * username,
+    const char * password,
+    int port,
+    const char * protocol)
+{
+    try
+    {
+        ydk::path::Repository* real_repo = static_cast<ydk::path::Repository*>(repo);
+        ydk::NetconfServiceProvider * real_provider = new ydk::NetconfServiceProvider(
+            *real_repo, address, username, password, port, protocol);
+        return static_cast<void*>(real_provider);
+    }
+    catch(...)
+    {
+        YDKState* real_state = static_cast<YDKState*>(state);
+        handle_error(real_state);
+        return NULL;
+    }
+}
+
+ServiceProvider NetconfServiceProviderInitWithOnDemandRepo(
+    YDKStatePtr state,
+    Repository repo,
+    const char * address,
+    const char * username,
+    const char * password,
+    int port,
+    const char * protocol,
+    boolean on_demand)
+{
+    try
+    {
+        ydk::path::Repository* real_repo = static_cast<ydk::path::Repository*>(repo);
+        ydk::NetconfServiceProvider * real_provider = new ydk::NetconfServiceProvider(
+            *real_repo, address, username, password, port, protocol, on_demand);
         return static_cast<void*>(real_provider);
     }
     catch(...)
@@ -412,6 +448,27 @@ void NetconfServiceProviderFree(ServiceProvider provider)
     }
 }
 
+int NetconfServiceProviderGetNumCapabilities(ServiceProvider provider)
+{
+    ydk::NetconfServiceProvider * real_provider = static_cast<ydk::NetconfServiceProvider*>(provider);
+    if(real_provider != NULL)
+    {
+        return real_provider->get_capabilities().size();
+    }
+    return 0;
+}
+
+const char* NetconfServiceProviderGetCapabilityByIndex(ServiceProvider provider, int index)
+{
+    ydk::NetconfServiceProvider * real_provider = static_cast<ydk::NetconfServiceProvider*>(provider);
+    if(real_provider != NULL)
+    {
+        std::vector<std::string> capabilites = real_provider->get_capabilities();
+        return string_to_array(capabilites[index]);
+    }
+    return "";
+}
+
 ServiceProvider RestconfServiceProviderInitWithRepo(
     YDKStatePtr state,
     Repository repo,
@@ -568,7 +625,7 @@ Session ServiceProviderGetSession(ServiceProvider provider)
     return static_cast<void*>(&s);
 }
 
-RootSchemaWrapper SessionGetRootSchemaNode(YDKStatePtr state, Session session)
+RootSchemaNode SessionGetRootSchema(YDKStatePtr state, Session session)
 {
     try {
     	ydk::path::Session * real_session = static_cast<ydk::path::Session*>(session);
@@ -644,12 +701,12 @@ DataNode CodecDecode(
     }
 }
 
-DataNode RootSchemaNodeCreate(YDKStatePtr state, RootSchemaNode root_schema, const char* path, const char* value)
+DataNode RootSchemaNodeCreate(YDKStatePtr state, RootSchemaNode root_schema, const char* path)
 {
     try
     {
         ydk::path::RootSchemaNode * real_root_schema = (ydk::path::RootSchemaNode*)root_schema;
-        ydk::path::DataNode * datanode = &real_root_schema->create_datanode(path, value);
+        ydk::path::DataNode * datanode = &real_root_schema->create_datanode(path);
 
         return static_cast<void*>(wrap(datanode));
     }
@@ -842,11 +899,7 @@ const char* DataNodeGetSegmentPath(DataNode datanode)
 
 void EnableLogging(LogLevel level)
 {
-    auto console = spdlog::get("ydk");
-    if (console == nullptr)
-    {
-        console = spdlog::stdout_color_mt("ydk");
-    }
+    auto console = spdlog::stdout_color_mt("ydk");
     switch(level)
     {
         case DEBUG:
@@ -921,156 +974,3 @@ void YLogError(const char* msg)
     ydk::YLOG_ERROR(msg);
 }
 
-Session NetconfSessionInit(YDKStatePtr state, Repository repo,
-                           const char * address, const char * username, const char * password, int port,
-                           const char * protocol, boolean on_demand, boolean common_cache, int timeout,
-                           const char * server_certificate, const char * private_key)
-{
-    try
-    {
-        ydk::path::NetconfSession * real_session;
-        if (repo)
-        {
-            ydk::path::Repository* real_repo = static_cast<ydk::path::Repository*>(repo);
-            if (server_certificate && *server_certificate)
-            {
-                real_session = new ydk::path::NetconfSession(
-                    *real_repo,
-                    address, username,
-                    private_key, server_certificate,
-                    port, on_demand, timeout);
-            }
-            else
-            {
-                real_session = new ydk::path::NetconfSession(
-                    *real_repo,
-                    address, username, password, port,
-                    protocol, on_demand, timeout);
-            }
-        }
-        else
-        {
-            if (server_certificate && *server_certificate)
-            {
-                real_session = new ydk::path::NetconfSession(
-                    address, username,
-                    private_key, server_certificate,
-                    port, on_demand, common_cache, timeout);
-            }
-            else
-            {
-                real_session = new ydk::path::NetconfSession(
-                    address, username, password, port,
-                    protocol, on_demand, common_cache, timeout);
-            }
-        }
-        return static_cast<void*>(real_session);
-    }
-    catch(...)
-    {
-        YDKState* real_state = static_cast<YDKState*>(state);
-        handle_error(real_state);
-        return NULL;
-    }
-}
-
-void NetconfSessionFree(Session session)
-{
-    ydk::path::NetconfSession * real_session = static_cast<ydk::path::NetconfSession*>(session);
-    if (real_session)
-    {
-        delete real_session;
-    }
-}
-
-DataNode SessionExecuteRpc(YDKStatePtr state, Session session, Rpc rpc)
-{
-    try
-    {
-        RpcWrapper* rpc_wrapper = (RpcWrapper*)rpc;
-        ydk::path::Rpc* real_rpc = unwrap(rpc_wrapper);
-
-        ydk::path::Session * real_session = (ydk::path::Session *) session;
-        std::shared_ptr<ydk::path::DataNode> result = real_session->invoke(*real_rpc);
-
-        if (result)
-            return static_cast<void*>(wrap(result));
-        else
-            return nullptr;
-    }
-    catch(...)
-    {
-        YDKState* real_state = static_cast<YDKState*>(state);
-        handle_error(real_state);
-        return NULL;
-    }
-}
-
-char** SessionGetCapabilities(YDKStatePtr state, Session session, int* len)
-{
-    try {
-        ydk::path::Session * real_session = static_cast<ydk::path::Session *>(session);
-        if (real_session)
-        {
-            std::vector<std::string> capabilites = real_session->get_capabilities();
-            char** cap_array = (char **)calloc(capabilites.size(), sizeof(char*));
-            for (unsigned long i=0; i<capabilites.size(); i++)
-            {
-                char * cstr = (char*) calloc(capabilites[i].length()+1, sizeof(char));
-                std::strcpy(cstr, capabilites[i].c_str());
-                cap_array[i] = cstr;
-            }
-            *len = capabilites.size();
-            return cap_array;
-        }
-        return NULL;
-    }
-    catch(...)
-    {
-        YDKState* real_state = static_cast<YDKState*>(state);
-        handle_error(real_state);
-        return NULL;
-    }
-}
-
-void CapabilitiesArrayFree(char** caps, int len)
-{
-    for (int i=0; i<len; i++)
-    {
-        free((void*)caps[i]);
-    }
-    free((void*)caps);
-}
-
-Session RestconfSessionInit(YDKStatePtr state, Repository repo,
-                            const char * address, const char * username, const char * password, int port,
-                            EncodingFormat encoding,
-                            const char * config_url_root, const char * state_url_root)
-{
-    try
-    {
-        ydk::path::RestconfSession * real_session;
-        ydk::path::Repository* real_repo = static_cast<ydk::path::Repository*>(repo);
-        real_session = new ydk::path::RestconfSession(
-            *real_repo,
-            address, username, password, port,
-            get_real_encoding(encoding),
-            config_url_root, state_url_root);
-        return static_cast<void*>(real_session);
-    }
-    catch(...)
-    {
-        YDKState* real_state = static_cast<YDKState*>(state);
-        handle_error(real_state);
-        return NULL;
-    }
-}
-
-void RestconfSessionFree(Session session)
-{
-    ydk::path::RestconfSession * real_session = static_cast<ydk::path::RestconfSession*>(session);
-    if (real_session)
-    {
-        delete real_session;
-    }
-}
\ No newline at end of file
diff --git a/sdk/cpp/core/src/ydk.h b/sdk/cpp/core/src/ydk.h
index 81a9e8a53..378bdbe94 100644
--- a/sdk/cpp/core/src/ydk.h
+++ b/sdk/cpp/core/src/ydk.h
@@ -1,26 +1,28 @@
-/*  ----------------------------------------------------------------
- @file ydk.h
-
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//////////////////////////////////////////////////////////////////
+// @file ydk.h
+//
+// YANG Development Kit
+// Copyright 2017 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #ifndef _YDK_H_
 #define _YDK_H_
@@ -40,6 +42,7 @@ typedef void* OpenDaylightServiceProvider;
 typedef void* Capability;
 typedef void* Repository;
 typedef void* YDKStatePtr;
+
 typedef void* Session;
 
 typedef struct DataNodeChildren
@@ -109,37 +112,18 @@ Repository RepositoryInit(void);
 RootSchemaWrapper RepositoryCreateRootSchemaWrapper(YDKStatePtr state, Repository, const char* keys[], const Capability values[], int size);
 void RepositoryFree(Repository);
 
+ServiceProvider NetconfServiceProviderInit(YDKStatePtr state, const char * address, const char * username, const char * password, int port, const char * protocol);
+ServiceProvider NetconfServiceProviderInitWithOnDemand(YDKStatePtr state, const char * address, const char * username, const char * password, int port, const char * protocol, boolean on_demand, boolean common_cache);
+ServiceProvider NetconfServiceProviderInitWithRepo(YDKStatePtr state, Repository repo, const char * address, const char * username, const char * password, int port, const char * protocol);
+ServiceProvider NetconfServiceProviderInitWithOnDemandRepo(YDKStatePtr state, Repository repo, const char * address, const char * username, const char * password, int port, const char * protocol, boolean on_demand);
 RootSchemaNode ServiceProviderGetRootSchema(YDKStatePtr, ServiceProvider);
 RootSchemaWrapper ServiceProviderGetRootSchemaNode(YDKStatePtr, ServiceProvider);
 EncodingFormat ServiceProviderGetEncoding(ServiceProvider);
 Session ServiceProviderGetSession(ServiceProvider);
-RootSchemaWrapper SessionGetRootSchemaNode(YDKStatePtr, Session);
-
-// Netconf Service Provider API
-ServiceProvider NetconfServiceProviderInit(YDKStatePtr state, Repository repo,
-                                           const char * address, const char * username, const char * password, int port,
-                                           const char * protocol, boolean on_demand, boolean common_cache, int timeout,
-                                           const char * server_certificate_path, const char * private_key_path);
+RootSchemaNode SessionGetRootSchema(YDKStatePtr, Session);
 void NetconfServiceProviderFree(ServiceProvider);
-
-// Netconf Session API
-Session NetconfSessionInit(YDKStatePtr state, Repository repo,
-                           const char * address, const char * username, const char * password, int port,
-                           const char * protocol, boolean on_demand, boolean common_cache, int timeout,
-                           const char * server_certificate_path, const char * private_key_path);
-void NetconfSessionFree(Session);
-char** SessionGetCapabilities(YDKStatePtr state, Session session, int* len);
-
-// Restconf Session API
-Session RestconfSessionInit(YDKStatePtr state, Repository repo,
-                            const char * address, const char * username, const char * password, int port,
-                            EncodingFormat encoding,
-                            const char * config_url_root, const char * state_url_root);
-void RestconfSessionFree(Session);
-
-DataNode SessionExecuteRpc(YDKStatePtr state, Session session, Rpc rpc);
-
-void CapabilitiesArrayFree(char** caps, int len);
+int NetconfServiceProviderGetNumCapabilities(ServiceProvider);
+const char* NetconfServiceProviderGetCapabilityByIndex(ServiceProvider, int);
 
 ServiceProvider RestconfServiceProviderInitWithRepo(YDKStatePtr state, Repository repo, const char * address, const char * username, const char * password, int port, EncodingFormat encoding, const char* config_url_root, const char* state_url_root);
 void RestconfServiceProviderFree(ServiceProvider);
@@ -156,7 +140,7 @@ void CodecFree(Codec);
 const char* CodecEncode(YDKStatePtr state, Codec, DataNode, EncodingFormat, boolean);
 DataNode CodecDecode(YDKStatePtr state, Codec, RootSchemaNode, const char*, EncodingFormat);
 
-DataNode RootSchemaNodeCreate(YDKStatePtr, RootSchemaNode, const char*, const char*);
+DataNode RootSchemaNodeCreate(YDKStatePtr, RootSchemaNode, const char*);
 Rpc RootSchemaNodeRpc(YDKStatePtr state, RootSchemaNode, const char*);
 RootSchemaNode RootSchemaWrapperUnwrap(RootSchemaWrapper);
 
diff --git a/sdk/cpp/core/tests/CMakeLists.txt b/sdk/cpp/core/tests/CMakeLists.txt
index 6e124af8c..c72668de4 100644
--- a/sdk/cpp/core/tests/CMakeLists.txt
+++ b/sdk/cpp/core/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ foreach(test_name IN LISTS core_tests)
     add_executable(${test_name} ${test_name}.cpp)
     set_property(TARGET ${test_name} PROPERTY CXX_STANDARD 11)
     set_property(TARGET ${test_name} PROPERTY CXX_STANDARD_REQUIRED ON)
-    target_link_libraries(${test_name} ${CPACK_LIBRARY_NAME}
+    target_link_libraries(${test_name} ydk
         curl
         xslt
         pcre
@@ -39,7 +39,7 @@ endforeach(test_name)
 add_executable(${YDK_UNITTEST_TARGET_NAME} ${core_tests_src})
 set_property(TARGET ${YDK_UNITTEST_TARGET_NAME} PROPERTY CXX_STANDARD 11)
 set_property(TARGET ${YDK_UNITTEST_TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(${YDK_UNITTEST_TARGET_NAME} ${CPACK_LIBRARY_NAME})
+target_link_libraries(${YDK_UNITTEST_TARGET_NAME} ydk)
 add_test(NAME ${YDK_UNITTEST_TARGET_NAME} COMMAND $<TARGET_FILE:${YDK_UNITTEST_TARGET_NAME}>)
 
 configure_file("${PROJECT_SOURCE_DIR}/tests/main.cpp.in" "${PROJECT_SOURCE_DIR}/tests/main.cpp" ESCAPE_QUOTES @ONLY)
diff --git a/sdk/cpp/core/tests/bgptest.cpp b/sdk/cpp/core/tests/bgptest.cpp
index 8a26aaa50..2889e365e 100644
--- a/sdk/cpp/core/tests/bgptest.cpp
+++ b/sdk/cpp/core/tests/bgptest.cpp
@@ -1,4 +1,4 @@
-// YANG Development Kit
+/// YANG Development Kit
 // Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
@@ -18,11 +18,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
+//
 //////////////////////////////////////////////////////////////////
 
 #include <iostream>
@@ -151,9 +147,13 @@ const char* expected_bgp_json = "\
 const char* expected_bgp_peer_xml = "<bgp xmlns=\"http://openconfig.net/yang/bgp\"><global><config><as>65172</as></config><afi-safis><afi-safi><afi-safi-name xmlns:oc-bgp-types=\"http://openconfig.net/yang/bgp-types\">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name><config><afi-safi-name xmlns:oc-bgp-types=\"http://openconfig.net/yang/bgp-types\">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name><enabled>true</enabled></config></afi-safi></afi-safis></global><peer-groups><peer-group><peer-group-name>IBGP</peer-group-name><config><peer-group-name>IBGP</peer-group-name><peer-as>65001</peer-as></config><afi-safis><afi-safi><afi-safi-name xmlns:oc-bgp-types=\"http://openconfig.net/yang/bgp-types\">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name><config><afi-safi-name xmlns:oc-bgp-types=\"http://openconfig.net/yang/bgp-types\">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name><enabled>true</enabled></config><apply-policy><config><export-policy>POLICY2</export-policy></config></apply-policy></afi-safi></afi-safis></peer-group></peer-groups><neighbors><neighbor><neighbor-address>172.16.255.2</neighbor-address><config><neighbor-address>172.16.255.2</neighbor-address><peer-group>IBGP</peer-group></config></neighbor></neighbors></bgp>";
 const char* expected_bgp_peer_json = "{\"openconfig-bgp:bgp\":{\"global\":{\"config\":{\"as\":65172},\"afi-safis\":{\"afi-safi\":[{\"afi-safi-name\":\"openconfig-bgp-types:L3VPN_IPV4_UNICAST\",\"config\":{\"afi-safi-name\":\"openconfig-bgp-types:L3VPN_IPV4_UNICAST\",\"enabled\":true}}]}},\"peer-groups\":{\"peer-group\":[{\"peer-group-name\":\"IBGP\",\"config\":{\"peer-group-name\":\"IBGP\",\"peer-as\":65001},\"afi-safis\":{\"afi-safi\":[{\"afi-safi-name\":\"openconfig-bgp-types:L3VPN_IPV4_UNICAST\",\"config\":{\"afi-safi-name\":\"openconfig-bgp-types:L3VPN_IPV4_UNICAST\",\"enabled\":true},\"apply-policy\":{\"config\":{\"export-policy\":[\"POLICY2\"]}}}]}}]},\"neighbors\":{\"neighbor\":[{\"neighbor-address\":\"172.16.255.2\",\"config\":{\"neighbor-address\":\"172.16.255.2\",\"peer-group\":\"IBGP\"}}]}}}";
 
-static ydk::path::DataNode &
-build_bgp_datanode(ydk::path::RootSchemaNode & schema)
+TEST_CASE( "bgp" )
 {
+    ydk::path::Repository repo{TEST_HOME};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
+
+    auto & schema = sp.get_root_schema();
+
     auto & bgp = schema.create_datanode("openconfig-bgp:bgp", "");
 
     auto & as = bgp.create_datanode("global/config/as", "65172");
@@ -179,20 +179,10 @@ build_bgp_datanode(ydk::path::RootSchemaNode & schema)
 
     auto & neighbor_enabled = neighbor_af.create_datanode("config/enabled","true");
 
-    return bgp;
-}
-
-TEST_CASE( "bgp_xml" )
-{
-    ydk::path::Repository repo{TEST_HOME};
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::XML};
-
-    auto & schema = sp.get_root_schema();
-
-    auto & bgp = build_bgp_datanode(schema);
-
     ydk::path::Codec s{};
 
+
+    //XML Codec Test
     auto xml = s.encode(bgp, ydk::EncodingFormat::XML, false);
 
     CHECK( !xml.empty());
@@ -205,24 +195,12 @@ TEST_CASE( "bgp_xml" )
 
     CHECK(!new_xml.empty());
 
-    REQUIRE(new_xml == expected_bgp_output);
-
-    auto create_rpc = schema.create_rpc("ydk:create") ;
-    create_rpc->get_input_node().create_datanode("entity", xml);
 
-    //call create
-    (*create_rpc)(sp);
-}
 
-TEST_CASE( "bgp_json" )
-{
-    ydk::path::Repository repo{TEST_HOME};
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::JSON};
-    auto & schema = sp.get_root_schema();
+    REQUIRE(new_xml == expected_bgp_output);
 
-    auto & bgp = build_bgp_datanode(schema);
 
-    ydk::path::Codec s{};
+    //JSON codec test
     auto json = s.encode(bgp, ydk::EncodingFormat::JSON, false);
 
     CHECK( !json.empty());
@@ -235,16 +213,25 @@ TEST_CASE( "bgp_json" )
 
     auto new_json = s.encode(*new_bgp1, ydk::EncodingFormat::JSON, false);
 
+
     CHECK(!new_json.empty());
 
     REQUIRE(new_json == expected_bgp_json);
+
+
+    auto create_rpc = schema.create_rpc("ydk:create") ;
+    create_rpc->get_input_node().create_datanode("entity", xml);
+
+    //call create
+    (*create_rpc)(sp);
+
 }
 
 TEST_CASE( "bgp_validation" )
 {
     ydk::path::Repository repo{TEST_HOME};
 
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::XML};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -290,7 +277,7 @@ TEST_CASE( "decode_remove_as" )
 {
     ydk::path::Repository repo{TEST_HOME};
 
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::XML};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -315,7 +302,7 @@ TEST_CASE( "bits_order" )
 
     ydk::path::Codec s{};
 
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::XML};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -336,7 +323,7 @@ TEST_CASE("rpc_output")
 
     ydk::path::Codec s{};
 
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::XML};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -354,42 +341,41 @@ TEST_CASE("rpc_output")
     REQUIRE(lo->has_output_node() == false);
 }
 
-/* TODO fix issue with submodule
 TEST_CASE( "submodule" )
-{
-    ydk::path::Repository repo{TEST_HOME};
-    mock::MockServiceProvider sp{repo, test_openconfig, ydk::EncodingFormat::XML};
-    ydk::path::Codec s{};
-
-    std::unique_ptr<ydk::path::RootSchemaNode> schema{sp.get_root_schema()};
-
-    REQUIRE(schema.get_value() != nullptr);
-
-    auto subtest = schema->create_datanode("ydktest-sanity:sub-test", "");
-    std::cout<<subtest->get_schema_node()->get_path()<<std::endl;
-
-    REQUIRE( subtest != nullptr );
-
-    //get the root
-    std::unique_ptr<const ydk::path::DataNode> data_root{subtest->get_root()};
-
-    REQUIRE( data_root != nullptr );
-
-    auto name = subtest->create_datanode("ydktest-sanity:sub-test/one-aug/name", "test");
-    REQUIRE( name!= nullptr );
-
-    auto number = subtest->create_datanode("ydktest-sanity:sub-test/one-aug/number", "3");
-    REQUIRE( number!= nullptr );
-
-    auto ne1w_xml = s.encode(*subtest, ydk::EncodingFormat::XML, false);
-
-    auto expected = "<sub-test xmlns=\"http://cisco.com/ns/yang/ydktest-sanity\"><one-aug><name>test</name></one-aug><one-aug><number>3</number></one-aug></sub-test>";
-//    REQUIRE( new_xml == expected );
-
-    auto new_bgp = s.decode(schema, expected, ydk::EncodingFormat::XML);
+{//TODO fix issue with submodule
+    // ydk::path::Repository repo{TEST_HOME};
+//    mock::MockServiceProvider sp{repo, test_openconfig};
+//    ydk::path::Codec s{};
+//
+//    std::unique_ptr<ydk::path::RootSchemaNode> schema{sp.get_root_schema()};
+//
+//    REQUIRE(schema.get_value() != nullptr);
+//
+//    auto subtest = schema->create_datanode("ydktest-sanity:sub-test", "");
+//    std::cout<<subtest->get_schema_node()->get_path()<<std::endl;
+//
+//    REQUIRE( subtest != nullptr );
+//
+//    //get the root
+//    std::unique_ptr<const ydk::path::DataNode> data_root{subtest->get_root()};
+//
+//    REQUIRE( data_root != nullptr );
+//
+//    auto name = subtest->create_datanode("ydktest-sanity:sub-test/one-aug/name", "test");
+//    REQUIRE( name!= nullptr );
+//
+//    auto number = subtest->create_datanode("ydktest-sanity:sub-test/one-aug/number", "3");
+//    REQUIRE( number!= nullptr );
 
-    auto new_xml = s.encode(*new_bgp, ydk::EncodingFormat::XML, false);
-    std::cout<<new_xml<<std::endl;
+//    auto ne1w_xml = s.encode(*subtest, ydk::EncodingFormat::XML, false);
 
-    auto bgp = s.decode(schema, new_xml, ydk::EncodingFormat::XML);
-} */
+//    auto expected = "<sub-test xmlns=\"http://cisco.com/ns/yang/ydktest-sanity\"><one-aug><name>test</name></one-aug><one-aug><number>3</number></one-aug></sub-test>";
+////    REQUIRE( new_xml == expected );
+//
+//    auto new_bgp = s.decode(schema, expected, ydk::EncodingFormat::XML);
+//
+//    auto new_xml = s.encode(*new_bgp, ydk::EncodingFormat::XML, false);
+//    std::cout<<new_xml<<std::endl;
+//
+//    auto bgp = s.decode(schema, new_xml, ydk::EncodingFormat::XML);
+}
diff --git a/sdk/cpp/core/tests/confd/deviation/Makefile b/sdk/cpp/core/tests/confd/deviation/Makefile
index 5e28ab51e..4f6252232 100644
--- a/sdk/cpp/core/tests/confd/deviation/Makefile
+++ b/sdk/cpp/core/tests/confd/deviation/Makefile
@@ -28,8 +28,7 @@ START_FLAGS ?=
 all: openconfig-bgp.deviation ydktest-sanity.deviation \
 	openconfig-bgp.fxs openconfig-routing-policy.fxs openconfig-policy-types.fxs openconfig-bgp-types.fxs \
 	openconfig-types.fxs openconfig-bgp-operational.fxs openconfig-bgp-multiprotocol.fxs \
-	ydktest-types.fxs openconfig-extensions.fxs \
-	ydktest-sanity-deviations-types.fxs ydktest-sanity-deviations-another.fxs \
+	ydktest-types.fxs \
 		$(CDB_DIR) ssh-keydir
 	@echo "Build complete"
 
diff --git a/sdk/cpp/core/tests/confd/ydktest/confd.conf b/sdk/cpp/core/tests/confd/ydktest/confd.conf
index bb716401b..ebea91ac9 100644
--- a/sdk/cpp/core/tests/confd/ydktest/confd.conf
+++ b/sdk/cpp/core/tests/confd/ydktest/confd.conf
@@ -87,7 +87,7 @@
         <name>./confd.log</name>
       </file>
       <syslog>
-        <enabled>false</enabled>
+        <enabled>true</enabled>
       </syslog>
     </confdLog>
 
@@ -113,7 +113,7 @@
         <name>./audit.log</name>
       </file>
       <syslog>
-        <enabled>false</enabled>
+        <enabled>true</enabled>
       </syslog>
     </auditLog>
 
diff --git a/sdk/cpp/core/tests/mock_data.hpp b/sdk/cpp/core/tests/mock_data.hpp
index dbb9122de..f392d1f90 100644
--- a/sdk/cpp/core/tests/mock_data.hpp
+++ b/sdk/cpp/core/tests/mock_data.hpp
@@ -1,24 +1,26 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+
+/// YANG Development Kit
+// Copyright 2016 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 #include "../src/path_api.hpp"
@@ -34,7 +36,7 @@ static std::unordered_map<std::string, ydk::path::Capability> test_openconfig_lo
     {"http://openconfig.net/yang/policy-types", {"openconfig-policy-types", ""}},
     {"http://openconfig.net/yang/routing-policy", {"openconfig-routing-policy", ""}},
     {"http://openconfig.net/yang/openconfig-types", {"openconfig-types", ""}},
-    {"urn:ietf:params:xml:ns:netconf:base:1.0", {"ietf-netconf", "", {"validate", "candidate"}, {}}},
+    {"urn:ietf:params:xml:ns:netconf:base:1.0", {"ietf-netconf", ""}},
     {"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring", {"ietf-netconf-monitoring", ""}},
     {"urn:ietf:params:xml:ns:yang:ietf-interfaces", {"ietf-interfaces", ""}},
     {"http://cisco.com/ns/yang/ydk", {"ydk", ""}},
@@ -43,25 +45,25 @@ static std::unordered_map<std::string, ydk::path::Capability> test_openconfig_lo
     {"http://cisco.com/ns/yang/ydktest-types", {"ydktest-types", ""}}
 };
 
+
 namespace mock {
 class MockSession : public ydk::path::Session 
 {
-  public:
-    MockSession(const std::string & searchdir, const std::vector<ydk::path::Capability> capabilities, ydk::EncodingFormat encoding)
-     : m_searchdir{searchdir}, m_capabilities{capabilities}, m_encoding{encoding}
+public:
+    MockSession(const std::string & searchdir, const std::vector<ydk::path::Capability> capabilities) : m_searchdir{searchdir}, m_capabilities{capabilities}
     {
         ydk::path::Repository repo{m_searchdir};
         ydk::IetfCapabilitiesParser capabilities_parser{};
         auto lookup_table = capabilities_parser.get_lookup_table(m_capabilities);
         lookup_table.insert(test_openconfig_lookup.begin(), test_openconfig_lookup.end());
         root_schema = repo.create_root_schema(lookup_table, m_capabilities);
-        repo.set_server_capabilities(m_capabilities);
     }
 
-    ~MockSession()
+    virtual ~MockSession()
     {
     }
 
+
     ydk::path::RootSchemaNode& get_root_schema() const
     {
         return *root_schema;
@@ -69,14 +71,14 @@ class MockSession : public ydk::path::Session
 
     ydk::EncodingFormat get_encoding() const
     {
-        return m_encoding;
+        return ydk::EncodingFormat::XML;
     }
 
     std::shared_ptr<ydk::path::DataNode> invoke(ydk::path::Rpc& rpc) const
     {
         ydk::path::Codec s{};
 
-        std::cout << s.encode(rpc.get_input_node(), m_encoding, true) << std::endl;
+        std::cout << s.encode(rpc.get_input_node(), ydk::EncodingFormat::XML, true) << std::endl;
 
         return nullptr;
     }
@@ -85,28 +87,15 @@ class MockSession : public ydk::path::Session
     {
         ydk::path::Codec s{};
 
-        std::cout << s.encode(rpc, m_encoding, true) << std::endl;
+        std::cout << s.encode(rpc, ydk::EncodingFormat::XML, true) << std::endl;
 
         return nullptr;
     }
-
-    std::vector<std::string> get_capabilities() const
-    {
-        std::vector<std::string> caps{};
-        for (auto cap : m_capabilities)
-        {
-            std::ostringstream buffer;
-            buffer << cap;
-            caps.push_back(buffer.str());
-        }
-        return caps;
-    }
-
-  private:
+private:
     std::string m_searchdir;
     std::vector<ydk::path::Capability> m_capabilities;
     std::shared_ptr<ydk::path::RootSchemaNode> root_schema;
-    ydk::EncodingFormat m_encoding;
+
 };
 }
 
@@ -118,7 +107,7 @@ static std::vector<ydk::path::Capability> test_openconfig {
     {"openconfig-policy-types", ""},
     {"openconfig-routing-policy", ""},
     {"openconfig-types", ""},
-    {"ietf-netconf", "", {"validate", "candidate"}, {}},
+    {"ietf-netconf", ""},
     {"ietf-netconf-monitoring", ""},
     {"ietf-interfaces", ""},
     {"ydk", ""},
@@ -126,3 +115,4 @@ static std::vector<ydk::path::Capability> test_openconfig {
     {"ydktest-sanity-action", ""},
     {"ydktest-types", ""}
 };
+
diff --git a/sdk/cpp/core/tests/models/openconfig-platform-transceiver.yang b/sdk/cpp/core/tests/models/openconfig-platform-transceiver.yang
index 02e9fa869..d5bb2a7e5 100644
--- a/sdk/cpp/core/tests/models/openconfig-platform-transceiver.yang
+++ b/sdk/cpp/core/tests/models/openconfig-platform-transceiver.yang
@@ -391,6 +391,11 @@ module openconfig-platform-transceiver {
   // augment statements
 
   augment "/oc-platform:components/oc-platform:component" {
+    when "/oc-platform:components/oc-platform:component/" +
+      "oc-platform:state/oc-platform:type = 'TRANSCEIVER'" {
+      description
+        "Augment is active when component is of type TRANSCEIVER";
+    }
     description
       "Adding transceiver data to physical inventory";
 
diff --git a/sdk/cpp/core/tests/models/openconfig-terminal-device.yang b/sdk/cpp/core/tests/models/openconfig-terminal-device.yang
index d854d0e2a..eda5a9fa2 100644
--- a/sdk/cpp/core/tests/models/openconfig-terminal-device.yang
+++ b/sdk/cpp/core/tests/models/openconfig-terminal-device.yang
@@ -1073,18 +1073,18 @@ module openconfig-terminal-device {
 
   // augment statements
 
-//  augment "/oc-platform:components/oc-platform:component" {
-//    when "/oc-platform:components/oc-platform:component/" +
-//      "oc-platform:state/oc-platform:type = 'OPTICAL_CHANNEL'" {
-//      description
-//        "Augment is active when component is of type
-//        OPTICAL_CHANNEL";
-//    }
-//    description
-//      "Adding optical channel data to physical inventory";
-//
-//    uses terminal-optical-channel-top {
-//    }
-//  }
+  augment "/oc-platform:components/oc-platform:component" {
+    when "/oc-platform:components/oc-platform:component/" +
+      "oc-platform:state/oc-platform:type = 'OPTICAL_CHANNEL'" {
+      description
+        "Augment is active when component is of type
+        OPTICAL_CHANNEL";
+    }
+    description
+      "Adding optical channel data to physical inventory";
+
+    uses terminal-optical-channel-top {
+    }
+  }
 
 }
diff --git a/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang b/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang
index bf6a8d4cf..df0fbff09 100644
--- a/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang
+++ b/sdk/cpp/core/tests/models/ydktest-sanity@2015-11-17.yang
@@ -442,21 +442,11 @@ module ydktest-sanity {
         // identityref
         // instance-indentifier
         //
-
-        leaf-list bool-leaf-list {
-          type boolean;
-        }
-
-        list bool-list {
-          key "bool-leaf";
-          leaf bool-leaf {
-            type boolean;
-          }
-        }
       }
 
       container derived-t {
         description "config for one_level derived data types";
+
       }
     }
   }
@@ -894,22 +884,20 @@ module ydktest-sanity {
             enum atm;
             enum ds0;
         }
-        default ethernet;
     }
     leaf ifMTU {
-      type uint32;
-      default 1500;
+        type uint32;
     }
-    must "ifType != 'ethernet' or " +
+    must "(ifType != 'ethernet' and ifType != 'atm') or " +
          "(ifType = 'ethernet' and ifMTU = 1500)" {
-      error-message "An ethernet MTU must be 1500";
+        error-message "An ethernet MTU must be 1500";
     }
-    must "ifType != 'atm' or " +
+    must "(ifType != 'atm' and ifType != 'ethernet') or " +
          "(ifType = 'atm' and ifMTU <= 17966 and ifMTU >= 64)" {
-      error-message "An atm MTU must be  64 .. 17966";
+        error-message "An atm MTU must be  64 .. 17966";
     }
 
-    when "/conditional-interface/ifType = 'ds0'";
+    when "/conditional-interface/ifType='ds0'";
     leaf ds0ChannelNumber {
       type uint16;
     }
diff --git a/sdk/cpp/core/tests/test_codec.cpp b/sdk/cpp/core/tests/test_codec.cpp
index ea2f5da09..733d786f4 100644
--- a/sdk/cpp/core/tests/test_codec.cpp
+++ b/sdk/cpp/core/tests/test_codec.cpp
@@ -1,3 +1,7 @@
+//
+// @file types.hpp
+// @brief Header for ydk entity
+//
 // YANG Development Kit
 // Copyright 2016 Cisco Systems. All rights reserved
 //
@@ -18,11 +22,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
+//
 //////////////////////////////////////////////////////////////////
 
 #include <iostream>
@@ -41,7 +41,7 @@ TEST_CASE( "test_codec_rpc" )
 {
     ydk::path::Codec s{};
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::XML};
+    mock::MockSession sp{searchdir, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -59,7 +59,7 @@ TEST_CASE( "test_codec_action" )
 {
     ydk::path::Codec s{};
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::XML};
+    mock::MockSession sp{searchdir, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -74,7 +74,7 @@ TEST_CASE( "test_codec_action_datanode" )
 {
     ydk::path::Codec s{};
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::XML};
+    mock::MockSession sp{searchdir, test_openconfig};
 
     auto & schema = sp.get_root_schema();
 
@@ -99,7 +99,7 @@ TEST_CASE( "test_submodule_feature" )
         }
         test_capabilities.push_back(cap);
     }
-    mock::MockSession sp{searchdir, test_capabilities, EncodingFormat::XML};
+    mock::MockSession sp{searchdir, test_capabilities};
 
     auto & schema = sp.get_root_schema();
 
@@ -127,7 +127,7 @@ TEST_CASE( "test_submodule_feature" )
 TEST_CASE( "decode_multiple_json" )
 {
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::JSON};
+    mock::MockSession sp{searchdir, test_openconfig};
     auto & schema = sp.get_root_schema();
 
     std::string json_int_payload = R"({
@@ -167,7 +167,7 @@ TEST_CASE( "decode_multiple_json" )
 
 TEST_CASE("test_no_key_list_path") {
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::XML};
+    mock::MockSession sp{searchdir, test_openconfig};
     auto & schema = sp.get_root_schema();
     ydk::path::Codec codec{};
 
@@ -214,7 +214,7 @@ TEST_CASE("value_error")
 {
     ydk::path::Codec s{};
     std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::JSON};
+    mock::MockSession sp{searchdir, test_openconfig};
     auto & schema = sp.get_root_schema();
 
     CHECK_NOTHROW(s.decode(schema, value_error_json, EncodingFormat::JSON));
@@ -257,89 +257,3 @@ TEST_CASE( "decode_rpc_with_nc_prefix" )
 </interfaces>)";
     REQUIRE(reply_xml == rpc_reply_extracted);
 }
-
-TEST_CASE( "decode_rpc_with_attribute" )
-{
-    auto rpc_reply = R"(
-<rpc-reply xmlns:junos="http://xml.juniper.net/junos/15.1X49/junos" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="1">
-<data attr=123>
-<interfaces xmlns="http://openconfig.net/yang/interfaces">
-  <interface>
-    <name>GigabitEthernet0/0/0/2</name>
-    <config>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <name>GigabitEthernet0/0/0/2</name>
-    </config>
-  </interface>
-</interfaces>
-</data>
-</rpc-reply>
-)";
-    auto reply_xml = ydk::path::get_netconf_output(rpc_reply);
-    REQUIRE(!reply_xml.empty());
-
-    auto rpc_reply_extracted = R"(<interfaces xmlns="http://openconfig.net/yang/interfaces">
-  <interface>
-    <name>GigabitEthernet0/0/0/2</name>
-    <config>
-      <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:ethernetCsmacd</type>
-      <name>GigabitEthernet0/0/0/2</name>
-    </config>
-  </interface>
-</interfaces>)";
-    REQUIRE(reply_xml == rpc_reply_extracted);
-}
-
-TEST_CASE("test_url_path_value") {
-    std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::XML};
-    auto & schema = sp.get_root_schema();
-    ydk::path::Codec codec{};
-
-    auto & runner = schema.create_datanode("ydktest-sanity:runner", "");
-    runner.create_datanode("no-key-list[1]/test",
-        "sftp://root@5.12.17.1:/auto/cafy-ott/cafy_log/cafy3/22-1/cafy3-run-1213418/67/7_5_2_13I_NCS5500");
-    runner.create_datanode("no-key-list[2]/test", "tftp://10.105.227.199/ops/exec");
-
-    auto xml = codec.encode(runner, ydk::EncodingFormat::XML, true);
-    auto expected = R"(<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <no-key-list>
-    <test>sftp://root@5.12.17.1:/auto/cafy-ott/cafy_log/cafy3/22-1/cafy3-run-1213418/67/7_5_2_13I_NCS5500</test>
-  </no-key-list>
-  <no-key-list>
-    <test>tftp://10.105.227.199/ops/exec</test>
-  </no-key-list>
-</runner>
-)";
-    REQUIRE(xml== expected);
-
-    auto dn = codec.decode(schema, xml, ydk::EncodingFormat::XML);
-    REQUIRE(dn != nullptr);
-    auto real_dn = dn->get_children()[0];
-    REQUIRE(real_dn != nullptr);
-
-    auto xml_rt = codec.encode(*real_dn, ydk::EncodingFormat::XML, true);
-    REQUIRE(xml == xml_rt);
-}
-
-TEST_CASE("test_empty_string_value_json") {
-    std::string searchdir{TEST_HOME};
-    mock::MockSession sp{searchdir, test_openconfig, EncodingFormat::JSON};
-    auto & schema = sp.get_root_schema();
-    ydk::path::Codec codec{};
-
-    auto & runner = schema.create_datanode("ydktest-sanity:runner", "");
-    runner.create_datanode("ytypes/built-in-t/name", "");
-
-    auto payload = codec.encode(runner, ydk::EncodingFormat::JSON, false);
-    auto expected = R"({"ydktest-sanity:runner":{"ytypes":{"built-in-t":{"name":""}}}})";
-    CHECK(payload == expected);
-
-    auto dn = codec.decode(schema, payload, ydk::EncodingFormat::JSON);
-    REQUIRE(dn != nullptr);
-    auto real_dn = dn->get_children()[0];
-    REQUIRE(real_dn != nullptr);
-
-    auto xml_rt = codec.encode(*real_dn, ydk::EncodingFormat::JSON, false);
-    REQUIRE(payload == xml_rt);
-}
diff --git a/sdk/cpp/core/tests/test_entity.cpp b/sdk/cpp/core/tests/test_entity.cpp
index eae8dd7a3..08baf76f0 100644
--- a/sdk/cpp/core/tests/test_entity.cpp
+++ b/sdk/cpp/core/tests/test_entity.cpp
@@ -520,7 +520,6 @@ TEST_CASE("test_ylist_race")
     auto keys = ylist.keys();
     REQUIRE(vector_to_string(keys) == R"("test1")");
 
-    REQUIRE(ylist.has_key("test1"));
     auto ep = ylist["test1"];
     REQUIRE(ep != nullptr);
 
diff --git a/sdk/cpp/core/tests/test_value_list.cpp b/sdk/cpp/core/tests/test_value_list.cpp
index 2ad2a065f..2648d804a 100644
--- a/sdk/cpp/core/tests/test_value_list.cpp
+++ b/sdk/cpp/core/tests/test_value_list.cpp
@@ -1,24 +1,3 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
 
 #include "../src/types.hpp"
 #include "../src/errors.hpp"
@@ -203,29 +182,3 @@ TEST_CASE("test_value_list_deci64")
     test_value.append("1.2");
     REQUIRE(test_value[1].get()=="1.2");
 }
-
-TEST_CASE("test_value_list_duplicate")
-{
-    YLeafList test_value{YType::str, "value"};
-    test_value.append("abc");
-    test_value.append("abc");
-    test_value.append("abc");
-    auto leafs = test_value.getYLeafs();
-    CHECK(leafs.size() == 3);
-    CHECK(test_value[0].get() == test_value[2].get());
-}
-
-TEST_CASE("test_value_list_boolean")
-{
-    YLeafList test_value{YType::boolean, "value"};
-    test_value.append(true);
-    test_value.append(false);
-    auto leafs = test_value.getYLeafs();
-    CHECK(leafs.size() == 2);
-    CHECK(test_value[0].get() == "true");
-    CHECK(test_value[1].get() == "false");
-
-    auto leaf_data = test_value.get_name_leafdata();
-    CHECK(leaf_data[0].first == "value[.=\"true\"]");
-    CHECK(leaf_data[1].first == "value[.=\"false\"]");
-}
diff --git a/sdk/cpp/gnmi/CMakeLists.txt b/sdk/cpp/gnmi/CMakeLists.txt
index 3087c7453..d329a8a66 100644
--- a/sdk/cpp/gnmi/CMakeLists.txt
+++ b/sdk/cpp/gnmi/CMakeLists.txt
@@ -6,11 +6,9 @@ set(YDK_DESCRIPTION "YANG Development Kit Library. The gNMI library for YDK API.
 
 # CPack Dynamic Settings
 set (CPACK_PACKAGE_NAME "libydk_gnmi")
+set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 set (CPACK_PACKAGE_RELEASE "5")
-set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}.${CPACK_PACKAGE_RELEASE}")
-set (CPACK_LIBRARY_NAME "ydk_gnmi-${CPACK_PACKAGE_VERSION}")
-set (CPACK_LIBRARY_TARGET "lib${CPACK_LIBRARY_NAME}.a")
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "YDK gNMI service Library")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "YDK gNMI Library")
 
 # CPack Static Settings
 set (CPACK_PACKAGE_DESCRIPTION "YDK library to support gNMI services.
@@ -58,7 +56,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb
         # libydk_0.6.0-0.1.alpha_amd64.deb   // Debian
         set (CPACK_PACKAGE_FILE_NAME
-            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 
     # Linux Fedora
     elseif(${LSB_RELEASE_ID_SHORT} MATCHES "CentOS")
@@ -82,7 +80,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         # <name>-<version>-<release>.<architecture>.(src).rpm
         # libydk-0.6.0-0.1.alpha.x86_64.rpm  // RPM
         set (CPACK_PACKAGE_FILE_NAME
-            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+            "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
     endif()
 endif()
 
@@ -201,31 +199,21 @@ include_directories(
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-add_library(${CPACK_LIBRARY_NAME} STATIC ${libydk_gnmi_src} ${pb_grpc_sources})
+add_library(ydk_gnmi STATIC ${libydk_gnmi_src} ${pb_grpc_sources})
 
-target_link_libraries(
-    ${CPACK_LIBRARY_NAME}
+target_link_libraries(ydk_gnmi
+#    ydk
     ${GRPC_GRPC++_LIBRARY}
     ${PROTOBUF_LIBRARY}
 )
 
-set_property(TARGET ${CPACK_LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
-set_property(TARGET ${CPACK_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+set_property(TARGET ydk_gnmi PROPERTY CXX_STANDARD 11)
+set_property(TARGET ydk_gnmi PROPERTY CXX_STANDARD_REQUIRED ON)
 
-install(TARGETS ${CPACK_LIBRARY_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS ydk_gnmi DESTINATION ${LIB_INSTALL_DIR})
 install(FILES ${libydk_gnmi_install_headers} DESTINATION ${INCLUDE_INSTALL_DIR})
 install(FILES ${pb_grpc_headers} DESTINATION ${INCLUDE_INSTALL_DIR})
 
-SET( legacy_link   ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libydk_gnmi.a)
-SET( legacy_target ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${CPACK_LIBRARY_TARGET})
-ADD_CUSTOM_COMMAND( TARGET ${CPACK_LIBRARY_NAME}
-                    COMMAND echo "Creating symbolic link ${legacy_link}"
-                    COMMAND rm -f ${legacy_link}
-                    COMMAND ln -s ${CPACK_LIBRARY_TARGET} ${legacy_link}
-                    DEPENDS install ${CPACK_LIBRARY_NAME}
-                  )
-ADD_CUSTOM_TARGET( install_legacy DEPENDS ${legacy_target} )
-
 # generate doxygen documentation for ydk_gnmi API
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
diff --git a/sdk/cpp/gnmi/tests/test_core_gnmi.cpp b/sdk/cpp/gnmi/tests/test_core_gnmi.cpp
index 471ca1729..b95413eda 100644
--- a/sdk/cpp/gnmi/tests/test_core_gnmi.cpp
+++ b/sdk/cpp/gnmi/tests/test_core_gnmi.cpp
@@ -191,7 +191,7 @@ elem {
 TEST_CASE( "test_gnmi_datanode_to_path" )
 {
     ydk::path::Repository repo{TEST_HOME};
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::JSON};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
     auto & schema = sp.get_root_schema();
 
     auto & bgp = schema.create_datanode("openconfig-bgp:bgp");
@@ -232,7 +232,7 @@ elem {
 TEST_CASE( "test_gnmi_datanode_to_path_2" )
 {
     ydk::path::Repository repo{TEST_HOME};
-    mock::MockSession sp{TEST_HOME, test_openconfig, ydk::EncodingFormat::JSON};
+    mock::MockSession sp{TEST_HOME, test_openconfig};
     auto & schema = sp.get_root_schema();
 
     auto & runner = schema.create_datanode("ydktest-sanity:runner");
diff --git a/sdk/cpp/packages/CMakeLists.txt b/sdk/cpp/packages/CMakeLists.txt
index e9b9fc6f6..538d59320 100644
--- a/sdk/cpp/packages/CMakeLists.txt
+++ b/sdk/cpp/packages/CMakeLists.txt
@@ -7,7 +7,6 @@ set (CPACK_PACKAGE_NAME "libydk-@BRIEF_NAME_WITH_DASHES@")
 set (CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
 set (CPACK_PACKAGE_RELEASE "@BUILD_NUMBER@")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "YDK Bundle Library")
-set (BUNDLE_NAME "@BRIEF_NAME@")
 # set (CPACK_PACKAGE_DESCRIPTION_SUMMARY ${YDK_DESCRIPTION})
 
 # CPack Static Settings
diff --git a/sdk/cpp/packages/bundle_info.hpp.in b/sdk/cpp/packages/bundle_info.hpp.in
index 8b7011f78..e72c4240d 100644
--- a/sdk/cpp/packages/bundle_info.hpp.in
+++ b/sdk/cpp/packages/bundle_info.hpp.in
@@ -1,5 +1,5 @@
 /// YANG Development Kit
-// Copyright 2016-2019 Cisco Systems. All rights reserved
+// Copyright 2016 Cisco Systems. All rights reserved
 //
 ////////////////////////////////////////////////////////////////
 // Licensed to the Apache Software Foundation (ASF) under one
@@ -18,11 +18,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-// -------------------------------------------------------------------
-// This file has been modified by Yan Gorelik, YDK Solutions.
-// All modifications in original under CiscoDevNet domain
-// introduced since October 2019 are copyrighted.
-// All rights reserved under Apache License, Version 2.0.
+//
 //////////////////////////////////////////////////////////////////
 
 #ifndef _BUNDLE_INFO_HPP_
@@ -32,7 +28,6 @@
 namespace ydk
 {
 #define @PROJECT_NAME@_models_path "@CMAKE_INSTALL_PREFIX@/@YANG_INSTALL_DIR@"
-#define @PROJECT_NAME@_bundle_name "@BUNDLE_NAME@"
 }
 
 #endif /* _BUNDLE_INFO_HPP_ */
diff --git a/sdk/cpp/samples/CMakeLists.txt b/sdk/cpp/samples/CMakeLists.txt
index f3dbffb6f..ae0ec8e2d 100644
--- a/sdk/cpp/samples/CMakeLists.txt
+++ b/sdk/cpp/samples/CMakeLists.txt
@@ -10,16 +10,16 @@ set(samples     bgp_create
                 bgp_update 
                 bgp_read
                 bgp_delete
-                bgp_xr_create
-                bgp_xr_delete
-                bgp_xr_read
                 bgp_routing_policy_create
                 isis_xr_create
                 isis_xr_delete
                 isis_xr_read
-#                 bgp_xr_opendaylight
-#                 bgp_restconf
-#                 xe_native_read # uncomment this line if you want to build this XE native sample which takes a while
+                bgp_xr_create
+                bgp_xr_delete
+                bgp_xr_read
+                bgp_xr_opendaylight
+                bgp_restconf
+                xe_native_read # uncomment this line if you want to build this XE native sample which takes a while
                 )
 
 # set default build type if not specified by user
@@ -31,7 +31,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 # Find dependent libraries
 find_library(ydk_openconfig_location ydk_openconfig)
 find_library(ydk_cisco_ios_xr_location ydk_cisco_ios_xr)
-# find_library(ydk_cisco_ios_xe_location ydk_cisco_ios_xe)
+find_library(ydk_cisco_ios_xe_location ydk_cisco_ios_xe)
 find_library(ydk_location ydk)
 find_library(xml2_location xml2)
 find_library(curl_location curl)
@@ -56,7 +56,7 @@ foreach(sample IN LISTS samples)
             ${ydk_location} 
             ${ydk_openconfig_location}
             ${ydk_cisco_ios_xr_location}
-#             ${ydk_cisco_ios_xe_location}
+            ${ydk_cisco_ios_xe_location}
             ${xml2_location}
             ${curl_location}
             ${ssh_location}
diff --git a/sdk/cpp/samples/README.md b/sdk/cpp/samples/README.md
index 29d0ea31c..245702a9b 100644
--- a/sdk/cpp/samples/README.md
+++ b/sdk/cpp/samples/README.md
@@ -1,305 +1,21 @@
 # YDK C++ Samples
 
-## Building Sample Apps
+### Prerequisite
+First install the [system requirements](https://github.com/CiscoDevNet/ydk-cpp#system-requirements). Then follow the [ydk-cpp README](https://github.com/CiscoDevNet/ydk-cpp) and install the C++ [core](https://github.com/CiscoDevNet/ydk-cpp/blob/master/core), [ietf bundle](https://github.com/CiscoDevNet/ydk-cpp/blob/master/ietf), [openconfig bundle](https://github.com/CiscoDevNet/ydk-cpp/blob/master/openconfig) and [cisco-ios-xr bundle](https://github.com/CiscoDevNet/ydk-cpp/blob/master/ciscp-ios-xr).
 
-### 1. Build YDK C++ Core
-
-Install C++ core library and needed dependencies by following [Core installation](https://github.com/CiscoDevNet/ydk-gen#core-installation).
-
-### 2. Build Model Bundles
-
-For sample applications you need build and install the _openconfig_ and _cisco_ios_xr_ bundles.
-You can use existing profiles to build complete model API or use
-[addhock](https://github.com/CiscoDevNet/ydk-gen#generating-an-adhoc-ydk-py-bundle) method to generate bundles with
-limited number of YANG modules that are required to run sample applications. Here are examples that can be used
-after initializing Python virtual environment:
-
-**Openconfig bundle**
+### 1) Build the sample apps
 ```
-export REPO="/Users/ygorelik/yang-models/yang/vendor/cisco/xr/751"
-cd ~/ydk-gen
-python generate.py -is --cpp --adhoc-bundle-name openconfig --adhoc-bundle \
-$REPO/openconfig-bgp.yang \
-$REPO/openconfig-bgp-types.yang \
-$REPO/openconfig-extensions.yang \
-$REPO/openconfig-bgp-common.yang \
-$REPO/openconfig-bgp-common-multiprotocol.yang \
-$REPO/openconfig-bgp-common-structure.yang \
-$REPO/openconfig-bgp-peer-group.yang \
-$REPO/openconfig-bgp-neighbor.yang \
-$REPO/openconfig-bgp-global.yang \
-$REPO/openconfig-types.yang \
-$REPO/openconfig-inet-types.yang \
-$REPO/openconfig-routing-policy.yang \
-$REPO/openconfig-yang-types.yang \
-$REPO/openconfig-interfaces.yang \
-$REPO/openconfig-policy-types.yang
+$ mkdir build && cd build
+$ cmake -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ ..
+$ make && sudo make install
+$ cd ..
 ```
 
-**Cisco_ios_xr bundle**
-```
-export REPO="/Users/ygorelik/yang-models/yang/vendor/cisco/xr/751"
-cd ~/ydk-gen
-python generate.py -is --cpp --adhoc-bundle-name cisco_ios_xr --adhoc-bundle \
-$REPO/Cisco-IOS-XR-ipv4-bgp-cfg.yang \
-$REPO/Cisco-IOS-XR-types.yang \
-$REPO/Cisco-IOS-XR-ipv4-bgp-datatypes.yang \
-$REPO/cisco-semver.yang \
-$REPO/Cisco-IOS-XR-infra-rsi-cfg.yang \
-$REPO/Cisco-IOS-XR-snmp-agent-cfg.yang \
-$REPO/Cisco-IOS-XR-ifmgr-cfg.yang \
-$REPO/Cisco-IOS-XR-clns-isis-datatypes.yang \
-$REPO/Cisco-IOS-XR-clns-isis-cfg.yang
-```
+### 2) Run the apps
 
-### 3. Build the Sample Apps
-
-From ydk-gen directory execute these commands:
-```
-cd sdk/cpp/samples
-mkdir -p build && cd build
-cmake ..
-make
-```
-
-That will build the following apps:
-```
-(venv3.7) YGORELIK-M-C3GG:build ygorelik$ ls -l bgp_*
--rwxr-xr-x  1 ygorelik  staff  16552816 Jan  5 16:23 bgp_create
--rwxr-xr-x  1 ygorelik  staff  16403152 Jan  5 16:23 bgp_delete
--rwxr-xr-x  1 ygorelik  staff  16425752 Jan  5 16:23 bgp_read
--rwxr-xr-x  1 ygorelik  staff  17038472 Jan  5 16:24 bgp_routing_policy_create
--rwxr-xr-x  1 ygorelik  staff  16404152 Jan  5 16:23 bgp_update
--rwxr-xr-x  1 ygorelik  staff  19793312 Jan  5 16:24 bgp_xr_create
--rwxr-xr-x  1 ygorelik  staff  19544792 Jan  5 16:24 bgp_xr_delete
--rwxr-xr-x  1 ygorelik  staff  19549288 Jan  5 16:24 bgp_xr_read
--rwxr-xr-x  1 ygorelik  staff  17403440 Jan  5 16:49 isis_xr_create
--rwxr-xr-x  1 ygorelik  staff  17152904 Jan  5 16:27 isis_xr_delete
--rwxr-xr-x  1 ygorelik  staff  17172552 Jan  5 16:27 isis_xr_read
+Note: `-v` will turn on verbose mode
 ```
-
-## Running Sample Apps
-
-To run sample apps you need to have live or simulated router with enabled Netconf server. For test purposes it is
-recommended to use _confd_ app, which was installed during core installation. The _confd_ can be initialized,
-start and stop using test scripts:
-```
-cd ~ydk-gen
-./test/init_test_env.sh   # this will initializa and start confd router simulator
-./test/clean_test_env.sh  # this will stop the confd and clean test environment
-```
-
-Run any of the apps without parameters to see the usage info:
-```
-build ygorelik$ ./bgp_delete
-
-Usage:
-	./bgp_delete [http|ssh]://user:password@host[:port] [-v]
-		If host is IPv6, enclose it in square brackets. E.g. [1234:1234:1234:1234::1234]
-		If port is not specified, 830 will be used with ssh (netconf) or 80 with http (restconf)
-```
-
-All the apps have one required parameter, which specifies credentials for the router. The optional parameter `-v`
-will turn on verbose mode, in which you will be able to see all sent and received RPCs.
-
-Below are shown examples of output (partial) when running some of the samples on _confd_ router simulator.
-
-**Create BGP configuration**
-```
-build ygorelik$ ./bgp_create ssh://admin:admin@127.0.0.1:12022 -v
-...
-[2023-01-04 10:19:59.693] [ydk] [info] Path where models are to be downloaded: /Users/ygorelik/.ydk/127.0.0.1
-[2023-01-04 10:19:59.705] [ydk] [info] Connected to 127.0.0.1 on port 12022 using ssh with timeout of -1
-[2023-01-04 10:19:59.706] [ydk] [info] Executing CRUD create operation on [openconfig-bgp:bgp]
-[2023-01-04 10:19:59.706] [ydk] [info] Executing 'edit-config' RPC on [openconfig-bgp:bgp]
-[2023-01-04 10:19:59.735] [ydk] [info] ============= Sending RPC to device =============
-<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-  <target>
-    <candidate/>
-  </target>
-  <config><bgp xmlns="http://openconfig.net/yang/bgp" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="merge">
-  <global>
-    <afi-safis>
-      <afi-safi>
-        <afi-safi-name xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name>
-        <config>
-          <afi-safi-name xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name>
-          <enabled>false</enabled>
-        </config>
-      </afi-safi>
-    </afi-safis>
-    <config>
-      <as>65172</as>
-      <router-id>1.2.3.4</router-id>
-    </config>
-  </global>
-  <neighbors>
-    <neighbor>
-      <neighbor-address>6.7.8.9</neighbor-address>
-      <config>
-        <peer-group>IBGP</peer-group>
-        <neighbor-address>6.7.8.9</neighbor-address>
-        <peer-as>65001</peer-as>
-        <local-as>65001</local-as>
-      </config>
-    </neighbor>
-  </neighbors>
-  <peer-groups>
-    <peer-group>
-      <peer-group-name>IBGP</peer-group-name>
-      <config>
-        <peer-group-name>IBGP</peer-group-name>
-        <peer-as>65001</peer-as>
-        <local-as>65001</local-as>
-        <description>test description</description>
-      </config>
-    </peer-group>
-  </peer-groups>
-</bgp>
-</config>
-</edit-config>
-</rpc>
-[2023-01-04 10:19:59.744] [ydk] [info] ============= Received RPC from device =============
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="2">
-  <ok/>
-</rpc-reply>
-
-[2023-01-04 10:19:59.745] [ydk] [info] Executing 'commit' RPC
-[2023-01-04 10:19:59.745] [ydk] [info] ============= Sending RPC to device =============
-<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><commit xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"/>
-</rpc>
-[2023-01-04 10:19:59.768] [ydk] [info] ============= Received RPC from device =============
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="3">
-  <ok/>
-</rpc-reply>
-
-[2023-01-04 10:19:59.768] [ydk] [info] Operation succeeded
-Create yfilter success
-
-[2023-01-04 10:19:59.769] [ydk] [info] Disconnected from device
-```
-
-**Read BGP configuration**
-```
-build ygorelik$ ./bgp_read ssh://admin:admin@127.0.0.1:12022 -v
-...
-[2023-01-04 10:21:13.682] [ydk] [info] Path where models are to be downloaded: /Users/ygorelik/.ydk/127.0.0.1
-[2023-01-04 10:21:13.692] [ydk] [info] Connected to 127.0.0.1 on port 12022 using ssh with timeout of -1
-[2023-01-04 10:21:13.692] [ydk] [info] Executing CRUD read_config operation on [openconfig-bgp:bgp]
-[2023-01-04 10:21:13.692] [ydk] [info] Executing 'get' RPC on [openconfig-bgp:bgp] from running
-[2023-01-04 10:21:13.715] [ydk] [info] ============= Sending RPC to device =============
-<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-  <source>
-    <running/>
-  </source>
-  <filter><bgp xmlns="http://openconfig.net/yang/bgp"/></filter>
-</get-config>
-</rpc>
-[2023-01-04 10:21:13.720] [ydk] [info] ============= Received RPC from device =============
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="2">
-  <data>
-    <bgp xmlns="http://openconfig.net/yang/bgp">
-      <global>
-        <config>
-          <as>65172</as>
-          <router-id>1.2.3.4</router-id>
-        </config>
-        <afi-safis>
-          <afi-safi>
-            <afi-safi-name xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name>
-            <config>
-              <afi-safi-name xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types">oc-bgp-types:L3VPN_IPV4_UNICAST</afi-safi-name>
-              <enabled>false</enabled>
-            </config>
-          </afi-safi>
-        </afi-safis>
-      </global>
-      <neighbors>
-        <neighbor>
-          <neighbor-address>6.7.8.9</neighbor-address>
-          <config>
-            <peer-group>IBGP</peer-group>
-            <neighbor-address>6.7.8.9</neighbor-address>
-            <peer-as>65001</peer-as>
-            <local-as>65001</local-as>
-          </config>
-        </neighbor>
-      </neighbors>
-      <peer-groups>
-        <peer-group>
-          <peer-group-name>IBGP</peer-group-name>
-          <config>
-            <peer-group-name>IBGP</peer-group-name>
-            <peer-as>65001</peer-as>
-            <local-as>65001</local-as>
-            <description>test description</description>
-          </config>
-        </peer-group>
-      </peer-groups>
-    </bgp>
-  </data>
-</rpc-reply>
-
-==================================================
-BGP configuration: 
-
-AS: 65172
-Router ID: 1.2.3.4
-
-Neighbor address: 6.7.8.9
-Neighbor local AS: 65001
-Neighbor peer group: IBGP
-Neighbor peer type: 
-
-AFI-SAFI name: openconfig-bgp-types:L3VPN_IPV4_UNICAST
-AFI-SAFI config name: openconfig-bgp-types:L3VPN_IPV4_UNICAST
-AFI-SAFI enabled: false
-
-Peer group name: IBGP
-Peer group type: 
-
-==================================================
-
-[2023-01-04 10:21:13.721] [ydk] [info] Disconnected from device
-```
-
-**Delete BGP configuration**
-```
-build ygorelik$ ./bgp_delete ssh://admin:admin@127.0.0.1:12022 -v
-...
-[2023-01-04 10:14:43.478] [ydk] [info] Path where models are to be downloaded: /Users/ygorelik/.ydk/127.0.0.1
-[2023-01-04 10:14:43.488] [ydk] [info] Connected to 127.0.0.1 on port 12022 using ssh with timeout of -1
-[2023-01-04 10:14:43.488] [ydk] [info] Executing CRUD delete operation on [openconfig-bgp:bgp]
-[2023-01-04 10:14:43.488] [ydk] [info] Executing 'edit-config' RPC on [openconfig-bgp:bgp]
-[2023-01-04 10:14:43.511] [ydk] [info] ============= Sending RPC to device =============
-<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><edit-config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-  <target>
-    <candidate/>
-  </target>
-  <config><bgp xmlns="http://openconfig.net/yang/bgp" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="delete"/>
-</config>
-</edit-config>
-</rpc>
-[2023-01-04 10:14:43.515] [ydk] [info] ============= Received RPC from device =============
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="2">
-  <ok/>
-</rpc-reply>
-
-[2023-01-04 10:14:43.515] [ydk] [info] Executing 'commit' RPC
-[2023-01-04 10:14:43.515] [ydk] [info] ============= Sending RPC to device =============
-<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><commit xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"/>
-</rpc>
-[2023-01-04 10:14:43.527] [ydk] [info] ============= Received RPC from device =============
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="3">
-  <ok/>
-</rpc-reply>
-
-[2023-01-04 10:14:43.527] [ydk] [info] Operation succeeded
-Delete yfilter success
-[2023-01-04 10:14:43.527] [ydk] [info] Disconnected from device
+$ cd build
+$ ./bgp_xr_write ssh://<username>:<password>@<host address>:<port> [-v]
+$ ./bgp_xr_read ssh://<username>:<password>@<host address>:<port> [-v]
 ```
diff --git a/sdk/cpp/samples/bgp_create.cpp b/sdk/cpp/samples/bgp_create.cpp
index 118bf457c..e9fe60802 100644
--- a/sdk/cpp/samples/bgp_create.cpp
+++ b/sdk/cpp/samples/bgp_create.cpp
@@ -34,13 +34,15 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     bgp->global->config->as = 65172;
     bgp->global->config->router_id = "1.2.3.4";
 
-    auto afi_safi = make_shared<openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi>();
-    afi_safi->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
-    afi_safi->config->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
-    afi_safi->config->enabled = false;
-    bgp->global->afi_safis->afi_safi.append(afi_safi);
-
-    auto neighbor = make_shared<openconfig_bgp::Bgp::Neighbors::Neighbor>();
+    //Commented because of XR 611 issue with OC identity
+//  auto afi_safi = make_unique<openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi>();
+//  afi_safi->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
+//  afi_safi->config->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
+//  afi_safi->config->enabled = false;
+//  afi_safi->parent = bgp->global->afi_safis.get();
+//  bgp->global->afi_safis->afi_safi.push_back(move(afi_safi));
+
+    auto neighbor = make_unique<openconfig_bgp::Bgp::Neighbors::Neighbor>();
     neighbor->neighbor_address = "6.7.8.9";
     neighbor->config->neighbor_address = "6.7.8.9";
     neighbor->config->peer_as = 65001;
@@ -48,9 +50,10 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     neighbor->config->peer_group = "IBGP";
     //neighbor->config->peer_type = "INTERNAL";
     //neighbor->config->remove_private_as = openconfig_bgp_types::PRIVATEASREMOVEALL();
-    bgp->neighbors->neighbor.append(neighbor);
+    neighbor->parent = bgp->neighbors.get();
+    bgp->neighbors->neighbor.push_back(move(neighbor));
 
-    auto peer_group = make_shared<openconfig_bgp::Bgp::PeerGroups::PeerGroup>();
+    auto peer_group = make_unique<openconfig_bgp::Bgp::PeerGroups::PeerGroup>();
     peer_group->peer_group_name = "IBGP";
     peer_group->config->peer_group_name = "IBGP";
     //peer_group->config->auth_password = "password";
@@ -59,7 +62,8 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     peer_group->config->local_as = 65001;
     //peer_group->config->peer_type = "INTERNAL";
     //peer_group->config->remove_private_as = openconfig_bgp_types::PRIVATEASREMOVEALL();
-    bgp->peer_groups->peer_group.append(peer_group);
+    peer_group->parent = bgp->peer_groups.get();
+    bgp->peer_groups->peer_group.push_back(move(peer_group));
 }
 
 int main(int argc, char* argv[])
@@ -76,20 +80,20 @@ int main(int argc, char* argv[])
         logger->set_level(spdlog::level::info);
     }
 
-    try {
-        NetconfServiceProvider provider{host, username, password, port};
+    try
+    {
+        path::Repository repo{};
+        NetconfServiceProvider provider{repo, host, username, password, port};
         CrudService crud{};
 
         auto bgp = make_unique<openconfig_bgp::Bgp>();
         config_bgp(bgp.get());
         bool reply = crud.create(provider, *bgp);
 
-        if (reply)
-            cout << "Create yfilter success" << endl << endl;
-        else
-            cout << "Operation failed" << endl << endl;
+        if(reply) cout << "Create yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
     }
-    catch(YError & e) {
+    catch(YError & e)
+    {
         cerr << "Error details: "<<e<<endl;
     }
 
diff --git a/sdk/cpp/samples/bgp_delete.cpp b/sdk/cpp/samples/bgp_delete.cpp
index c6b4af77d..8d82800f3 100644
--- a/sdk/cpp/samples/bgp_delete.cpp
+++ b/sdk/cpp/samples/bgp_delete.cpp
@@ -50,10 +50,7 @@ int main(int argc, char* argv[])
     try
     {
         bool reply = crud.delete_(provider, *bgp);
-        if (reply)
-            cout << "Delete yfilter success" << endl;
-        else
-            cout << "Operation failed" << endl;
+        if(reply) cout << "Delete yfilter success" << endl; else cout << "Operation failed" << endl;
     }
     catch(YError & e)
     {
diff --git a/sdk/cpp/samples/bgp_read.cpp b/sdk/cpp/samples/bgp_read.cpp
index e68ef2069..d90e60960 100644
--- a/sdk/cpp/samples/bgp_read.cpp
+++ b/sdk/cpp/samples/bgp_read.cpp
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
 
     auto bgp_filter = make_unique<openconfig_bgp::Bgp>();
     auto bgp_read = crud.read_config(provider, *bgp_filter);
-    if (bgp_read == nullptr)
+    if(bgp_read == nullptr)
     {
         cout << "=================================================="<<endl;
         cout << "No entries found"<<endl<<endl;
@@ -60,38 +60,31 @@ int main(int argc, char* argv[])
     cout << "AS: " << bgp_read_ptr->global->config->as << endl;
     cout << "Router ID: " << bgp_read_ptr->global->config->router_id << endl<<endl;
 
-	auto neighbor_keys = bgp_read_ptr->neighbors->neighbor.keys();
-	for (auto nkey : neighbor_keys)
+    for(size_t index=0; index < bgp_read_ptr->neighbors->neighbor.size(); index++)
     {
-        auto entity = bgp_read_ptr->neighbors->neighbor[nkey];
-        auto neighbor = dynamic_cast<openconfig_bgp::Bgp::Neighbors::Neighbor*>(entity.get());
+        openconfig_bgp::Bgp::Neighbors::Neighbor & neighbor = *(bgp_read_ptr->neighbors->neighbor[index]);
 
-        cout << "Neighbor address: " << neighbor->neighbor_address <<endl;
-        cout << "Neighbor local AS: " <<  neighbor->config->local_as << endl;
-        cout << "Neighbor peer group: " <<  neighbor->config->peer_group << endl;
-        cout << "Neighbor peer type: " <<  neighbor->config->peer_type << endl << endl;
+        cout << "Neighbor address: " << neighbor.neighbor_address <<endl;
+        cout << "Neighbor local AS: " <<  neighbor.config->local_as << endl;
+        cout << "Neighbor peer group: " <<  neighbor.config->peer_group << endl;
+        cout << "Neighbor peer type: " <<  neighbor.config->peer_type << endl<<endl;
     }
 
-	auto afi_safi_keys = bgp_read_ptr->global->afi_safis->afi_safi.keys();
-	for (auto afi_safi_key : afi_safi_keys)
+    for(size_t index=0; index < bgp_read_ptr->global->afi_safis->afi_safi.size(); index++)
     {
-        auto entity = bgp_read_ptr->global->afi_safis->afi_safi[afi_safi_key];
-        auto afi_safi = dynamic_cast<openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi*>(entity.get());
+        openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi & afi_safi = *(bgp_read_ptr->global->afi_safis->afi_safi[index]);
 
-        cout << "AFI-SAFI name: " << afi_safi->afi_safi_name <<endl;
-        cout << "AFI-SAFI config name: " <<  afi_safi->config->afi_safi_name << endl;
-        cout << "AFI-SAFI enabled: " <<  afi_safi->config->enabled << endl << endl;
+        cout << "AFI-SAFI name: " << afi_safi.afi_safi_name <<endl;
+        cout << "AFI-SAFI config name: " <<  afi_safi.config->afi_safi_name <<endl;
+        cout << "AFI-SAFI enabled: " <<  afi_safi.config->enabled <<endl<<endl;
     }
 
-	auto peer_keys = bgp_read_ptr->peer_groups->peer_group.keys();
-	for (auto peer_key : peer_keys)
+    for(size_t index=0; index < bgp_read_ptr->peer_groups->peer_group.size(); index++)
     {
-        auto entity = bgp_read_ptr->peer_groups->peer_group[peer_key];
-        auto peer_group = dynamic_cast<openconfig_bgp::Bgp::PeerGroups::PeerGroup*>(entity.get());
+        openconfig_bgp::Bgp::PeerGroups::PeerGroup & peer_group = *(bgp_read_ptr->peer_groups->peer_group[index]);
 
-        cout << "Peer group name: " << peer_group->peer_group_name << endl;
-        cout << "Peer group type: " << peer_group->config->peer_type << endl << endl;
+        cout << "Peer group name: " << peer_group.peer_group_name << endl;
+        cout << "Peer group type: " << peer_group.config->peer_type << endl<<endl;
     }
 
-    cout << "==================================================" << endl << endl;
-}
+    cout << "=================================================="<<endl<<endl;}
diff --git a/sdk/cpp/samples/bgp_restconf.cpp b/sdk/cpp/samples/bgp_restconf.cpp
index a63a6550e..f510aaffb 100644
--- a/sdk/cpp/samples/bgp_restconf.cpp
+++ b/sdk/cpp/samples/bgp_restconf.cpp
@@ -41,13 +41,15 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     bgp->global->config->as = 65172;
     bgp->global->config->router_id = "1.2.3.4";
 
-    auto afi_safi = make_shared<openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi>();
-    afi_safi->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
-    afi_safi->config->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
-    afi_safi->config->enabled = false;
-    bgp->global->afi_safis->afi_safi.append(afi_safi);
-
-    auto neighbor = make_shared<openconfig_bgp::Bgp::Neighbors::Neighbor>();
+    //Commented because of XR 611 issue with OC identity
+//  auto afi_safi = make_unique<openconfig_bgp::Bgp::Global::AfiSafis::AfiSafi>();
+//  afi_safi->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
+//  afi_safi->config->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
+//  afi_safi->config->enabled = false;
+//  afi_safi->parent = bgp->global->afi_safis.get();
+//  bgp->global->afi_safis->afi_safi.push_back(move(afi_safi));
+
+    auto neighbor = make_unique<openconfig_bgp::Bgp::Neighbors::Neighbor>();
     neighbor->neighbor_address = "6.7.8.9";
     neighbor->config->neighbor_address = "6.7.8.9";
     neighbor->config->peer_as = 65001;
@@ -55,9 +57,10 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     neighbor->config->peer_group = "IBGP";
     //neighbor->config->peer_type = "INTERNAL";
     //neighbor->config->remove_private_as = openconfig_bgp_types::PRIVATEASREMOVEALL();
-    bgp->neighbors->neighbor.append(neighbor);
+    neighbor->parent = bgp->neighbors.get();
+    bgp->neighbors->neighbor.push_back(move(neighbor));
 
-    auto peer_group = make_shared<openconfig_bgp::Bgp::PeerGroups::PeerGroup>();
+    auto peer_group = make_unique<openconfig_bgp::Bgp::PeerGroups::PeerGroup>();
     peer_group->peer_group_name = "IBGP";
     peer_group->config->peer_group_name = "IBGP";
     //peer_group->config->auth_password = "password";
@@ -66,7 +69,8 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     peer_group->config->local_as = 65001;
     //peer_group->config->peer_type = "INTERNAL";
     //peer_group->config->remove_private_as = openconfig_bgp_types::PRIVATEASREMOVEALL();
-    bgp->peer_groups->peer_group.append(peer_group);
+    peer_group->parent = bgp->peer_groups.get();
+    bgp->peer_groups->peer_group.push_back(move(peer_group));
 }
 
 int main(int argc, char* argv[])
@@ -89,7 +93,7 @@ int main(int argc, char* argv[])
         RestconfServiceProvider provider{repo, "localhost", "admin", "admin", 12306, EncodingFormat::JSON};
         CrudService crud{};
 
-        auto bgp = make_shared<openconfig_bgp::Bgp>();
+        auto bgp = make_unique<openconfig_bgp::Bgp>();
         config_bgp(bgp.get());
         bool reply = crud.create(provider, *bgp);
 
diff --git a/sdk/cpp/samples/bgp_routing_policy_create.cpp b/sdk/cpp/samples/bgp_routing_policy_create.cpp
index e7ce38512..bd2ab9abe 100644
--- a/sdk/cpp/samples/bgp_routing_policy_create.cpp
+++ b/sdk/cpp/samples/bgp_routing_policy_create.cpp
@@ -30,6 +30,150 @@ using namespace ydk;
 using namespace std;
 using namespace openconfig;
 
+static std::shared_ptr<Entity> s()
+{/*
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::AsPathLength>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchPrefixSet>();
+    auto routingpolicy_policydefinitions_policydefinition = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
+    auto routingpolicy = std::make_shared<openconfig_routing_policy::RoutingPolicy>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::CommunityCount>();
+    auto routingpolicy_policydefinitions_policydefinition_statements_statement = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchTagSet>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchAsPathSet>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchCommunitySet>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchNeighborSet>();
+//    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchExtCommunitySet>();
+    routingpolicy_policydefinitions_policydefinition->parent = routingpolicy->policy_definitions.get();
+    routingpolicy->policy_definitions->policy_definition.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition));
+    routingpolicy->policy_definitions->policy_definition[0]->name = R"(7)";
+    routingpolicy_policydefinitions_policydefinition_statements_statement->parent = routingpolicy->policy_definitions->policy_definition[0]->statements.get();
+    routingpolicy->policy_definitions->policy_definition[0]->statements->statement.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition_statements_statement));
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->as_path_length = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount);
+    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count->config->operator_ = openconfig_policy_types::ATTRIBUTEGE();
+    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count->config->value_ = 19;
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_as_path_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_ext_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_neighbor_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_prefix_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset);
+//    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_tag_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset);
+    routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->name = R"(6)";
+    return move(routingpolicy);*/
+    
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setaspathprepend = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetAsPathPrepend>();
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setcommunity = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetCommunity>();
+  /*      auto routingpolicy_policydefinitions_policydefinition = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
+        auto routingpolicy = std::make_shared<openconfig_routing_policy::RoutingPolicy>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement>();
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setextcommunity = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetExtCommunity>();
+        auto routingpolicy_definedsets_bgpdefinedsets_communitysets_communityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::DefinedSets::BgpDefinedSets::CommunitySets::CommunitySet>();
+        routingpolicy_definedsets_bgpdefinedsets_communitysets_communityset->parent = routingpolicy->defined_sets->bgp_defined_sets->community_sets.get();
+        routingpolicy->defined_sets->bgp_defined_sets->community_sets->community_set.emplace_back(std::move(routingpolicy_definedsets_bgpdefinedsets_communitysets_communityset));
+        routingpolicy->defined_sets->bgp_defined_sets->community_sets->community_set[0]->community_set_name = R"(p)";
+        routingpolicy_policydefinitions_policydefinition->parent = routingpolicy->policy_definitions.get();
+        routingpolicy->policy_definitions->policy_definition.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition));
+        routingpolicy->policy_definitions->policy_definition[0]->name = R"(z)";
+        routingpolicy_policydefinitions_policydefinition_statements_statement->parent = routingpolicy->policy_definitions->policy_definition[0]->statements.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition_statements_statement));
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_as_path_prepend = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setaspathprepend);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_community = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setcommunity);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_community->config->options = openconfig_bgp_policy::BgpSetCommunityOptionType::REMOVE;
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_ext_community = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setextcommunity);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->name = R"(5)";
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setcommunity_communities = 4;
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_community->reference->config->community_set_ref = routingpolicy->defined_sets->bgp_defined_sets->community_sets->community_set[0]->community_set_name.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_community->inline_->config->communities.append("4:5");
+        return routingpolicy;*/
+      /*
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setaspathprepend = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetAsPathPrepend>();
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setcommunity = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetCommunity>();
+        auto routingpolicy_policydefinitions_policydefinition = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
+        auto routingpolicy = std::make_shared<openconfig_routing_policy::RoutingPolicy>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement>();
+//        auto routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setextcommunity = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Actions::BgpActions::SetExtCommunity>();
+        auto routingpolicy_definedsets_bgpdefinedsets_extcommunitysets_extcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::DefinedSets::BgpDefinedSets::ExtCommunitySets::ExtCommunitySet>();
+        routingpolicy_definedsets_bgpdefinedsets_extcommunitysets_extcommunityset->parent = routingpolicy->defined_sets->bgp_defined_sets->ext_community_sets.get();
+        routingpolicy->defined_sets->bgp_defined_sets->ext_community_sets->ext_community_set.emplace_back(std::move(routingpolicy_definedsets_bgpdefinedsets_extcommunitysets_extcommunityset));
+        routingpolicy->defined_sets->bgp_defined_sets->ext_community_sets->ext_community_set[0]->ext_community_set_name = R"(9)";
+        routingpolicy_policydefinitions_policydefinition->parent = routingpolicy->policy_definitions.get();
+        routingpolicy->policy_definitions->policy_definition.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition));
+        routingpolicy->policy_definitions->policy_definition[0]->name = R"(s)";
+        routingpolicy_policydefinitions_policydefinition_statements_statement->parent = routingpolicy->policy_definitions->policy_definition[0]->statements.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition_statements_statement));
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_as_path_prepend = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setaspathprepend);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_community = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setcommunity);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_ext_community = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_actions_bgpactions_setextcommunity);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_ext_community->config->options = openconfig_bgp_policy::BgpSetCommunityOptionType::REPLACE;
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->name = R"(9)";
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_ext_community->reference->config->ext_community_set_ref = routingpolicy->defined_sets->bgp_defined_sets->ext_community_sets->ext_community_set[0]->ext_community_set_name.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->actions->bgp_actions->set_ext_community->inline_->config->communities.append("8.252.233.5:17486");
+        return routingpolicy;*/
+
+    /*    auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::AsPathLength>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchPrefixSet>();
+        auto routingpolicy_policydefinitions_policydefinition = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
+        auto routingpolicy = std::make_shared<openconfig_routing_policy::RoutingPolicy>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::CommunityCount>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchTagSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchAsPathSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchCommunitySet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchNeighborSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchExtCommunitySet>();
+        routingpolicy_policydefinitions_policydefinition->parent = routingpolicy->policy_definitions.get();
+        routingpolicy->policy_definitions->policy_definition.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition));
+        routingpolicy->policy_definitions->policy_definition[0]->name = R"(q)";
+        routingpolicy_policydefinitions_policydefinition_statements_statement->parent = routingpolicy->policy_definitions->policy_definition[0]->statements.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition_statements_statement));
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->as_path_length = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->as_path_length->config->operator_ = openconfig_policy_types::ATTRIBUTELE();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->as_path_length->config->value_ = 24;
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_as_path_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_ext_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_neighbor_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_prefix_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_tag_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->name = R"(4)";
+        return routingpolicy;*/
+        
+     /*          auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::AsPathLength>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchPrefixSet>();
+        auto routingpolicy_policydefinitions_policydefinition = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
+        auto routingpolicy = std::make_shared<openconfig_routing_policy::RoutingPolicy>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::CommunityCount>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchTagSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchAsPathSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchCommunitySet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::MatchNeighborSet>();
+        auto routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset = std::make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition::Statements::Statement::Conditions::BgpConditions::MatchExtCommunitySet>();
+        routingpolicy_policydefinitions_policydefinition->parent = routingpolicy->policy_definitions.get();
+        routingpolicy->policy_definitions->policy_definition.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition));
+        routingpolicy->policy_definitions->policy_definition[0]->name = R"(7)";
+        routingpolicy_policydefinitions_policydefinition_statements_statement->parent = routingpolicy->policy_definitions->policy_definition[0]->statements.get();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement.emplace_back(std::move(routingpolicy_policydefinitions_policydefinition_statements_statement));
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->as_path_length = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_aspathlength);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_communitycount);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count->config->operator_ = openconfig_policy_types::ATTRIBUTEGE();
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->community_count->config->value_ = 19;
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_as_path_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchaspathset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchcommunityset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->bgp_conditions->match_ext_community_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_bgpconditions_matchextcommunityset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_neighbor_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchneighborset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_prefix_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchprefixset);
+//        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->conditions->match_tag_set = std::move(routingpolicy_policydefinitions_policydefinition_statements_statement_conditions_matchtagset);
+        routingpolicy->policy_definitions->policy_definition[0]->statements->statement[0]->name = R"(6)";
+        return routingpolicy;*/
+
+    auto mpls = std::make_shared<openconfig_mpls::Mpls>();
+    mpls->lsps->unconstrained_path->path_setup_protocol->ldp = std::make_shared<openconfig_mpls::Mpls::Lsps::UnconstrainedPath::PathSetupProtocol::Ldp>();
+    mpls->lsps->unconstrained_path->path_setup_protocol->ldp->tunnel->p2p_lsp->fec_address.append("10.0.0.1/32");
+    return mpls;
+}
+
 void config_bgp(openconfig_bgp::Bgp* bgp)
 {
     // Set the Global AS
@@ -41,7 +185,7 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     afi_safi->config->afi_safi_name = openconfig_bgp_types::L3VPNIPV4UNICAST();
     afi_safi->config->enabled = false;
     afi_safi->parent = bgp->global->afi_safis.get();
-    bgp->global->afi_safis->afi_safi.append(afi_safi);
+    bgp->global->afi_safis->afi_safi.push_back(move(afi_safi));
 
     auto neighbor = make_shared<openconfig_bgp::Bgp::Neighbors::Neighbor>();
     neighbor->neighbor_address = "6.7.8.9";
@@ -50,8 +194,10 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     neighbor->config->local_as = 65001;
     neighbor->config->peer_group = "IBGP";
     neighbor->config->peer_type = "INTERNAL";
-    neighbor->config->remove_private_as = openconfig_bgp_types::PRIVATEASREMOVEALL();
-    bgp->neighbors->neighbor.append(neighbor);
+//  neighbor->config->remove_private_as =
+//  openconfig_bgp_types::PRIVATEASREMOVEALL();
+    neighbor->parent = bgp->neighbors.get();
+    bgp->neighbors->neighbor.push_back(move(neighbor));
 
     auto peer_group = make_shared<openconfig_bgp::Bgp::PeerGroups::PeerGroup>();
     peer_group->peer_group_name = "IBGP";
@@ -61,15 +207,17 @@ void config_bgp(openconfig_bgp::Bgp* bgp)
     peer_group->config->peer_as = 65001;
     peer_group->config->local_as = 65001;
     peer_group->config->peer_type = "INTERNAL";
-    peer_group->config->remove_private_as = openconfig_bgp_types::REMOVEPRIVATEASOPTION();
-    bgp->peer_groups->peer_group.append(peer_group);
+    //peer_group->config->remove_private_as = openconfig_bgp_types::REMOVEPRIVATEASOPTION();
+    peer_group->parent = bgp->peer_groups.get();
+    bgp->peer_groups->peer_group.push_back(move(peer_group));
 }
 
 void config_routing_policy(openconfig_routing_policy::RoutingPolicy* routing_policy)
 {
     auto policy_definition = make_shared<openconfig_routing_policy::RoutingPolicy::PolicyDefinitions::PolicyDefinition>();
     policy_definition->name = "PASS-ALL";
-    routing_policy->policy_definitions->policy_definition.append(policy_definition);
+    policy_definition->parent = routing_policy->policy_definitions.get();
+    routing_policy->policy_definitions->policy_definition.push_back(move(policy_definition));
 }
 
 int main(int argc, char* argv[])
@@ -88,15 +236,16 @@ int main(int argc, char* argv[])
     NetconfServiceProvider provider{host, username, password, port};
     CrudService crud{};
 
-    auto bgp = make_unique<openconfig_bgp::Bgp>();
-    auto routing_policy = make_unique<openconfig_routing_policy::RoutingPolicy>();
-    config_bgp(bgp.get());
-    config_routing_policy(routing_policy.get());
+//    auto bgp = make_shared<openconfig_bgp::Bgp>();
+//    auto routing_policy = make_shared<openconfig_routing_policy::RoutingPolicy>();
+//    config_bgp(bgp.get());
+//    config_routing_policy(routing_policy.get());
+//
+//    bool reply = crud.create(provider, *bgp );
+//
+//    if(reply) cout << "Create yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
 
-    bool reply = crud.create(provider, *bgp );
+    auto t = s();
+    crud.create(provider, *t);
 
-    if (reply)
-        cout << "Create yfilter success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
 }
diff --git a/sdk/cpp/samples/bgp_update.cpp b/sdk/cpp/samples/bgp_update.cpp
index 9ea3d1ddb..29f571de0 100644
--- a/sdk/cpp/samples/bgp_update.cpp
+++ b/sdk/cpp/samples/bgp_update.cpp
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
     if(verbose)
     {
         auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            logger->set_level(spdlog::level::info);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -52,8 +52,5 @@ int main(int argc, char* argv[])
 
     bool reply = crud.update(provider, *bgp);
 
-    if (reply)
-        cout << "Update yfilter success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
+    if(reply) cout << "Update yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
 }
diff --git a/sdk/cpp/samples/bgp_xr_create.cpp b/sdk/cpp/samples/bgp_xr_create.cpp
index e130e3376..35b4af8c4 100644
--- a/sdk/cpp/samples/bgp_xr_create.cpp
+++ b/sdk/cpp/samples/bgp_xr_create.cpp
@@ -35,23 +35,23 @@ void config_bgp(Bgp* bgp)
 {
     // Add config data to bgp object.
     // global configuration
-    auto instance = make_shared<Bgp::Instance>();
+    auto instance = make_unique<Bgp::Instance>();
     instance->instance_name = "test";
-    auto instance_as = make_shared<Bgp::Instance::InstanceAs>();
+    auto instance_as = make_unique<Bgp::Instance::InstanceAs>();
     instance_as->as = 65001;
-    auto four_byte_as = make_shared<Bgp::Instance::InstanceAs::FourByteAs>();
+    auto four_byte_as = make_unique<Bgp::Instance::InstanceAs::FourByteAs>();
     four_byte_as->as = 65001;
     four_byte_as->bgp_running = Empty();
 
     // global address family
-    auto global_af = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::Global::GlobalAfs::GlobalAf>();
+    auto global_af = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::Global::GlobalAfs::GlobalAf>();
     global_af->af_name = BgpAddressFamily::ipv4_unicast;
     global_af->enable = Empty();
     global_af->parent = four_byte_as->default_vrf->global->global_afs.get();
-    four_byte_as->default_vrf->global->global_afs->global_af.append(global_af);
+    four_byte_as->default_vrf->global->global_afs->global_af.push_back(move(global_af));
 
     // configure IBGP neighbor group
-    auto neighbor_group = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup>();
+    auto neighbor_group = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup>();
     neighbor_group->neighbor_group_name = "IBGP";
     neighbor_group->create = Empty();
     // remote AS
@@ -59,21 +59,27 @@ void config_bgp(Bgp* bgp)
     neighbor_group->remote_as->as_yy = 65001;
     neighbor_group->update_source_interface = "Loopback0";
     // ipv4 unicast
-    auto neighbor_group_af = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup::NeighborGroupAfs::NeighborGroupAf>();
+    auto neighbor_group_af = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup::NeighborGroupAfs::NeighborGroupAf>();
     neighbor_group_af->af_name = BgpAddressFamily::ipv4_unicast;
     neighbor_group_af->activate = Empty();
-    neighbor_group->neighbor_group_afs->neighbor_group_af.append(neighbor_group_af);
-    four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.append(neighbor_group);
+    neighbor_group_af->parent = neighbor_group->neighbor_group_afs.get();
+    neighbor_group->parent = four_byte_as->default_vrf->bgp_entity->neighbor_groups.get();
+    neighbor_group->neighbor_group_afs->neighbor_group_af.push_back(move(neighbor_group_af));
+    four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.push_back(move(neighbor_group));
 
     // configure IBGP neighbor
-    auto neighbor = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::Neighbors::Neighbor>();
+    auto neighbor = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::Neighbors::Neighbor>();
     neighbor->neighbor_address = "172.16.255.2";
     neighbor->neighbor_group_add_member = "IBGP";
-    four_byte_as->default_vrf->bgp_entity->neighbors->neighbor.append(neighbor);
-
-    instance_as->four_byte_as.append(four_byte_as);
-    instance->instance_as.append(instance_as);
-    bgp->instance.append(instance);
+    neighbor->parent = four_byte_as->default_vrf->bgp_entity->neighbors.get();
+    four_byte_as->default_vrf->bgp_entity->neighbors->neighbor.push_back(move(neighbor));
+
+    four_byte_as->parent = instance_as.get();
+    instance_as->parent = instance.get();
+    instance->parent = bgp;
+    instance_as->four_byte_as.push_back(move(four_byte_as));
+    instance->instance_as.push_back(move(instance_as));
+    bgp->instance.push_back(move(instance));
 }
 
 int main(int argc, char* argv[])
@@ -88,8 +94,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::info);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -99,8 +105,6 @@ int main(int argc, char* argv[])
     config_bgp(bgp.get());
     bool reply = crud.create(provider, *bgp);
 
-    if (reply)
-        cout << "Update yfilter success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
+    if(reply) cout << "Create yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
+
 }
diff --git a/sdk/cpp/samples/bgp_xr_delete.cpp b/sdk/cpp/samples/bgp_xr_delete.cpp
index 771f79a66..2de921bfb 100644
--- a/sdk/cpp/samples/bgp_xr_delete.cpp
+++ b/sdk/cpp/samples/bgp_xr_delete.cpp
@@ -42,8 +42,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::info);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -51,8 +51,5 @@ int main(int argc, char* argv[])
 
     auto bgp = make_unique<Bgp>();
     bool reply = crud.delete_(provider, *bgp);
-    if (reply)
-        cout << "Update yfilter success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
+    if(reply) cout << "Delete yfilter success" << endl; else cout << "Operation failed" << endl;
 }
diff --git a/sdk/cpp/samples/bgp_xr_opendaylight.cpp b/sdk/cpp/samples/bgp_xr_opendaylight.cpp
index 2c355e5e6..a29c9468f 100644
--- a/sdk/cpp/samples/bgp_xr_opendaylight.cpp
+++ b/sdk/cpp/samples/bgp_xr_opendaylight.cpp
@@ -37,22 +37,23 @@ using namespace cisco_ios_xr::Cisco_IOS_XR_ipv4_bgp_datatypes;
 
 static void config_bgp(Bgp *bgp)
 {
-    auto instance = make_shared<Bgp::Instance>();
+    auto instance = make_unique<Bgp::Instance>();
     instance->instance_name = "test";
-    auto instance_as = make_shared<Bgp::Instance::InstanceAs>();
+    auto instance_as = make_unique<Bgp::Instance::InstanceAs>();
     instance_as->as = 65001;
-    auto four_byte_as = make_shared<Bgp::Instance::InstanceAs::FourByteAs>();
+    auto four_byte_as = make_unique<Bgp::Instance::InstanceAs::FourByteAs>();
     four_byte_as->as = 65001;
     four_byte_as->bgp_running = Empty();
 
     // global address family
-    auto global_af = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::Global::GlobalAfs::GlobalAf>();
+    auto global_af = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::Global::GlobalAfs::GlobalAf>();
     global_af->af_name = BgpAddressFamily::ipv4_unicast;
     global_af->enable = Empty();
-    four_byte_as->default_vrf->global->global_afs->global_af.append(global_af);
+    global_af->parent = four_byte_as->default_vrf->global->global_afs.get();
+    four_byte_as->default_vrf->global->global_afs->global_af.push_back(move(global_af));
 
     // configure IBGP neighbor group
-    auto neighbor_group = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup>();
+    auto neighbor_group = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup>();
     neighbor_group->neighbor_group_name = "IBGP";
     neighbor_group->create = Empty();
     // remote AS
@@ -60,21 +61,27 @@ static void config_bgp(Bgp *bgp)
     neighbor_group->remote_as->as_yy = 65001;
     neighbor_group->update_source_interface = "Loopback0";
     // ipv4 unicast
-    auto neighbor_group_af = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup::NeighborGroupAfs::NeighborGroupAf>();
+    auto neighbor_group_af = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup::NeighborGroupAfs::NeighborGroupAf>();
     neighbor_group_af->af_name = BgpAddressFamily::ipv4_unicast;
     neighbor_group_af->activate = Empty();
-    neighbor_group->neighbor_group_afs->neighbor_group_af.append(neighbor_group_af);
-    four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.append(neighbor_group);
+    neighbor_group_af->parent = neighbor_group->neighbor_group_afs.get();
+    neighbor_group->parent = four_byte_as->default_vrf->bgp_entity->neighbor_groups.get();
+    neighbor_group->neighbor_group_afs->neighbor_group_af.push_back(move(neighbor_group_af));
+    four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.push_back(move(neighbor_group));
 
     // configure IBGP neighbor
-    auto neighbor = make_shared<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::Neighbors::Neighbor>();
+    auto neighbor = make_unique<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::Neighbors::Neighbor>();
     neighbor->neighbor_address = "172.16.255.2";
     neighbor->neighbor_group_add_member = "IBGP";
-    four_byte_as->default_vrf->bgp_entity->neighbors->neighbor.append(neighbor);
-
-    instance_as->four_byte_as.append(four_byte_as);
-    instance->instance_as.append(instance_as);
-    bgp->instance.append(instance);
+    neighbor->parent = four_byte_as->default_vrf->bgp_entity->neighbors.get();
+    four_byte_as->default_vrf->bgp_entity->neighbors->neighbor.push_back(move(neighbor));
+
+    four_byte_as->parent = instance_as.get();
+    instance_as->parent = instance.get();
+    instance->parent = bgp;
+    instance_as->four_byte_as.push_back(move(four_byte_as));
+    instance->instance_as.push_back(move(instance_as));
+    bgp->instance.push_back(move(instance));
 }
 
 static void set_logging(bool verbose)
@@ -99,17 +106,14 @@ int main(int argc, char* argv[])
     try
     {
         ydk::path::Repository repo{"/Users/abhirame/Cisco/odl/distribution-karaf-0.5.2-Boron-SR2/cache/schema"};
-        OpenDaylightServiceProvider provider{repo, host, username, password, port, EncodingFormat::XML};
+            OpenDaylightServiceProvider provider{repo, host, username, password, port, EncodingFormat::XML};
         CrudService crud {};
 
         auto bgp = make_unique<Bgp>();
         config_bgp(bgp.get());
         bool reply = crud.create(provider.get_node_provider("xr"), *bgp);
 
-        if (reply)
-            cout << "Update yfilter success" << endl << endl;
-        else
-            cout << "Operation failed" << endl << endl;
+        if(reply) cout << "Create yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
     }
     catch(YError & e)
     {
diff --git a/sdk/cpp/samples/bgp_xr_read.cpp b/sdk/cpp/samples/bgp_xr_read.cpp
index 3e5568722..52c5a1372 100644
--- a/sdk/cpp/samples/bgp_xr_read.cpp
+++ b/sdk/cpp/samples/bgp_xr_read.cpp
@@ -61,28 +61,27 @@ int main(int argc, char* argv[])
 
     cout << "=================================================="<<endl;
     cout << "BGP configuration: " << endl<<endl;
-
-    for(size_t i=0; i < bgp_read_ptr->instance.len(); i++)
+    for(size_t i=0; i < bgp_read_ptr->instance.size(); i++)
     {
         auto instance = dynamic_cast<Bgp::Instance*>(bgp_read_ptr->instance[i].get());
         cout << "Instance: " << instance->instance_name << endl;
-        for(size_t j=0; j < instance->instance_as.len(); j++)
+        for(size_t j=0; j < instance->instance_as.size(); j++)
         {
             auto instance_as = dynamic_cast<Bgp::Instance::InstanceAs*>(instance->instance_as[j].get());
             cout << "AS: " << instance_as->as << endl;
-            for(size_t k=0; k < instance_as->four_byte_as.len(); k++)
+            for(size_t k=0; k < instance_as->four_byte_as.size(); k++)
             {
                 auto four_byte_as = dynamic_cast<Bgp::Instance::InstanceAs::FourByteAs*>(instance_as->four_byte_as[k].get());
                 cout << "Four Byte AS: " << four_byte_as->as << endl;
                 cout << "BGP running: " << ((four_byte_as->bgp_running.is_set)?"Yes":"No") << endl;
-                for(size_t l=0; l < four_byte_as->default_vrf->global->global_afs->global_af.len(); l++)
+                for(size_t l=0; l < four_byte_as->default_vrf->global->global_afs->global_af.size(); l++)
                 {
                     auto global_af = dynamic_cast<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::Global::GlobalAfs::GlobalAf*>
                                         (four_byte_as->default_vrf->global->global_afs->global_af[l].get());
                     cout << "Global AF name: " << global_af->af_name << endl;
                     cout << "Global AF enabled: " << (global_af->enable.is_set?"Yes":"No") << endl;
                 }
-                for(size_t l=0; l < four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.len(); l++)
+                for(size_t l=0; l < four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group.size(); l++)
                 {
                     auto neighbor_group = dynamic_cast<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup*>
                                             (four_byte_as->default_vrf->bgp_entity->neighbor_groups->neighbor_group[l].get());
@@ -92,7 +91,7 @@ int main(int argc, char* argv[])
                     cout << "Neighbor Group remote AS YY: " << neighbor_group->remote_as->as_yy << endl;
                     cout << "Neighbor Group update source interface: " << neighbor_group->update_source_interface << endl;
 
-                    for(size_t m=0; m < neighbor_group->neighbor_group_afs->neighbor_group_af.len(); m++)
+                    for(size_t m=0; m < neighbor_group->neighbor_group_afs->neighbor_group_af.size(); m++)
                     {
                         auto neighbor_group_af = dynamic_cast<Bgp::Instance::InstanceAs::FourByteAs::DefaultVrf::BgpEntity::NeighborGroups::NeighborGroup::NeighborGroupAfs::NeighborGroupAf*>
                                                                     (neighbor_group->neighbor_group_afs->neighbor_group_af[m].get());
diff --git a/sdk/cpp/samples/interface_xr_create.cpp b/sdk/cpp/samples/interface_xr_create.cpp
index 71fd33952..c99bbdf9f 100644
--- a/sdk/cpp/samples/interface_xr_create.cpp
+++ b/sdk/cpp/samples/interface_xr_create.cpp
@@ -40,8 +40,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::debug);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::debug);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -65,9 +65,6 @@ int main(int argc, char* argv[])
 
     bool reply = crud.create(provider, interface);
 
-    if (reply)
-        cout << "Create operation success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
+    if(reply) cout << "Create operation success" << endl << endl; else cout << "Operation failed" << endl << endl;
 
 }
diff --git a/sdk/cpp/samples/isis_xr_create.cpp b/sdk/cpp/samples/isis_xr_create.cpp
index fe647446d..6c278224c 100644
--- a/sdk/cpp/samples/isis_xr_create.cpp
+++ b/sdk/cpp/samples/isis_xr_create.cpp
@@ -34,55 +34,62 @@ void config_isis(Isis* isis)
 {
      //Add config data to isis object.
     // global configuration
-    auto instance = make_shared<Isis::Instances::Instance>();
+    auto instance = make_unique<Isis::Instances::Instance>();
     instance->instance_name = "DEFAULT";
     instance->running = Empty();
     instance->is_type = IsisConfigurableLevels::level2;
-    auto net = make_shared<Isis::Instances::Instance::Nets::Net>();
+    auto net = make_unique<Isis::Instances::Instance::Nets::Net>();
     net->net_name = "49.0000.1720.1625.5001.00";
-    instance->nets->net.append(net);
+    net->parent = instance->nets.get();
+    instance->nets->net.push_back(move(net));
 
     // global address family
-    auto af = make_shared<Isis::Instances::Instance::Afs::Af>();
+    auto af = make_unique<Isis::Instances::Instance::Afs::Af>();
     af->af_name = IsisAddressFamily::ipv4;
     af->saf_name = IsisSubAddressFamily::unicast;
-    af->af_data = make_shared<Isis::Instances::Instance::Afs::Af::AfData>(); // instantiate the presence node
+    af->af_data = make_unique<Isis::Instances::Instance::Afs::Af::AfData>(); // instantiate the presence node
     af->af_data->parent = af.get(); // set the parent
-    auto metric_style = make_shared<Isis::Instances::Instance::Afs::Af::AfData::MetricStyles::MetricStyle>();
+    auto metric_style = make_unique<Isis::Instances::Instance::Afs::Af::AfData::MetricStyles::MetricStyle>();
     metric_style->style = IsisMetricStyle::new_metric_style;
     metric_style->level = IsisInternalLevel::not_set;
-    af->af_data->metric_styles->metric_style.append(metric_style);
-    instance->afs->af.append(af);
-
-    // Loopback0 interface
-    auto interface = make_shared<Isis::Instances::Instance::Interfaces::Interface>();
+    metric_style->transition_state = IsisMetricStyleTransition::disabled;
+    metric_style->parent = af->af_data->metric_styles.get();
+    af->af_data->metric_styles->metric_style.push_back(move(metric_style));
+    af->parent = instance->afs.get();
+    instance->afs->af.push_back(move(af));
+
+    // loopback interface
+    auto interface = make_unique<Isis::Instances::Instance::Interfaces::Interface>();
     interface->interface_name = "Loopback0";
     interface->running = Empty();
     interface->state = IsisInterfaceState::passive;
-
     // interface address family
-    auto interface_af = make_shared<Isis::Instances::Instance::Interfaces::Interface::InterfaceAfs::InterfaceAf>();
+    auto interface_af = make_unique<Isis::Instances::Instance::Interfaces::Interface::InterfaceAfs::InterfaceAf>();
     interface_af->af_name = IsisAddressFamily::ipv4;
     interface_af->saf_name = IsisSubAddressFamily::unicast;
     interface_af->interface_af_data->running = Empty();
-    interface->interface_afs->interface_af.append(interface_af);
-    instance->interfaces->interface.append(interface);
+    interface_af->parent = interface->interface_afs.get();
+    interface->interface_afs->interface_af.push_back(move(interface_af));
+    interface->parent = instance->interfaces.get();
+    instance->interfaces->interface.push_back(move(interface));
 
     // gi0/0/0/0 interface
-    interface = make_shared<Isis::Instances::Instance::Interfaces::Interface>();
+    interface = make_unique<Isis::Instances::Instance::Interfaces::Interface>();
     interface->interface_name = "GigabitEthernet0/0/0/0";
     interface->running = Empty();
     interface->point_to_point = Empty();
-
-    // interface address family
-    interface_af = make_shared<Isis::Instances::Instance::Interfaces::Interface::InterfaceAfs::InterfaceAf>();
+    // interface address familiy
+    interface_af = make_unique<Isis::Instances::Instance::Interfaces::Interface::InterfaceAfs::InterfaceAf>();
     interface_af->af_name = IsisAddressFamily::ipv4;
     interface_af->saf_name = IsisSubAddressFamily::unicast;
     interface_af->interface_af_data->running = Empty();
-    interface->interface_afs->interface_af.append(interface_af);
-    instance->interfaces->interface.append(interface);
+    interface_af->parent = interface->interface_afs.get();
+    interface->interface_afs->interface_af.push_back(move(interface_af));
+    interface->parent = instance->interfaces.get();
+    instance->interfaces->interface.push_back(move(interface));
 
-    isis->instances->instance.append(instance);
+    instance->parent = isis->instances.get();
+    isis->instances->instance.push_back(move(instance));
 }
 
 int main(int argc, char* argv[])
@@ -97,8 +104,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::info);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -108,9 +115,6 @@ int main(int argc, char* argv[])
     config_isis(isis.get());
     bool reply = crud.create(provider, *isis);
 
-    if (reply)
-        cout << "Create operation success" << endl << endl;
-    else
-        cout << "Operation failed" << endl << endl;
+    if(reply) cout << "Create operation success" << endl << endl; else cout << "Operation failed" << endl << endl;
 
 }
diff --git a/sdk/cpp/samples/isis_xr_delete.cpp b/sdk/cpp/samples/isis_xr_delete.cpp
index eab549de6..ad3843b94 100644
--- a/sdk/cpp/samples/isis_xr_delete.cpp
+++ b/sdk/cpp/samples/isis_xr_delete.cpp
@@ -40,8 +40,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::info);
     }
 
     try
@@ -51,10 +51,7 @@ int main(int argc, char* argv[])
 
         auto isis = make_unique<Isis>();
         bool reply = crud.delete_(provider, *isis);
-        if (reply)
-            cout << "Delete yfilter success" << endl << endl;
-        else
-            cout << "Operation failed" << endl << endl;
+        if(reply) cout << "Delete yfilter success" << endl << endl; else cout << "Operation failed" << endl << endl;
     }
     catch(YError & e)
     {
diff --git a/sdk/cpp/samples/isis_xr_read.cpp b/sdk/cpp/samples/isis_xr_read.cpp
index a644cd9e8..467ee06fd 100644
--- a/sdk/cpp/samples/isis_xr_read.cpp
+++ b/sdk/cpp/samples/isis_xr_read.cpp
@@ -42,8 +42,8 @@ int main(int argc, char* argv[])
     bool verbose=(args[4]=="--verbose");
     if(verbose)
     {
-        auto logger = spdlog::stdout_color_mt("ydk");
-        logger->set_level(spdlog::level::info);
+            auto logger = spdlog::stdout_color_mt("ydk");
+            logger->set_level(spdlog::level::info);
     }
 
     NetconfServiceProvider provider{host, username, password, port};
@@ -64,39 +64,35 @@ int main(int argc, char* argv[])
     cout << "=================================================="<<endl;
     cout << "ISIS configuration: " << endl<<endl;
 
-    for(size_t i=0; i < isis_read_ptr->instances->instance.len(); i++)
+    for(size_t i=0; i < isis_read_ptr->instances->instance.size(); i++)
     {
         auto instance = dynamic_cast<Isis::Instances::Instance*>(isis_read_ptr->instances->instance[i].get());
         cout << "Instance: " << instance->instance_name << endl;
         cout << "Running: " << ((instance->running.is_set)?"Yes":"No") << endl;
         cout << "IS type: " << instance->is_type << endl;
 
-        for(size_t j=0; j < instance->nets->net.len(); j++)
+        for(size_t j=0; j < instance->nets->net.size(); j++)
         {
-            auto net = dynamic_cast<Isis::Instances::Instance::Nets::Net*>(instance->nets->net[j].get());
-            cout << "Net name: " << net->net_name << endl;
+            cout << "Net name: " << instance->nets->net[j]->net_name << endl;
         }
 
-        for(size_t j=0; j < instance->afs->af.len(); j++)
+        for(size_t j=0; j < instance->afs->af.size(); j++)
         {
-            auto af = dynamic_cast<Isis::Instances::Instance::Afs::Af*>(instance->afs->af[j].get());
-            cout << "AF name: " << af->af_name << endl;
-            cout << "SAF name: " << af->saf_name << endl;
+            cout << "AF name: " << instance->afs->af[j]->af_name << endl;
+            cout << "SAF name: " << instance->afs->af[j]->saf_name << endl;
         }
 
-        for(size_t j=0; j < instance->interfaces->interface.len(); j++)
+        for(size_t j=0; j < instance->interfaces->interface.size(); j++)
         {
-            auto intf = dynamic_cast<Isis::Instances::Instance::Interfaces::Interface*>(instance->interfaces->interface[j].get());
-            cout<<endl << "Interface name: " << intf->interface_name << endl;
-            cout << "Interface running: " << ((intf->running.is_set)?"Yes":"No") << endl;
-            cout<< "Interface state: " << intf->state << endl;
-            cout<< "Interface point-to-point: " << ((intf->point_to_point.is_set)?"Yes":"No") << endl;
+            cout<<endl << "Interface name: " << instance->interfaces->interface[j]->interface_name << endl;
+            cout << "Interface running: " << ((instance->interfaces->interface[j]->running.is_set)?"Yes":"No") << endl;
+            cout<< "Interface state: " << instance->interfaces->interface[j]->state << endl;
+            cout<< "Interface point-to-point: " << ((instance->interfaces->interface[j]->point_to_point.is_set)?"Yes":"No") << endl;
 
-            for(size_t k=0; k < intf->interface_afs->interface_af.len(); k++)
+            for(size_t k=0; k < instance->interfaces->interface[j]->interface_afs->interface_af.size(); k++)
             {
-                auto intf_af = dynamic_cast<Isis::Instances::Instance::Interfaces::Interface::InterfaceAfs::InterfaceAf*>(intf->interface_afs->interface_af[k].get());
-                cout<< "Interface AF name: " << intf_af->af_name << endl;
-                cout<< "Interface SAF name: " << intf_af->saf_name << endl;
+                cout<< "Interface AF name: " << instance->interfaces->interface[j]->interface_afs->interface_af[k]->af_name << endl;
+                cout<< "Interface SAF name: " << instance->interfaces->interface[j]->interface_afs->interface_af[k]->saf_name << endl;
             }
         }
     }
diff --git a/sdk/cpp/tests/CMakeLists.txt b/sdk/cpp/tests/CMakeLists.txt
index e13190fe8..832e754ec 100644
--- a/sdk/cpp/tests/CMakeLists.txt
+++ b/sdk/cpp/tests/CMakeLists.txt
@@ -31,7 +31,7 @@ set(bundle_tests_src
         testsanitynctest.cpp
         testsanityvalidationtest.cpp
         test_utils.cpp
-#        test_oc_nis.cpp
+        test_oc_nis.cpp
         )
 
 find_library(xml2_location xml2)
@@ -44,7 +44,7 @@ find_library(pthread_location pthread)
 find_library(dl_location dl)
 find_library(ydk_location ydk)
 find_library(ydk_ydktest_location ydk_ydktest)
-#find_library(ydktest_oc_nis_location ydk_ydktest_oc_nis)
+find_library(ydktest_oc_nis_location ydk_ydktest_oc_nis)
 
 set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
@@ -71,7 +71,7 @@ set_property(TARGET ${YDK_UNITTEST_TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED O
 target_link_libraries(${YDK_UNITTEST_TARGET_NAME}
     ${ydk_location}
     ${ydk_ydktest_location}
-#    ${ydktest_oc_nis_location}
+    ${ydktest_oc_nis_location}
     ${xml2_location}
     ${curl_location}
     ${ssh_location}
diff --git a/sdk/cpp/tests/test_c_api.cpp b/sdk/cpp/tests/test_c_api.cpp
index a428c7dc6..ced2bff98 100644
--- a/sdk/cpp/tests/test_c_api.cpp
+++ b/sdk/cpp/tests/test_c_api.cpp
@@ -1,51 +1,49 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
+//////////////////////////////////////////////////////////////////
+// @file golang.cpp
+//
+// YANG Development Kit
+// Copyright 2017 Cisco Systems. All rights reserved
+//
+////////////////////////////////////////////////////////////////
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+//////////////////////////////////////////////////////////////////
 
 #include <iostream>
 
 #include <ydk/ydk.h>
-
-#include "config.hpp"
 #include "catch.hpp"
 
 using namespace std;
 
 const char* test_string="<runner xmlns=\"http://cisco.com/ns/yang/ydktest-sanity\"><ytypes><built-in-t><number8>2</number8></built-in-t></ytypes></runner>";
 
-TEST_CASE( "c_api_codec_encode"  )
+TEST_CASE( "codec_encode"  )
 {
     YDKStatePtr state = YDKStateCreate();
     Codec c = CodecInit();
-    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.1");
-    REQUIRE(repo!=NULL);
-    ServiceProvider provider = NetconfServiceProviderInit(
-        state, repo,
-        "localhost", "admin", "admin", 12022, "ssh",
-        true, false, -1, "", "");
+    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.0");
+    ServiceProvider provider = NetconfServiceProviderInitWithRepo(state, repo, "localhost", "admin", "admin", 12022, "ssh");
     REQUIRE(provider!=NULL);
 
     RootSchemaNode root_schema = ServiceProviderGetRootSchema(state, provider);
 
-    DataNode runner = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner", "");
+    DataNode runner = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner");
 
     DataNodeCreate(state, runner, "ytypes/built-in-t/number8", "2");
 
@@ -60,16 +58,12 @@ TEST_CASE( "c_api_codec_encode"  )
     YDKStateFree(state);
 }
 
-TEST_CASE( "c_api_codec_decode"  )
+TEST_CASE( "codec_decode"  )
 {
     YDKStatePtr state = YDKStateCreate();
     Codec c = CodecInit();
-    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.1");
-    REQUIRE(repo!=NULL);
-    ServiceProvider provider = NetconfServiceProviderInit(
-        state, repo,
-        "localhost", "admin", "admin", 12022, "ssh",
-        true, false, -1, "", "");
+    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.0");
+    ServiceProvider provider = NetconfServiceProviderInitWithRepo(state, repo, "localhost", "admin", "admin", 12022, "ssh");
     REQUIRE(provider!=NULL);
 
     RootSchemaNode root_schema = ServiceProviderGetRootSchema(state, provider);
@@ -89,15 +83,13 @@ TEST_CASE( "c_api_codec_decode"  )
     YDKStateFree(state);
 }
 
-TEST_CASE( "c_api_provider_withpath"  )
+TEST_CASE( "provider_withpath"  )
 {
     YDKStatePtr state = YDKStateCreate();
-    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.1");
+    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.0");
+    ServiceProvider provider = NetconfServiceProviderInitWithRepo(state, repo, "localhost", "admin", "admin", 12022, "ssh");
+
     REQUIRE(repo!=NULL);
-    ServiceProvider provider = NetconfServiceProviderInit(
-        state, repo,
-        "localhost", "admin", "admin", 12022, "ssh",
-        true, false, -1, "", "");
     REQUIRE(provider!=NULL);
 
     NetconfServiceProviderFree(provider);
@@ -105,15 +97,13 @@ TEST_CASE( "c_api_provider_withpath"  )
     YDKStateFree(state);
 }
 
-TEST_CASE( "c_api_provider"  )
+TEST_CASE( "provider"  )
 {
     YDKStatePtr state = YDKStateCreate();
     Repository repo = RepositoryInit();
+    ServiceProvider provider = NetconfServiceProviderInitWithRepo(state, repo, "localhost", "admin", "admin", 12022, "ssh");
+
     REQUIRE(repo!=NULL);
-    ServiceProvider provider = NetconfServiceProviderInit(
-        state, repo,
-        "localhost", "admin", "admin", 12022, "ssh",
-        true, false, -1, "", "");
     REQUIRE(provider!=NULL);
 
     NetconfServiceProviderFree(provider);
@@ -121,22 +111,19 @@ TEST_CASE( "c_api_provider"  )
     YDKStateFree(state);
 }
 
-TEST_CASE( "c_api_rpc" )
+TEST_CASE( "rpc" )
 {
     YDKStatePtr state = YDKStateCreate();
     Codec c = CodecInit();
 
-    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.1");
-    REQUIRE(repo!=NULL);
-    ServiceProvider provider = NetconfServiceProviderInit(
-        state, repo,
-        "localhost", "admin", "admin", 12022, "ssh",
-        true, false, -1, "", "");
+    Repository repo = RepositoryInitWithPath(state, "/usr/local/share/ydktest@0.1.0");
+
+    ServiceProvider provider = NetconfServiceProviderInitWithRepo(state, repo, "localhost", "admin", "admin", 12022, "ssh");
     REQUIRE(provider!=NULL);
 
     RootSchemaNode root_schema = ServiceProviderGetRootSchema(state, provider);
 
-    DataNode runner = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner", "");
+    DataNode runner = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner");
 
     DataNodeCreate(state, runner, "ytypes/built-in-t/number8", "2");
     const char* create_xml = CodecEncode(state, c, runner, XML, 0);
@@ -148,7 +135,7 @@ TEST_CASE( "c_api_rpc" )
 
     Rpc read_rpc = RootSchemaNodeRpc(state, root_schema, "ydk:read");
     input = RpcInput(state, read_rpc);
-    DataNode runner_filter = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner", "");
+    DataNode runner_filter = RootSchemaNodeCreate(state, root_schema, "ydktest-sanity:runner");
     const char* read_xml = CodecEncode(state, c, runner_filter, XML, 0);
 
     DataNodeCreate(state, input, "filter", read_xml);
@@ -161,51 +148,3 @@ TEST_CASE( "c_api_rpc" )
     CodecFree(c);
     YDKStateFree(state);
 }
-
-TEST_CASE( "c_api_netconf_session" )
-{
-    // Connect to Netconf server
-    YDKStatePtr state = YDKStateCreate();
-    Repository repo = RepositoryInit();
-    REQUIRE(repo!=NULL);
-    auto session = NetconfSessionInit(state, repo, "localhost", "admin", "admin", 12022,
-                                      "ssh", true, false, -1, "", "");
-    REQUIRE(session!=NULL);
-
-    // Get capabilities
-    int len = 0;
-    auto capabilities = SessionGetCapabilities(state, session, &len);
-    CHECK(len > 0);
-    cout << "Total capabilities - "<< len << endl;
-    cout << capabilities[0] << endl;
-    CapabilitiesArrayFree(capabilities, len);
-
-    // Disconnect from Netconf server
-    NetconfSessionFree(session);
-    RepositoryFree(repo);
-    YDKStateFree(state);
-}
-
-TEST_CASE( "c_api_restconf_session" )
-{
-    // Connect to Netconf server
-    YDKStatePtr state = YDKStateCreate();
-    Repository repo = RepositoryInitWithPath(state, TEST_HOME);
-    REQUIRE(repo);
-    auto session = RestconfSessionInit(state, repo, "localhost", "admin", "admin", 12306,
-                                       EncodingFormat::JSON, "/data", "/data");
-    REQUIRE(session);
-
-    // Get capabilities
-    int len = 0;
-    auto capabilities = SessionGetCapabilities(state, session, &len);
-    CHECK(len > 0);
-    cout << "Total capabilities - "<< len << endl;
-    cout << capabilities[0] << endl;
-    CapabilitiesArrayFree(capabilities, len);
-
-    // Disconnect from Netconf server
-    RestconfSessionFree(session);
-    RepositoryFree(repo);
-    YDKStateFree(state);
-}
diff --git a/sdk/cpp/tests/test_crud.cpp b/sdk/cpp/tests/test_crud.cpp
index dd603b743..40037754e 100644
--- a/sdk/cpp/tests/test_crud.cpp
+++ b/sdk/cpp/tests/test_crud.cpp
@@ -273,20 +273,6 @@ TEST_CASE("bgp_read_container")
     REQUIRE(bgp_read_ptr->neighbors->neighbor.len() == 0);
     REQUIRE(bgp_read_ptr->global->config->as.value == "65001");
 
-    // Read neighbor list
-    bgp_filter = make_unique<openconfig_bgp::Bgp>();
-    auto r = make_shared<openconfig_bgp::Bgp::Neighbors::Neighbor>();
-    r->neighbor_address = YFilter::read;
-    bgp_filter->neighbors->neighbor.append(r);
-    bgp_read = crud.read_config(provider, *(bgp_filter));
-    REQUIRE(bgp_read != nullptr);
-    bgp_read_ptr = dynamic_cast<openconfig_bgp::Bgp*>(bgp_read.get());
-    REQUIRE(bgp_read_ptr->neighbors->neighbor.len() == 2);
-    auto neighbor_entity = bgp_read_ptr->neighbors->neighbor["1.2.3.5"];
-    auto neighbor_ptr = dynamic_cast<openconfig_bgp::Bgp::Neighbors::Neighbor*>(neighbor_entity.get());
-    REQUIRE(neighbor_ptr->config->has_data() == false);
-
-    // Read neighbors container
     bgp_filter = make_unique<openconfig_bgp::Bgp>();
     bgp_filter->neighbors->yfilter = YFilter::read;
     bgp_read = crud.read_config(provider, *(bgp_filter));
@@ -375,8 +361,7 @@ TEST_CASE("oc_platform")
 
 TEST_CASE( "crud_entity_list_bgp" )
 {
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::NetconfServiceProvider provider{repo, "127.0.0.1", "admin", "admin", 12022};
+    ydk::NetconfServiceProvider provider{"127.0.0.1", "admin", "admin", 12022};
     ydk::CrudService crud{};
 
     // Create 'native' configuration
diff --git a/sdk/cpp/tests/test_executor_service.cpp b/sdk/cpp/tests/test_executor_service.cpp
index 1a787822e..b81524c50 100644
--- a/sdk/cpp/tests/test_executor_service.cpp
+++ b/sdk/cpp/tests/test_executor_service.cpp
@@ -1,7 +1,6 @@
 /*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems, All rights reserved.
- -------------------------------------------------------------------
+ Copyright 2016 Cisco Systems
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -13,11 +12,6 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
  ------------------------------------------------------------------*/
 
 #include <string.h>
@@ -28,12 +22,10 @@
 #include <ydk/codec_service.hpp>
 #include <ydk/netconf_provider.hpp>
 #include <ydk/executor_service.hpp>
-#include <ydk/types.hpp>
-
 #include <ydk_ydktest/ydktest_sanity.hpp>
 #include <ydk_ydktest/ietf_netconf.hpp>
-#include <ydk_ydktest/ietf_netconf_monitoring.hpp>
 #include <ydk_ydktest/openconfig_bgp.hpp>
+#include <ydk/types.hpp>
 
 #include "config.hpp"
 #include "catch.hpp"
@@ -56,9 +48,16 @@ TEST_CASE("es_close_session_rpc")
     REQUIRE(result);
 
     ietf_netconf::CloseSession rpc{};
+    ietf_netconf::CloseSession rpc2{};
 
     std::shared_ptr<Entity> reply = es.execute_rpc(provider, rpc);
-    REQUIRE(reply == nullptr);
+    result = reply == nullptr;
+    REQUIRE(result);
+
+    CHECK_THROWS_AS(
+        es.execute_rpc(provider, rpc2),
+        YClientError
+    );
 }
 
 // persist-id is broken?
@@ -125,7 +124,6 @@ TEST_CASE("es_copy_config_rpc")
 }
 
 // issues in netsim
-// If-feature 'url' is not enabled in confd-7.3, hence expected failure execute RPC
 TEST_CASE("es_delete_config_rpc")
 {
     // provider
@@ -202,7 +200,7 @@ TEST_CASE("es_edit_config_rpc")
     // runner and filter
     auto runner = make_shared<ydktest_sanity::Runner>();
     runner->one->number = 1;
-    runner->one->name = "runner-one-name";
+    runner->one->name = "runner:one:name";
     std::string runner_xml = codec_service.encode(codec_provider, *runner, true);
 
     auto filter = make_unique<ydktest_sanity::Runner>();
@@ -213,36 +211,38 @@ TEST_CASE("es_edit_config_rpc")
     edit_config_rpc.input->target->candidate = Empty();
     edit_config_rpc.input->config = runner_xml;
 
-    std::shared_ptr<Entity> reply = es.execute_rpc(provider, edit_config_rpc);
-    CHECK(reply == nullptr);
+    std::shared_ptr<Entity> reply = es.execute_rpc(
+        provider, edit_config_rpc);
+    result = reply == nullptr;
+    REQUIRE(result);
 
     // Get Config Rpc
     ietf_netconf::GetConfig get_config_rpc{};
     get_config_rpc.input->source->candidate = Empty();
     get_config_rpc.input->filter = filter_xml;
 
-    auto get_runner = make_shared<ydktest_sanity::Runner>();
-    reply = es.execute_rpc(provider, get_config_rpc, get_runner);
+    reply = es.execute_rpc(provider, get_config_rpc, runner);
     REQUIRE(reply);
-    auto runner_entity = dynamic_cast<ydktest_sanity::Runner*>(reply.get());
-    CHECK(*runner == *runner_entity);
 
     // Commit Rpc
     ietf_netconf::Commit commit_rpc{};
+
     reply = es.execute_rpc(provider, commit_rpc);
-    CHECK(reply == nullptr);
+    result = reply == nullptr;
+    REQUIRE(result);
 
-    // Get Rpc
+    // // Get Rpc
     ietf_netconf::Get get_rpc{};
     get_rpc.input->filter = filter_xml;
 
     reply = es.execute_rpc(provider, get_rpc, runner);
-    CHECK(reply);
+    REQUIRE(reply);
 
     // Discard Changes
     ietf_netconf::DiscardChanges discard_rpc{};
     reply = es.execute_rpc(provider, discard_rpc);
-    CHECK(reply == nullptr);
+    result = reply == nullptr;
+    REQUIRE(result);
 }
 
 // kill_session
@@ -284,17 +284,32 @@ TEST_CASE("es_lock_rpc")
     NetconfServiceProvider provider{repo, "127.0.0.1", "admin", "admin", 12022};
     ExecutorService es{};
 
+    // clean up
+    CrudService crud{};
+    auto r_1 = make_unique<ydktest_sanity::Runner>();
+    bool result = crud.delete_(provider, *r_1);
+    REQUIRE(result);
+
     ietf_netconf::Lock lock_rpc{};
-    lock_rpc.input->target->running = Empty();
+    lock_rpc.input->target->candidate = Empty();
 
-    std::shared_ptr<Entity> reply = es.execute_rpc(provider, lock_rpc);
-    CHECK(reply == nullptr);
+    std::shared_ptr<Entity> reply = es.execute_rpc(
+        provider, lock_rpc);
+    result = reply == nullptr;
+    REQUIRE(result);
 
     ietf_netconf::Unlock unlock_rpc{};
-    unlock_rpc.input->target->running = Empty();
+    unlock_rpc.input->target->candidate = Empty();
 
     reply = es.execute_rpc(provider, unlock_rpc);
-    CHECK(reply == nullptr);
+    result = reply == nullptr;
+    REQUIRE(result);
+
+    // Discard Changes
+    ietf_netconf::DiscardChanges discard_rpc{};
+    reply = es.execute_rpc(provider, discard_rpc);
+    result = reply == nullptr;
+    REQUIRE(result);
 }
 
 TEST_CASE("es_validate_rpc_1")
@@ -349,19 +364,3 @@ TEST_CASE("es_validate_rpc_2")
     result = reply == nullptr;
     REQUIRE(result);
 }
-
-TEST_CASE("es_get_schema_rpc")
-{
-    NetconfServiceProvider provider{"127.0.0.1", "admin", "admin", 12022};
-    ExecutorService es{};
-
-    auto rpc_entity = ietf_netconf_monitoring::GetSchema{};
-    rpc_entity.input->identifier = "main";
-    auto return_output_entity = make_shared<ietf_netconf_monitoring::GetSchema::Output>();
-    auto reply = es.execute_rpc(provider, rpc_entity, return_output_entity);
-    REQUIRE(reply);
-
-    auto get_schema_rpc_output = dynamic_cast<ietf_netconf_monitoring::GetSchema::Output*>(return_output_entity.get());
-    string module = get_schema_rpc_output->data.get();
-    REQUIRE(module.compare(0, 13, "module main {") == 0);
-}
diff --git a/sdk/cpp/tests/test_json_codec.cpp b/sdk/cpp/tests/test_json_codec.cpp
index 2d3fde786..ff6a06234 100644
--- a/sdk/cpp/tests/test_json_codec.cpp
+++ b/sdk/cpp/tests/test_json_codec.cpp
@@ -90,8 +90,7 @@ TEST_CASE("json_codec_leaf_list")
 
 TEST_CASE("json_codec_identity")
 {
-    ydk::path::Repository repo{TEST_HOME};
-    NetconfServiceProvider provider(repo, "127.0.0.1", "admin", "admin", 12022);
+    NetconfServiceProvider provider("127.0.0.1", "admin", "admin", 12022);
     auto & session = provider.get_session();
     JsonSubtreeCodec jcodec{};
 
@@ -137,8 +136,7 @@ TEST_CASE("json_codec_identity")
 
 TEST_CASE("json_codec_identity_subtree")
 {
-    ydk::path::Repository repo{TEST_HOME};
-    NetconfServiceProvider provider(repo, "127.0.0.1", "admin", "admin", 12022);
+    NetconfServiceProvider provider("127.0.0.1", "admin", "admin", 12022);
     auto & session = provider.get_session();
     JsonSubtreeCodec jcodec{};
 
diff --git a/sdk/cpp/tests/test_netconf_service.cpp b/sdk/cpp/tests/test_netconf_service.cpp
index a5f5ec21f..c13a921fc 100644
--- a/sdk/cpp/tests/test_netconf_service.cpp
+++ b/sdk/cpp/tests/test_netconf_service.cpp
@@ -165,8 +165,7 @@ TEST_CASE("get_edit_copy_config")
 
 TEST_CASE("iana_if_type_filter")
 {
-    path::Repository repo{TEST_HOME};
-    NetconfServiceProvider provider{repo, "127.0.0.1", "admin", "admin", 12022};
+    NetconfServiceProvider provider{"127.0.0.1", "admin", "admin", 12022};
     NetconfService ns{};
 
     // Buils some configuration
@@ -442,8 +441,7 @@ TEST_CASE("create_get_non_top")
 
 TEST_CASE("get_openconfig_interfaces_and_bgp")
 {
-    ydk::path::Repository repo{TEST_HOME};
-    NetconfServiceProvider provider{repo, "127.0.0.1", "admin", "admin", 12022};
+    NetconfServiceProvider provider{"127.0.0.1", "admin", "admin", 12022};
     ydk::path::RootSchemaNode& schema = provider.get_session().get_root_schema();
 
     // Add BGP and interface configuration
diff --git a/sdk/cpp/tests/test_on_demand_loading.cpp b/sdk/cpp/tests/test_on_demand_loading.cpp
index 52981a567..578a31061 100644
--- a/sdk/cpp/tests/test_on_demand_loading.cpp
+++ b/sdk/cpp/tests/test_on_demand_loading.cpp
@@ -128,9 +128,6 @@ TEST_CASE("on_demand_loading_xml")
 
     auto cpython = codec.decode(root_schema, AUGMENTED_XML_PAYLOAD, ydk::EncodingFormat::XML);
     REQUIRE(cpython);
-
-    auto xml = codec.encode(*cpython, ydk::EncodingFormat::XML, true);
-    std::cout << xml << std::endl;
 }
 
 TEST_CASE("on_demand_provider_loading_xml")
diff --git a/sdk/cpp/tests/test_path_api.cpp b/sdk/cpp/tests/test_path_api.cpp
index 129103c89..d7a796885 100644
--- a/sdk/cpp/tests/test_path_api.cpp
+++ b/sdk/cpp/tests/test_path_api.cpp
@@ -1,7 +1,7 @@
 /* ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems, All rights reserved.
- -------------------------------------------------------------------
+ Copyright 2016 Cisco Systems, All rights reserved.
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
@@ -21,7 +21,6 @@
  ------------------------------------------------------------------*/
 
 #include <iostream>
-#include <fstream>
 #include <spdlog/spdlog.h>
 
 #include "config.hpp"
@@ -292,6 +291,7 @@ TEST_CASE( "get_config"  )
 TEST_CASE( "bgp_xr_openconfig"  )
 {
     ydk::path::Repository repo{TEST_HOME};
+
     ydk::path::NetconfSession session{repo,"127.0.0.1", "admin", "admin",  12022};
     ydk::path::RootSchemaNode& schema = session.get_root_schema();
 
@@ -389,8 +389,7 @@ TEST_CASE( "bgp_xr_openconfig"  )
 
 TEST_CASE("oc_interface")
 {
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::path::NetconfSession session{repo, "127.0.0.1", "admin", "admin", 12022};
+    ydk::path::NetconfSession session{"127.0.0.1", "admin", "admin", 12022};
     ydk::path::RootSchemaNode& schema = session.get_root_schema();
 
     auto & runner = schema.create_datanode("openconfig-interfaces:interfaces", "");
@@ -411,8 +410,7 @@ TEST_CASE("oc_interface")
 
 TEST_CASE("oc_routing")
 {
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::path::NetconfSession session{repo, "127.0.0.1", "admin", "admin", 12022};
+    ydk::path::NetconfSession session{"127.0.0.1", "admin", "admin", 12022};
     ydk::path::RootSchemaNode& schema = session.get_root_schema();
 
     auto & runner = schema.create_datanode("openconfig-routing-policy:routing-policy", "");
@@ -434,6 +432,7 @@ TEST_CASE("oc_routing")
 TEST_CASE("multiple_delete_create_read_rpc")
 {
     ydk::path::Repository repo{TEST_HOME};
+
     ydk::path::NetconfSession session{repo,"127.0.0.1", "admin", "admin",  12022};
     ydk::path::RootSchemaNode& schema = session.get_root_schema();
     ydk::path::Codec s{};
@@ -533,13 +532,12 @@ TEST_CASE("get_schema_decode")
     ydk::path::Codec s{};
 
     auto rpc = schema.create_rpc("ietf-netconf-monitoring:get-schema");
-    rpc->get_input_node().create_datanode("identifier", "main");
+    rpc->get_input_node().create_datanode("identifier", "ydktest-sanity-action");
 
-    auto reply = (*rpc)(session);
-    REQUIRE(reply);
+    auto o = (*rpc)(session);
 
-    auto xml = s.encode(*reply, ydk::EncodingFormat::XML, true);
-    // cout<<xml<<endl;
+    auto xml = s.encode(*o, ydk::EncodingFormat::XML, true);
+    cout<<xml<<endl;
 }
 /* TODO
 TEST_CASE("oc_optic")
@@ -620,8 +618,7 @@ TEST_CASE("test_embedded_ampersand_path") {
 
 TEST_CASE( "decode_encode_interfaces_with_filters" )
 {
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::path::NetconfSession session{repo, "127.0.0.1", "admin", "admin", 12022};
+    ydk::path::NetconfSession session{"127.0.0.1", "admin", "admin", 12022};
     ydk::path::RootSchemaNode& root = session.get_root_schema();
 
     auto ifcs = ydktest::openconfig_interfaces::Interfaces();
@@ -655,14 +652,6 @@ const std::string ifc_payload = R"(<interfaces xmlns="http://openconfig.net/yang
 </interfaces>
 )";
 
-static bool copyFile(const char *SRC, const char* DEST)
-{
-    std::ifstream src(SRC, std::ios::binary);
-    std::ofstream dest(DEST, std::ios::binary);
-    dest << src.rdbuf();
-    return src && dest;
-}
-
 TEST_CASE("iana_if_type_decode")
 {
     // Remove iana-if-type.yang file from repository to assure correct test flow
@@ -671,13 +660,6 @@ TEST_CASE("iana_if_type_decode")
         path += "/.ydk/127.0.0.1/iana-if-type.yang";
         cout << "Deleting file " << path << endl;
         remove(path.c_str());
-
-        // Copy ietf-interfaces.yang to repository to correct issue with confd 7.3
-        path = env_p;
-        string dst = path + "/.ydk/127.0.0.1/ietf-interfaces.yang";
-        string src = TEST_HOME;
-        src += "/ietf-interfaces.yang";
-        copyFile(src.c_str(), dst.c_str());
     }
 
     ydk::path::NetconfSession session{"127.0.0.1", "admin", "admin", 12022};
@@ -763,7 +745,7 @@ TEST_CASE( "rpc_get_schema_no_decode" )
     ydk::path::RootSchemaNode& schema = session.get_root_schema();
 
     auto rpc = schema.create_rpc("ietf-netconf-monitoring:get-schema");
-    rpc->get_input_node().create_datanode("identifier", "main");
+    rpc->get_input_node().create_datanode("identifier", "ydktest-sanity-action");
 
     auto reply = session.execute_netconf_operation(*rpc);
     REQUIRE(!reply.empty());
diff --git a/sdk/cpp/tests/test_restconf_provider.cpp b/sdk/cpp/tests/test_restconf_provider.cpp
index 869ff30ac..3b1201b82 100644
--- a/sdk/cpp/tests/test_restconf_provider.cpp
+++ b/sdk/cpp/tests/test_restconf_provider.cpp
@@ -1,6 +1,5 @@
 /*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2017-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -13,13 +12,7 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
  ------------------------------------------------------------------*/
-
 #include <string.h>
 #include <iostream>
 
@@ -34,7 +27,7 @@ using namespace ydk;
 using namespace std;
 
 
-TEST_CASE("restconf_provider_crud")
+TEST_CASE("CreateDelRead")
 {
     ydk::path::Repository repo{TEST_HOME};
     ydk::RestconfServiceProvider provider{repo, "localhost", "admin", "admin", 12306, EncodingFormat::JSON};
@@ -82,7 +75,7 @@ TEST_CASE("restconf_provider_crud")
     (*update_rpc)(provider.get_session());
 }
 
-TEST_CASE("restconf_provider_action")
+TEST_CASE("ActionRest")
 {
     ydk::path::Repository repo{TEST_HOME};
     ydk::RestconfServiceProvider provider{repo, "localhost", "admin", "admin", 12306, EncodingFormat::JSON};
@@ -94,42 +87,3 @@ TEST_CASE("restconf_provider_action")
     auto & runner = schema.create_datanode("ydktest-sanity-action:data");
     REQUIRE_THROWS_AS((runner)(provider.get_session()), ydk::YOperationNotSupportedError);
 }
-
-TEST_CASE("restconf_session_crud")
-{
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::path::RestconfSession session{repo, "localhost", "admin", "admin", 12306, EncodingFormat::JSON};
-    ydk::path::RootSchemaNode& schema = session.get_root_schema();
-    ydk::path::Codec s{};
-
-    //first delete
-    auto & runner = schema.create_datanode("ydktest-sanity:runner", "");
-
-    std::shared_ptr<ydk::path::Rpc> delete_rpc { schema.create_rpc("ydk:delete") };
-    auto json = s.encode(runner, EncodingFormat::JSON, false);
-    delete_rpc->get_input_node().create_datanode("entity", json);
-    (*delete_rpc)(session);
-
-    // config
-    runner.create_datanode("ytypes/built-in-t/number8", "3");
-    json = s.encode(runner, EncodingFormat::JSON, false);
-    CHECK( !json.empty());
-
-    std::shared_ptr<ydk::path::Rpc> create_rpc { schema.create_rpc("ydk:create") };
-    create_rpc->get_input_node().create_datanode("entity", json);
-    (*create_rpc)(session);
-
-    //read
-    auto & runner_read = schema.create_datanode("ydktest-sanity:runner", "");
-    json = s.encode(runner_read, EncodingFormat::JSON, false);
-
-    std::shared_ptr<ydk::path::Rpc> read_rpc { schema.create_rpc("ydk:read") };
-    read_rpc->get_input_node().create_datanode("filter", json);
-    auto read_result = (*read_rpc)(session);
-    CHECK( read_result != nullptr );
-    json = s.encode(*read_result, EncodingFormat::JSON, false);
-    CHECK( R"({"ydktest-sanity:runner":{"ytypes":{"built-in-t":{"number8":3}}}})" == json );
-
-    // delete config
-    (*delete_rpc)(session);
-}
diff --git a/sdk/cpp/tests/test_sanity_codec.cpp b/sdk/cpp/tests/test_sanity_codec.cpp
index 42d0569f2..a4bc175bc 100644
--- a/sdk/cpp/tests/test_sanity_codec.cpp
+++ b/sdk/cpp/tests/test_sanity_codec.cpp
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -599,115 +599,3 @@ TEST_CASE( "test_codec_action_node" )
     auto xml_reply = s.encode(*reply_dn, EncodingFormat::XML, false);
     REQUIRE(xml_reply==R"(<data xmlns="http://cisco.com/ns/yang/ydktest-action"><action-node><t>ok</t></action-node></data>)");
 }
-
-TEST_CASE("test_codec_augment_subtree_xml")
-{
-    CodecServiceProvider codec_provider{EncodingFormat::XML};
-    CodecService codec_service{};
-
-    auto passive = make_unique<ydktest_sanity::Runner::Passive>();
-    passive->name = "xyz";
-
-    auto ifc = make_shared<ydktest_sanity::Runner::Passive::Interfac>();
-    ifc->test = "abc";
-    passive->interfac.append(ifc);
-
-    passive->testc->xyz = make_shared<ydktest_sanity::Runner::Passive::Testc::Xyz>();
-    passive->testc->xyz->parent = passive.get();
-    passive->testc->xyz->xyz = 25;
-
-    auto xml = codec_service.encode(codec_provider, *passive, true);
-    string expected = R"(<passive xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <name>xyz</name>
-  <interfac>
-    <test>abc</test>
-  </interfac>
-  <testc xmlns="http://cisco.com/ns/yang/ydktest-sanity-augm">
-    <xyz>
-      <xyz>25</xyz>
-    </xyz>
-  </testc>
-</passive>)";
-    CHECK(expected == xml);
-    auto entity = codec_service.decode(codec_provider, xml, make_shared<ydktest_sanity::Runner::Passive>(), true);
-    CHECK(*passive == *entity);
-}
-
-TEST_CASE("test_codec_augment_subtree_json")
-{
-    CodecServiceProvider codec_provider{EncodingFormat::JSON};
-    CodecService codec_service{};
-
-    auto passive = make_unique<ydktest_sanity::Runner::Passive>();
-    passive->name = "xyz";
-
-    auto ifc = make_shared<ydktest_sanity::Runner::Passive::Interfac>();
-    ifc->test = "abc";
-    passive->interfac.append(ifc);
-
-    passive->testc->xyz = make_shared<ydktest_sanity::Runner::Passive::Testc::Xyz>();
-    passive->testc->xyz->parent = passive.get();
-    passive->testc->xyz->xyz = 25;
-
-    auto json = codec_service.encode(codec_provider, *passive, false, true);
-    CHECK(R"({"ydktest-sanity:passive":{"interfac":[{"test":"abc"}],"name":"xyz","ydktest-sanity-augm:testc":{"xyz":{"xyz":25}}}})"
-          == json);
-    auto entity = codec_service.decode(codec_provider, json, make_shared<ydktest_sanity::Runner::Passive>(), true);
-    CHECK(*passive == *entity);
-}
-
-TEST_CASE("test_codec_bool_list")
-{
-    CodecServiceProvider codec_provider{EncodingFormat::XML};
-    CodecService codec_service{};
-
-    auto runner = make_unique<ydktest_sanity::Runner>();
-
-    auto bool_list_elem = make_shared<ydktest_sanity::Runner::Ytypes::BuiltInT::BoolList>();
-    bool_list_elem->bool_leaf = true;
-    runner->ytypes->built_in_t->bool_list.append(bool_list_elem);
-
-    auto xml = codec_service.encode(codec_provider, *runner, true);
-
-    auto expected = R"(<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <ytypes>
-    <built-in-t>
-      <bool-list>
-        <bool-leaf>true</bool-leaf>
-      </bool-list>
-    </built-in-t>
-  </ytypes>
-</runner>
-)";
-    CHECK(expected == xml);
-
-    auto entity = codec_service.decode(codec_provider, xml, make_shared<ydktest_sanity::Runner>(), true);
-    CHECK(*runner == *entity);
-}
-
-TEST_CASE("test_codec_bool_leaf_list")
-{
-    CodecServiceProvider codec_provider{EncodingFormat::XML};
-    CodecService codec_service{};
-
-    auto runner = make_unique<ydktest_sanity::Runner>();
-
-    runner->ytypes->built_in_t->bool_leaf_list.append(true);
-    runner->ytypes->built_in_t->bool_leaf_list.append(false);
-
-    auto xml = codec_service.encode(codec_provider, *runner, true);
-
-    auto expected = R"(<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <ytypes>
-    <built-in-t>
-      <bool-leaf-list>true</bool-leaf-list>
-      <bool-leaf-list>false</bool-leaf-list>
-    </built-in-t>
-  </ytypes>
-</runner>
-)";
-    CHECK(expected == xml);
-
-    auto entity = codec_service.decode(codec_provider, xml, make_shared<ydktest_sanity::Runner>(), true);
-    CHECK(*runner == *entity);
-}
diff --git a/sdk/cpp/tests/test_sanity_types.cpp b/sdk/cpp/tests/test_sanity_types.cpp
index 953194be4..46aa5706a 100644
--- a/sdk/cpp/tests/test_sanity_types.cpp
+++ b/sdk/cpp/tests/test_sanity_types.cpp
@@ -692,25 +692,25 @@ TEST_CASE("test_cascading_types")
     SECTION ( "unknown" )
     {
         ctypes->comp_insttype = ydktest_sanity::CompInstType::unknown;
-        ctypes->comp_nicinsttype = ydktest_sanity::CompNicInstType::unknown;
+        ctypes->comp_nicinsttype = ydktest_sanity::CompInstType_::unknown;
     }
 
     SECTION ( "phys" )
     {
         ctypes->comp_insttype = ydktest_sanity::CompInstType::phys;
-        ctypes->comp_nicinsttype = ydktest_sanity::CompNicInstType::phys;
+        ctypes->comp_nicinsttype = ydktest_sanity::CompInstType_::phys;
     }
 
     SECTION ( "virt" )
     {
         ctypes->comp_insttype = ydktest_sanity::CompInstType::virt;
-        ctypes->comp_nicinsttype = ydktest_sanity::CompNicInstType::virt;
+        ctypes->comp_nicinsttype = ydktest_sanity::CompInstType_::virt;
     }
 
     SECTION ( "hv" )
     {
         ctypes->comp_insttype = ydktest_sanity::CompInstType::hv;
-        ctypes->comp_nicinsttype = ydktest_sanity::CompNicInstType::hv;
+        ctypes->comp_nicinsttype = ydktest_sanity::CompInstType_::hv;
     }
     reply = crud.create(provider, *ctypes);
     REQUIRE(reply);
diff --git a/sdk/cpp/tests/test_xml_subtree.cpp b/sdk/cpp/tests/test_xml_subtree.cpp
index 7d8148666..ff4090f06 100644
--- a/sdk/cpp/tests/test_xml_subtree.cpp
+++ b/sdk/cpp/tests/test_xml_subtree.cpp
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -367,38 +367,6 @@ TEST_CASE("xml_codec_augment_presence")
     REQUIRE(xmlX == xml_runner);
 }
 
-TEST_CASE("xml_codec_augment_subtree")
-{
-    ydk::path::Repository repo{TEST_HOME};
-    ydk::path::NetconfSession session{repo, "127.0.0.1", "admin", "admin", 12022};
-    XmlSubtreeCodec xml_codec{};
-
-    auto passive = make_unique<ydktest_sanity::Runner::Passive>();
-    passive->name = "xyz";
-
-    auto ifc = make_shared<ydktest_sanity::Runner::Passive::Interfac>();
-    ifc->test = "abc";
-    passive->interfac.append(ifc);
-
-    passive->testc->xyz = make_shared<ydktest_sanity::Runner::Passive::Testc::Xyz>();
-    passive->testc->xyz->parent = passive.get();
-    passive->testc->xyz->xyz = 25;
-
-    auto xml = xml_codec.encode(*passive, session.get_root_schema());
-    string expected = R"(<passive xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <name>xyz</name>
-  <interfac>
-    <test>abc</test>
-  </interfac>
-  <testc xmlns="http://cisco.com/ns/yang/ydktest-sanity-augm">
-    <xyz>
-      <xyz>25</xyz>
-    </xyz>
-  </testc>
-</passive>)";
-    CHECK(expected == xml);
-}
-
 static void config_bgp(openconfig_bgp::Bgp & bgp)
 {
     bgp.global->config->as = 65172;
@@ -446,32 +414,3 @@ TEST_CASE( "xml_codec_on_user_bundle" )
 </bgp>)";
     REQUIRE(expected == xml_bgp_config);
 }
-
-TEST_CASE( "xml_codec_decode_leaflist" )
-{
-    auto repo = path::Repository{TEST_HOME};
-    std::vector<path::Capability> empty_caps;
-    auto root = repo.create_root_schema(empty_caps);
-    XmlSubtreeCodec xml_codec{};
-
-    auto runner = ydktest_sanity::Runner();
-    runner.ytypes->built_in_t->llstring.append("abc");
-    runner.ytypes->built_in_t->llstring.append("klm");
-    runner.ytypes->built_in_t->llstring.append("xyz");
-
-    auto xml = xml_codec.encode(runner, *root);
-    CHECK(xml == R"(<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <ytypes>
-    <built-in-t>
-      <llstring>abc</llstring>
-      <llstring>klm</llstring>
-      <llstring>xyz</llstring>
-    </built-in-t>
-  </ytypes>
-</runner>)");
-
-    auto top_entity = make_shared<ydktest_sanity::Runner>();
-    auto entity = xml_codec.decode(xml, top_entity);
-    auto runner_d = dynamic_cast<ydktest_sanity::Runner*>(entity.get());
-    CHECK(*runner_d == runner);
-}
diff --git a/sdk/go/CHANGES.md b/sdk/go/CHANGES.md
index 6ed55e9bc..6e198b546 100644
--- a/sdk/go/CHANGES.md
+++ b/sdk/go/CHANGES.md
@@ -1,33 +1,3 @@
-### 2023-01-30 version 0.8.6.4
-
-#### New features and enhancements
-  * install_ydk.sh: Installation of Python and Go YDK packages should not require root access ([#1069](https://github.com/CiscoDevNet/ydk-gen/issues/1069))
-
-
-### 2021-09-30 version 0.8.6
-
-#### New features and enhancements
-  * Create go wrapper for NetconfSession and other path APIs ([#779](https://github.com/CiscoDevNet/ydk-gen/issues/779))
-  * Added SSL support for NetconfServiceProvider in Go
-
-#### Resolved GitHub issues
-  * Go function EntityEqual result depends on parameters order ([#1053](https://github.com/CiscoDevNet/ydk-gen/issues/1053))
-
-
-### 2021-04-30 version 0.8.5.2
-
-#### Resolved GitHub issues
-  * Version numbers in bundle resolver to comply with PEP 440 ([#1007](https://github.com/CiscoDevNet/ydk-gen/issues/1007))
-  * The Executor Service fails to return module content to user ([#1035](https://github.com/CiscoDevNet/ydk-gen/issues/1035))
-  * Docker base image python error ([#1036](https://github.com/CiscoDevNet/ydk-gen/issues/1036))
-
-#### Other resolved issues and enhancements
-  * Fixed few minor bugs in C++ code
-  * Added installation of flex and bison for CentOS platform
-  * Added scripts for local unit testing of YDK release
-  * Tested YDK on Windows 10 using Windows Subsystem for Linux and Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) virtual machines.
-
-
 ### 2020-06-30 version 0.8.5
 
 #### New features and enhancements
diff --git a/sdk/go/README.md b/sdk/go/README.md
index 17ded08a1..bec5a68ca 100644
--- a/sdk/go/README.md
+++ b/sdk/go/README.md
@@ -31,21 +31,17 @@
 
 ![ydk-logo-128](https://cloud.githubusercontent.com/assets/16885441/24175899/2010f51e-0e56-11e7-8fb7-30a9f70fbb86.png)
 
-YANG Development Kit (Go)
-=========================
+# YANG Development Kit (Go)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**
 
 - [Overview](#overview)
-- [Backward Compatibility](#backward-compatibility)
 - [Docker](#docker)
-- [System Requirements](#system-requirements)
-- [Core Installation](#core-installation)
-  - [Installation script](#installation-script)
-  - [Building from source](#building-from-source)
-- [Adding gNMI service](#adding-gnmi-service)
+- [How to Install](#how-to-install)
+  - [System Requirements](#system-requirements)
+  - [gNMI Requirements](#gnmi-requirements)
 - [Documentation and Support](#documentation-and-support)
 - [Release Notes](#release-notes)
 
@@ -53,211 +49,221 @@ YANG Development Kit (Go)
 
 ## Overview
 
-**YDK** is a developer tool that allows generate YANG model API's in multiple languages and provides services
-to apply generated API over multiple communication protocols.
-Currently supported languages are: Python, Go and C++.
-Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
-YDK provides CRUD and protocol specific service over above protocols.
-YDK also provides Codec service to translate API models to/from XML and JSON encoded strings.
-
-## Backward Compatibility
-
-The Go generated API starting from YDK-0.7.3 is fully compatible with YDK-0.9.0.
-
-**NOTE.** Starting from release 0.8.5 the YDK does not support Python2 interpreter as it was deprecated.
+The YANG Development Kit (YDK) is a Software Development Kit that provides API's that are modeled in YANG. The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles that are based on YANG models.  
 
 ## Docker
 
 Currently the [docker image](https://docs.docker.com/engine/reference/run/) for ydk-go is not been generated.
-Please use docker image below, which has complete environment for ydk-go based development.
-
-The [docker image](https://docs.docker.com/engine/reference/run/) is automatically built with the latest ydk-gen
-commit to git repository. 
-The docker image is used to run YDK based apps without installing anything natively on your machine.
+Please use [ydk-gen](https://github.com/ygorelik/ydk-gen/tree/0.8.5#docker>) docker image, which has complete environment for ydk-go based development.
 
-To use the docker image, [install docker](https://docs.docker.com/install/) on your system and run the below command.
-See the [docker documentation](https://docs.docker.com/engine/reference/run/) for more details.
+<!---
+A [docker image](https://docs.docker.com/engine/reference/run/) is automatically built with the latest ydk-go installed. This be used to run ydk-go without installing anything natively on your machine.
+
+To use the docker image, [install docker](https://docs.docker.com/install/) on your system and run the below command. See the [docker documentation](https://docs.docker.com/engine/reference/run/) for more details.
 
 ```
-docker run -it ydksolutions/ydk-gen:0.8.6.4
+  docker run -it ydkdev/ydk-go
 ```
+-->
 
-## System Requirements
+## How to Install
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x 
- - MacOS up to 11.6.2 (Big Sur)
+You can install YDK-Go on macOS or Linux.  It is not currently supported on Windows.
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check [this](https://www.windowscentral.com/install-windows-subsystem-linux-windows-10) for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+### System Requirements
+#### Linux
+##### Ubuntu (Debian-based)
 
-On supported platforms the YDK can be installed using [installation script](#installation-script).
-On other platforms the YDK should be installed manually [from source](#building-from-source).
-For both the methods the user must install `git` package prior to the installation procedure.
+The following packages must be present in your system before installing YDK-Go:
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+Install third-party dependency software:
 
-## Core Installation
+```
+  sudo apt-get install gdebi-core python3-dev python-dev libtool-bin
+  sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
+```
 
-### Installation script
+Install YDK core library:
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
+For Xenial (Ubuntu 16.04.4):
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-For different location the PYTHON_VENV environment variable should be set to that location.
+```
+  # Upgrade compiler to gcc 5.*
+  sudo apt-get install gcc-5 g++-5 -y > /dev/null
+  sudo ln -sf /usr/bin/g++-5 /usr/bin/g++
+  sudo ln -sf /usr/bin/gcc-5 /usr/bin/gcc
 
-**NOTE.** It is strongly recommended to use Python virtual environment on Centos/RHEL and Mac platforms.
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
+```
 
-When installing YDK for Go programming language, the third party dependencies and C++ packages must be installed first.
-These steps require sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Go programming language and Python virtual environment:
+For Bionic (Ubuntu 18.04.1):
 
 ```
-git clone https://github.com/CiscoDevNet/ydk-gen.git
-cd ydk-gen
-export YDKGEN_HOME=`pwd`  # optional
-export PYTHON_VENV=$HOME/ydk_vne  # optional
-./install_ydk.sh --cpp --core --venv
-./install_ydk.sh --go --core --venv
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
 ```
 
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this:
+#### Centos (Fedora-based)
+
+The following packages must be present in your system before installing YDK-Go:
 
 ```
-./install_ydk.sh --help
-usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-Options and arguments:
-  --cpp                 install YDK for C++ programming language;
-                        requires sudo access for dependencies and libraries installation
-  --go                  install YDK for Go programming language
-  --py|--python         install YDK for Python programming language
-  --all                 install YDK for all available programming languages;
-                        requires sudo access for dependencies and libraries installation
-  -v|--venv             create python virtual environment
-  -c|--core             install YDK core package
-  -s|--service gnmi     install gNMI service package
-  -n|--no-deps          skip installation of dependencies;
-                        applicable only with --cpp and --all options
-  -h|--help             print this help message and exit
+  sudo yum install epel-release
+  sudo yum install libxml2-devel libxslt-devel libssh-devel libtool gcc-c++ pcre-devel cmake libstdc++-static git
 
-Environment variables:
-YDKGEN_HOME         specifies location of ydk-gen git repository;
-                    if not set, $HOME/ydk-gen is assumed
-PYTHON_VENV         specifies location of python virtual environment;
-                    if not set, $HOME/venv is assumed
-GOROOT              specifies installation directory of go software;
-                    if not set, /usr/local/go is assumed
-GOPATH              specifies location of go source directory;
-                    if not set, $HOME/go is assumed
-C_INCLUDE_PATH      location of C include files;
-                    if not set, /usr/local/include is assumed
-CPLUS_INCLUDE_PATH  location of C++ include files;
-                    if not set, /usr/local/include is assumed
-CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                    if not set, default system library location is assumed
+  # Install gcc-5 and g++-5
+  yum install centos-release-scl -y > /dev/null
+  yum install devtoolset-4-gcc* -y > /dev/null
+  ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/gcc
+  ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++
+
+  # Install YDK core library
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 ```
 
-If user environment is different from the default one (different Python installation or different
-location of libraries) then building from source method should be used.
+#### Mac OS
+
+It is recommended to install [homebrew](http://brew.sh) and Xcode command line tools on your system before installing YDK-Go:
+
+```
+  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  brew install pkg-config libssh libxml2 xml2 curl pcre cmake
+  xcode-select --install
 
-### Building from source
+  # Install YDK core library
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+  sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+```
 
-#### Environment variables
+#### Libssh installation
 
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the header location must be specified explicitly (in below commands the default location is shown):
+Please note that libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. Therefore, if after installation of libssh package you find that the `libssh_threads.a` library is missing,
+please downgrade the installation of libssh to version 0.7.6, or upgrade to 0.8.1 or higher. Example:
 
 ```
-  export C_INCLUDE_PATH=/usr/local/include
-  export CPLUS_INCLUDE_PATH=/usr/local/include
+  wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+  tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
+  mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
+  cmake ..
+  sudo make install
 ```
 
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
+### Golang
 
-#### Installing third party dependencies
+The YDK requires Go version 1.9.2 or higher. If this is not the case, follow below installation steps. Make sure that environment variables GOROOT and GOPATH are properly set.
 
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script. 
-The script will also install Python virtual environment in default or specified location, when '--venv' is specified.
+#### Linux
 
 ```
-# Clone ydk-gen from GitHub
-git clone https://github.com/CiscoDevNet/ydk-gen.git
-cd ydk-gen
+  sudo wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz &> /dev/null
+  sudo tar -zxf  go1.9.2.linux-amd64.tar.gz -C /usr/local/
+  export GOROOT="/usr/local/go"
+  export PATH=$GOROOT/bin:$PATH
+```
 
-# Define optional environment variables and install dependencies
-export YDKGEN_HOME=`pwd`  
-export PYTHON_VENV=$HOME/ydk_venv
-./install_ydk.sh
+#### Mac OS
+
+```
+  export CGO_ENABLED=0
+  export GOROOT_BOOTSTRAP=$GOROOT
+  gvm install go1.9.2
 ```
 
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
- 
-#### Installing core components
+#### Runtime Setting
 
-Please follow this procedure to install YDK core components for Go apps development:
+For security reasons starting from Go version 1.10 only a limited set of flags is allowed in the CGO code, notably -D, -I, and -l.
+Current ydk-go code includes few additional CGO LDFLAGS flags in order to allow coverage testing; they are: "-fprofile-arcs -ftest-coverage --coverage". In order to allow these additional flags to be used, it is necessary to set environment variable CGO_LDFLAGS_ALLOW before running ydk-go based application:
 
 ```
-# If created, activate Python virtual environment
-source $PYTHON_VENV/bin/activate
+  export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
+```
 
-# Generate and install YDK core library
-python3 generate.py -is --core --cpp
+### gNMI Requirements
 
-# Generate and install YDK-Go core package
-python3 generate.py -i --core --go
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
 
+#### Install protobuf and protoc
+
+```
+  wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+  unzip protobuf-cpp-3.5.0.zip
+  cd protobuf-3.5.0
+  ./configure
+  make
+  sudo make install
+  sudo ldconfig
 ```
 
-## Adding gNMI Service
+#### Install gRPC
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package. 
+```
+  git clone -b v1.9.1 https://github.com/grpc/grpc
+  cd grpc
+  git submodule update --init
+  make
+  sudo make install
+  sudo ldconfig
+```
+
+#### Install gNMI library
 
-### gNMI service installation
+##### Linux
+
+For Ubuntu/Xenial:
+
+```
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+```
+
+For Ubuntu/Bionic:
+
+```
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+```
 
-Here is simple example how gNMI service package for Go programming language and Python virtual environment could be added:
+For CentOS
 
 ```
-cd ydk-gen
-./install_ydk.sh --cpp --service gnmi --venv  # requires sudo access
-./install_ydk.sh --go --service gnmi --venv
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
 ```
 
-### Runtime environment
+##### MacOS:
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
+```
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+  sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
+```
+
+#### Runtime environment
+
+There is an open issue with gRPC on Centos/Fedora, which requires an extra step before running any YDK gNMI application.
 See this issue on [GRPC GitHub](https://github.com/grpc/grpc/issues/10942#issuecomment-312565041) for details.
 As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
 
 ```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+  PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
+```
+
+### YDK Go Source
+
+You can download the latest YDK Go source code, which include core, and model bundles, from GitHub:
+
+```
+  go get github.com/CiscoDevNet/ydk-go/ydk
 ```
 
 ## Documentation and Support
-- Read the [API documentation](http://ydk.cisco.com/go/docs) (release 0.8.3) for details on how to use the API and specific models
+- Read the [API documentation](http://ydk.cisco.com/go/docs) for details on how to use the API and specific models
 - Samples can be found under the [samples directory](https://github.com/CiscoDevNet/ydk-go/tree/master/samples)
 - Additional samples can be found in the [YDK-Go samples repository](https://github.com/CiscoDevNet/ydk-go-samples) (coming soon)
-- Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with YDK users and developers
+- Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with other users and with the makers of YDK
+- Additional YDK information can be found at [ydk.io](http://ydk.io)
 
 ## Release Notes
 
-The current YDK release version is 0.8.6.4.
-
-YDK is licensed under the Apache 2.0 License.
+The current YDK release version is 0.8.5. YDK-Go is licensed under the Apache 2.0 License.
diff --git a/sdk/go/core/README.md b/sdk/go/core/README.md
new file mode 100644
index 000000000..54d39fc2e
--- /dev/null
+++ b/sdk/go/core/README.md
@@ -0,0 +1,33 @@
+## YDK GO Core and Bundle Installation
+
+The YDK requires Go version 1.9 or higher. Make sure that corresponding software is installed and environment variables GOROOT and GOPATH are properly set before the YDK installation. Follow System Requirements [here](https://github.com/CiscoDevNet/ydk-gen/tree/master/sdk/go#system-requirements).
+
+### YDK core and model bundle installation
+
+First, install [C++ core](https://github.com/CiscoDevNet/ydk-gen#second-step-generate--install-the-core). Then execute the below steps to install the ydk go core and bundle packages.
+
+```
+  go get gopkg.in/stretchr/testify.v1
+  cd /your-path-to-ydk-gen
+  export GOPATH=/your-path-to-go-packages-installation-directory
+  ./generate.py -i --core --go
+  ./generate.py -i --bundle profiles/test/ydktest-cpp.json --go
+```
+
+For security reasons starting from Go version 1.10 only a limited set of flags is allowed in the CGO code, notably -D, -I, and -l.
+Current ydk-go code includes few additional CGO LDFLAGS flags in order to allow coverage testing; they are: "-fprofile-arcs -ftest-coverage --coverage". In order to allow these additional flags to be used, it is necessary to set environment variable CGO_LDFLAGS_ALLOW before running ydk-go based application. Here is how the sample applications could be executed with Go 1.10.x:
+
+```
+  export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
+  go run samples/cgo_path/cgo_path.go
+  go run samples/bgp_create/bgp_create.go
+  go run samples/bgp_read/bgp_read.go
+```
+
+To run YDK sanity tests execute:
+
+```
+  cd /your-path-to-ydk-gen
+  cd sdk/go/core/tests
+  go test
+```
diff --git a/sdk/go/core/docsgen/api/path/_path_api.rst b/sdk/go/core/docsgen/api/path/_path_api.rst
index 91038f06f..a67fb3fe2 100644
--- a/sdk/go/core/docsgen/api/path/_path_api.rst
+++ b/sdk/go/core/docsgen/api/path/_path_api.rst
@@ -1,31 +1,3 @@
-..
-  # *************************************************************
-  #  YDK - YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 YDK Path API
 ============
 
@@ -41,5 +13,4 @@ YDK Go provides a new interface in the form of Path API, which can be used to wr
     :maxdepth: 2
 
     path.rst
-    netconf_session.rst
-    restconf_session.rst
+
diff --git a/sdk/go/core/docsgen/api/path/netconf_session.rst b/sdk/go/core/docsgen/api/path/netconf_session.rst
deleted file mode 100644
index dd3f143e8..000000000
--- a/sdk/go/core/docsgen/api/path/netconf_session.rst
+++ /dev/null
@@ -1,115 +0,0 @@
-..
-  # *************************************************************
-  #  YDK - YANG Development Kit
-  #  Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-
-Netconf Session
-===============
-
-.. go:package:: ydk/path
-    :synopsis:  Path API via Netconf
-
-.. go:struct:: NetconfSession
-
-	The NetconfSession is an implementation of Session for the `NETCONF protocol <https://tools.ietf.org/html/rfc6241>`_.
-	The sructure `NetconfSession` includes the following attributes:
-
-	.. attribute:: Repo
-
-		An instance of :go:struct:`Repository<ydk/types/Repository>`. This attribute represents the repository of YANG models.
-		When not specified, the model repository path is set to `$HOME/.ydk`.
-
-	.. attribute:: Address
-
-		A Go ``string`` that represents an IP address of the device supporting a Netconf protocol. This attribute
-		must be set during initialization.
-
-	.. attribute:: Username
-
-		A Go ``string`` that represents a username to log in to the device. This attribute
-		must be set during initialization.
-
-	.. attribute:: Password
-
-		A Go ``string`` that represents a password to log in to the device. This attribute
-		must be set during initialization, when `ServerCert` is not set (non SSL connections).
-
-	.. attribute:: Port
-
-		An ``int`` that represents the device port number used to access the Netconf interface. Default value - 830.
-
-	.. attribute:: Protocol
-
-		A Go ``string`` that represents protocol used to connect to the device. The allowed values are `SSH` and `TCP`.
-		When not specified, it is set to default value - `SSH`.
-
-	.. attribute:: OnDemand
-
-		A Go ``bool`` that defines how YANG modules are loaded from device to repository. Default value is `true`, meaning
-		the YANG modules are loaded to repository on-demand.
-
-	.. attribute:: CommonCache
-
-		A Go ``bool`` that defines how repositories are used for different devices. Default value is `false`, which means
-		different directories will be used for different connections. This attribute has meaning only when `Repo` is not defined.
-
-	.. attribute:: Timeout
-
-		A Go ``int`` that repesents allowed Netconf server response delay in microseconds. If not set
-		during initialization the value -1 is set by default, meaning the response delay is not limited.
-
-	.. attribute:: ServerCert
-
-		A Go ``string`` that represents full path to a file, which stores the Netconf server public key (server SSL certificate).
-		This attribute must be set for SSL connection.
-
-	.. attribute:: PrivateKey
-
-		A Go ``string`` that represents full path to a file, which stores application platform private key.
-		This attribute is optional and has meaning only when `ServerCert` is specified.
-
-The sructure `NetconfSession` defines the following methods:
-
-.. method:: Connect()
-
-	Connects to Netconf Server using Repo/Address/Username/Password/Port.
-
-.. method:: Disconnect()
-
-	Disconnects from Netconf Server.
-
-.. method:: GetState() *errors.State
-
-	Returns error state for the NetconfSession.
-
-.. method:: ExecuteRpc(rpc types.Rpc) DataNode
-
-	Sends RPC to Netconf server and gets response.
-
-	:param rpc: :go:struct:`Rpc<ydk/types/Rpc>` to be sent to Netconf server.
-	:rtype: `DataNode` - top level datanode of a tree hierarchy.
-
-.. method:: GetCapabilities()
-
-	Gets the capabilities supported by Netconf server.
-
-	:return: The list of capabilities.
-	:rtype: ``[]string``.
diff --git a/sdk/go/core/docsgen/api/path/restconf_session.rst b/sdk/go/core/docsgen/api/path/restconf_session.rst
deleted file mode 100644
index f9f244f5b..000000000
--- a/sdk/go/core/docsgen/api/path/restconf_session.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-..
-  # *************************************************************
-  #  YDK - YANG Development Kit
-  #  Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-
-Restconf Session
-================
-
-.. go:package:: ydk/path
-    :synopsis:  Path API via Restconf
-
-.. go:struct:: RestconfSession
-
-	The RestconfSession is an implementation of Session for the `Restconf protocol <https://tools.ietf.org/html/draft-ietf-netconf-restconf-18>`_.
-	The sructure `RestconfSession` includes the following attributes:
-
-	.. attribute:: Repo
-
-		An instance of :go:struct:`Repository<ydk/types/Repository>`. This attribute
-		must be set during initialization.
-
-	.. attribute:: Address
-
-		A Go ``string`` that represents an IP address of the device supporting a Restconf protocol. This attribute
-		must be set during initialization.
-
-	.. attribute:: Username
-
-		A Go ``string`` that represents a username to log in to the device. This attribute
-		must be set during initialization.
-
-	.. attribute:: Password
-
-		A Go ``string`` that represents a password to log in to the device. This attribute
-		must be set during initialization.
-
-	.. attribute:: Port
-
-		A Go ``int`` that represents the web server port number, which is used to access the Restconf Server.
-		Default value - 80.
-
-	.. attribute:: Encoding
-
-		A YDK type of :ref:`encoding-format-ydk` that represents encoding format of payload in the RPC. 
-		When not specified the `JSON` formatting is assumed.
-
-	.. attribute:: ConfigRoot
-
-		A Go ``string`` that represents root of the URL path to configuration data.
-		If not specified, it is set by default to "/data".
-
-	.. attribute:: StateRoot
-
-		A Go ``string`` that represents root of the URL path to state data.
-		If not specified, it is set by default to "/data".
-
-The sructure `RestconfSession` defines the following methods:
-
-.. method:: Connect()
-
-	Connects to Restconf Server using Repo/Address/Username/Password/Port.
-
-.. method:: Disconnect()
-
-	Disconnects from Restconf Server.
-
-.. method:: GetState() *errors.State
-
-	Returns error state for the RestconfSession.
-
-.. method:: ExecuteRpc(rpc types.Rpc) DataNode
-
-	Sends RPC to Restconf server and gets response.
-
-	:param rpc: :go:struct:`Rpc<ydk/types/Rpc>` to be sent to Restconf server.
-				The `rpc` values currently restricted to only YDK defined RPCs:
-				"ydk:create", "ydk:read", "ydk:update", and "ydk:delete".
-	:rtype: `DataNode` - top level datanode of a tree hierarchy.
-
-.. method:: GetCapabilities()
-
-	Gets the capabilities supported by Restconf server.
-
-	:return: The list of capabilities.
-	:rtype: ``[]string``.
diff --git a/sdk/go/core/docsgen/api/providers.rst b/sdk/go/core/docsgen/api/providers.rst
index 9c9882cbb..1c3dff7bf 100644
--- a/sdk/go/core/docsgen/api/providers.rst
+++ b/sdk/go/core/docsgen/api/providers.rst
@@ -1,30 +1,3 @@
-..
-  #  YDK - YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 .. _ydk-providers:
 
 Service Providers
@@ -50,19 +23,19 @@ Open Daylight
 
 		A Go ``string`` that represents the path
 
-	.. :noindex:attribute:: Address
+	.. attribute:: Address
 
 		A Go ``string`` that represents the IP address of the device supporting a open daylight interface
 
-	.. :noindex:attribute:: Username
+	.. attribute:: Username
 
 		A Go ``string`` that represents the username to log in to the device
 
-	.. :noindex:attribute:: Password
+	.. attribute:: Password
 
 		A Go ``string`` that represents the password to log in to the device
 	
-	.. :noindex:attribute:: Port
+	.. attribute:: Port
 
 		An ``int`` that represents the device port used to access the open daylight interface.
 
@@ -100,23 +73,23 @@ Netconf
 
 	NetconfServiceProvider Implementation of ServiceProvider for the NETCONF protocol: https://tools.ietf.org/html/rfc6241
 
-	.. :noindex:attribute:: Repo
+	.. attribute:: Repo
 
 		An instance of :go:struct:`Repository<ydk/types/Repository>` This attribute represents the repository of YANG models.
 
-	.. :noindex:attribute:: Address
+	.. attribute:: Address
 
 		A Go ``string`` that represents the IP address of the device supporting a netconf interface
 
-	.. :noindex:attribute:: Username
+	.. attribute:: Username
 
 		A Go ``string`` that represents the username to log in to the device
 
-	.. :noindex:attribute:: Password
+	.. attribute:: Password
 
 		A Go ``string`` that represents the password to log in to the device
 
-	.. :noindex:attribute:: Port
+	.. attribute:: Port
 
 		An ``int`` that represents the device port used to access the netconf interface.
 
@@ -124,31 +97,6 @@ Netconf
 
 		A Go ``string`` that represents protocol used to connect to the device
 
-	.. attribute:: OnDemand
-
-		A Go ``bool`` that defines how YANG modules are loaded from device to repository. Default value is `true`, meaning
-		the YANG modules are loaded to repository on-demand.
-
-	.. attribute:: CommonCache
-
-		A Go ``bool`` that defines how repositories are used for different devices. Default value is `false`, which means
-		different directories will be used for different connections. This attribute has meaning only when `Repo` is not defined.
-
-	.. attribute:: Timeout
-
-		A Go ``int`` that repesents allowed Netconf server response delay in microseconds. If not set
-		during initialization the value -1 is set by default, meaning the response delay is not limited.
-
-	.. attribute:: ServerCert
-
-		A Go ``string`` that represents full path to a file, which stores the Netconf server public key (server SSL certificate).
-		This attribute must be set for SSL connection.
-
-	.. attribute:: PrivateKey
-
-		A Go ``string`` that represents full path to a file, which stores application platform private key.
-		This attribute is optional and has meaning only when `ServerCert` is specified.
-
 .. method:: (provider *NetconfServiceProvider) Connect()
 	
 	Implementation of ServiceProvider interface. Connects to Netconf Server using Repo/Address/Username/Password/Port.
@@ -192,19 +140,19 @@ Restconf
 
 		A Go ``string`` that represents the path
 
-	.. :noindex:attribute:: Address
+	.. attribute:: Address
 
 		A Go ``string`` that represents the IP address of the device supporting a restconf interface
 
-	.. :noindex:attribute:: Username
+	.. attribute:: Username
 
 		A Go ``string`` that represents the username to log in to the device
 
-	.. :noindex:attribute:: Password
+	.. attribute:: Password
 
 		A Go ``string`` that represents the password to log in to the device
 
-	.. :noindex:attribute:: Port
+	.. attribute:: Port
 
 		An ``int`` that represents the device port used to access the restconfs interface.
 
@@ -252,32 +200,32 @@ gNMI
 
 	Implementation of ServiceProvider for the gNMI protocol.
 
-	.. :noindex:attribute:: Repo
+	.. attribute:: Repo
 
 		An instance of :go:struct:`Repository<ydk/types/Repository>` This attribute represents the repository of YANG models.
 
-	.. :noindex:attribute:: Address
+	.. attribute:: Address
 
 		A Go ``string`` that represents the IP address of the device supporting a netconf interface.
 
-	.. :noindex:attribute:: Username
+	.. attribute:: Username
 
 		A Go ``string`` that represents the username to log in to the device.
 
-	.. :noindex:attribute:: Password
+	.. attribute:: Password
 
 		A Go ``string`` that represents the password to log in to the device.
 
-	.. :noindex:attribute:: Port
+	.. attribute:: Port
 
 		An ``int`` that represents the device port used to access the gRPC interface.
 
-	.. :noindex:attribute:: ServerCert
+	.. attribute:: ServerCert
 	
-        A Go ``string`` that represents full path to a file containing gNMI server certificate of authorization (public key).
+	    A Go ``string`` that represents full path to a file containing gNMI server certificate of authorization (public key).
 	    If not specified the service provider creates non-secure connection to the gNMI server.
 	    
-	.. :noindex:attribute:: PrivateKey
+	.. attribute:: PrivateKey
 
 		A Go ``string`` that represents full path to a file containing private key of YDK application host.
 		If not specified and **ServerCert** attribute is defined (secure connection) the gRPC protocol uses its own private key.
@@ -325,7 +273,7 @@ Codec
 
 	CodecServiceProvider Encode and decode to XML/JSON format
 
-	.. :noindex:attribute:: Repo
+	.. attribute:: Repo
 
 		An instance of :go:struct:`Repository<ydk/types/Repository>` This attribute represents the repository of YANG models.
 
diff --git a/sdk/go/core/docsgen/api/services.rst b/sdk/go/core/docsgen/api/services.rst
index 7772f79de..8d7eed72a 100644
--- a/sdk/go/core/docsgen/api/services.rst
+++ b/sdk/go/core/docsgen/api/services.rst
@@ -147,7 +147,7 @@ Netconf
 
 	:param provider: An instance of :go:struct:`NetconfServiceProvider<ydk/providers/NetconfServiceProvider>`
 	:param confirmed: A ``bool`` that signals a confirmed commit operation
-	:param comfirmTimeOut: The timeout in microseconds: None or -1 for infinite timeout, 0 - for non-blocking
+	:param comfirmTimeOut: An ``int`` representing the timeout interval for a confirmed commit
 	:param persist: An ``int`` that makes the confirmed commit persistent
 	:param persistID: An ``int`` that is given in order to commit a persistent confirmed commit
 	:return: ``true`` if the operation was successful, ``false`` - otherwise
diff --git a/sdk/go/core/docsgen/api/types/base_constants/protocol.rst b/sdk/go/core/docsgen/api/types/base_constants/protocol.rst
index 80a458e90..9e15bb0b9 100644
--- a/sdk/go/core/docsgen/api/types/base_constants/protocol.rst
+++ b/sdk/go/core/docsgen/api/types/base_constants/protocol.rst
@@ -10,9 +10,9 @@ Protocol
 
    import "github.com/CiscoDevNet/ydk-go/ydk/types/protocol"
 
-.. :noindex:attribute:: Protocol
+.. attribute:: Protocol
 
-    Represents communication protocol to be used
+    Represents the protocol to use using underlying type ``int``
 
     .. attribute:: Restconf
 
diff --git a/sdk/go/core/docsgen/getting_started.rst b/sdk/go/core/docsgen/getting_started.rst
index 32363014d..61369c861 100644
--- a/sdk/go/core/docsgen/getting_started.rst
+++ b/sdk/go/core/docsgen/getting_started.rst
@@ -1,6 +1,6 @@
 ..
   #  YDK - YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -33,213 +33,216 @@ Getting Started
 Overview
 ========
 
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API
-and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers,
-plus one or more module bundles that are based on YANG models.
-
-Backward Compatibility
-======================
-
-The Go generated API starting from YDK-0.7.3 is fully compatible with YDK-0.9.0.
-
-**NOTE.** Starting from release 0.8.5 the YDK does not support Python2 interpreter as it was deprecated.
-
+The YANG Development Kit (YDK) is a Software Development Kit that provides API's that are modeled in YANG. The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers, plus one or more module bundles that are based on YANG models.
 
 Docker
 ======
 
-A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-gen installed.
-This be used to run ydk-gen without installing anything natively on your platform.
+A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-go installed. This be used to run ydk-go without installing anything natively on your machine.
 
-To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command.
-See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
+To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command. See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
 
-  docker run -it ydksolutions/ydk-gen:0.8.6.4
+  docker run -it ydkdev/ydk-go
 
 
 System Requirements
 ===================
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
+Linux
+-----
 
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x
- - MacOS up to 11.6.2 (Big Sur)
+**Ubuntu (Debian-based)**
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check `this <https://www.windowscentral.com/install-windows-subsystem-linux-windows-10>`_ for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+The following packages must be present in your system before installing YDK-Go:
 
-On supported platforms the YDK can be installed using `Installation Script`_.
-On other platforms the YDK should be installed manually `Building from source`_.
-For both the methods the user must install `git` package prior to the installation procedure.
+Install Third-party software dependencies::
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+  sudo apt-get install gdebi-core python3-dev python-dev libtool-bin
+  sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
 
-**NOTE.** Due to GitHub issue `#1050 <https://github.com/CiscoDevNet/ydk-gen/issues/1050>`_ YDK is not supported with Python 3.9.x.
+For Xenial (Ubuntu 16.04.4)::
 
-.. _howto-install:
+    # Upgrade compiler to gcc 5.*
+  sudo apt-get install gcc-5 g++-5 -y > /dev/null
+  sudo ln -sf /usr/bin/gcc-5 /usr/bin/cc
+  sudo ln -sf /usr/bin/g++-5 /usr/bin/c++
 
-Core Installation
-=================
+    # Install YDK core library
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
 
-Installation Script
--------------------
+For Bionic (Ubuntu 18.04.1)::
+
+    # Install YDK core library
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
+
+**Centos (Fedora-based)**
+
+The following packages must be present in your system before installing YDK-Go::
+
+  sudo yum install epel-release
+  sudo yum install libxml2-devel libxslt-devel libssh-devel libtool gcc-c++ pcre-devel cmake
+
+    # Upgrade compiler to gcc 5.*
+  yum install centos-release-scl -y > /dev/null
+  yum install devtoolset-4-gcc* -y > /dev/null
+  ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/cc
+  ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/c++
+
+    # Install YDK core library
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
+
+**Golang**
+
+The YDK requires Go version 1.9 or higher. If this is not the case, follow these installation steps:
+
+.. code-block:: sh
+
+  sudo wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz &> /dev/null
+  sudo tar -zxf  go1.9.2.linux-amd64.tar.gz -C /usr/local/
+  export GOROOT="/usr/local/go"
+  export PATH=$GOROOT/bin:$PATH
+
+For security reasons starting from Go version 1.10 only a limited set of flags is allowed in the CGO code, notably -D, -I, and -l.
+Current ydk-go code includes few additional CGO LDFLAGS flags in order to allow coverage testing; they are:
+"-fprofile-arcs -ftest-coverage --coverage". In order to allow these additional flags to be used, it is necessary
+to set environment variable CGO_LDFLAGS_ALLOW before running ydk-go based application:
+
+.. code-block:: sh
+
+  export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-If user has different location, the PYTHON_VENV environment variable should be set to that location.
+Mac
+---
 
-When installing YDK for Go programming language, the third party dependencies and C++ packages must be installed first.
-These steps require sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Go programming language and Python virtual environment:
+It is recommended to install `homebrew <http://brew.sh>`_ and Xcode command line tools on your system before installing YDK-Go:
 
 .. code-block:: sh
 
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-    export YDKGEN_HOME=`pwd`  # optional
-    export PYTHON_VENV=$HOME/ydk_vne  # optional
-    ./install_ydk.sh --core --cpp --venv  # requires sudo access
-    ./install_ydk.sh --core --go --venv
-
-
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this::
-
-    ./install_ydk.sh --help
-    usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-    Options and arguments:
-      --cpp                 install YDK for C++ programming language;
-                            requires sudo access for dependencies and libraries installation
-      --go                  install YDK for Go programming language
-      --py|--python         install YDK for Python programming language
-      --all                 install YDK for all available programming languages;
-                            requires sudo access for dependencies and libraries installation
-      -v|--venv             create python virtual environment
-      -c|--core             install YDK core package
-      -s|--service gnmi     install gNMI service package
-      -n|--no-deps          skip installation of dependencies;
-                            applicable only with --cpp and --all options
-      -h|--help             print this help message and exit
-
-    Environment variables:
-    YDKGEN_HOME         specifies location of ydk-gen git repository;
-                        if not set, $HOME/ydk-gen is assumed
-    PYTHON_VENV         specifies location of python virtual environment;
-                        if not set, $HOME/venv is assumed
-    GOROOT              specifies installation directory of go software;
-                        if not set, /usr/local/go is assumed
-    GOPATH              specifies location of go source directory;
-                        if not set, $HOME/go is assumed
-    C_INCLUDE_PATH      location of C include files;
-                        if not set, /usr/local/include is assumed
-    CPLUS_INCLUDE_PATH  location of C++ include files;
-                        if not set, /usr/local/include is assumed
-    CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                        if not set, default system library location is assumed
-
-If user environment is different from the default one (different Python installation or different
-location of libraries), then building from source method should be used.
-
-Building from source
---------------------
-
-Environment variables
-~~~~~~~~~~~~~~~~~~~~~
-
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the header location must be specified explicitly (in below commands the default location is shown)::
-
-  export C_INCLUDE_PATH=/usr/local/include
-  export CPLUS_INCLUDE_PATH=/usr/local/include
-
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
-
-Installing third party dependencies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script.
-The script will also install Python virtual environment in default or specified location, when '--venv' is specified::
-
-    # Clone ydk-gen from GitHub
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-
-    # Define optional environment variables and install dependencies
-    export YDKGEN_HOME=`pwd`
-    export PYTHON_VENV=$HOME/ydk_venv
-    ./install_ydk.sh
-
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
-
-Installing core components
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please follow this procedure to install YDK core components for Python apps development::
-
-    # If created, activate Python virtual environment
-    source $PYTHON_VENV/bin/activate
-
-    # Generate and install YDK core library
-    python3 generate.py -is --core --cpp
-
-    # For Python programming language add
-    python3 generate.py -i --core --go
-
-Adding gNMI Service
+  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  brew install pkg-config libssh libxml2 xml2 curl pcre cmake
+  xcode-select --install
+
+  # Install YDK core library
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+  sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+
+The YDK requires Go version 1.9 or higher. If this is not the case, follow these installation steps:
+
+.. code-block:: sh
+
+  export CGO_ENABLED=0
+  export GOROOT_BOOTSTRAP=$GOROOT
+  gvm install go1.9.2
+
+Libssh Installation
 -------------------
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package.
+The libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. If after installation of libssh package the `libssh_threads.a` is missing, please downgrade the installation to libssh-0.7.6,
+or upgrade to libssh-0.8.1 or higher.
+
+
+gNMI Requirements
+===================
+
+In order to have YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
+
+Install protobuf
+----------------
+
+.. code-block:: sh
+
+  wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+  unzip protobuf-cpp-3.5.0.zip
+  cd protobuf-3.5.0
+  ./configure
+  make
+  sudo make install
+  sudo ldconfig
+  cd -
+
+Install gRPC
+------------
+
+.. code-block:: sh
+
+  git clone -b v1.9.1 https://github.com/grpc/grpc
+  cd grpc
+  git submodule update --init
+  sudo ldconfig
+  make
+  sudo make install
+  cd -
+
+Instal YDK gNMI library
+-----------------------
+
+Ubuntu
+~~~~~~
+
+For Xenial (Ubuntu 16.04.4)::
+
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+
+For Bionic (Ubuntu 18.04.1)::
+
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 
-gNMI Service installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
+CentOS
+~~~~~~
 
-Here is simple example, how gNMI service package for Go and Python virtual environment could be added::
+.. code-block:: sh
+
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
+
+MacOS
+~~~~~
+
+.. code-block:: sh
+
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+  sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
 
-    cd ydk-gen
-    ./install_ydk.sh --cpp --service gnmi --venv  # requires sudo access
-    ./install_ydk.sh --go --service gnmi --venv
+Set runtime environment
+-----------------------
 
+The YDK based application runtime environment must include setting of **LD_LIBRARY_PATH** variable:
 
-gNMI runtime environment
-~~~~~~~~~~~~~~~~~~~~~~~~
+.. code-block:: sh
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
-As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+  PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
 
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+.. _howto-install:
+
+How to install YDK-Go
+=====================
+
+You can install YDK-Go on macOS or Linux.  It is not currently supported on Windows.
+
+To check out the version of ydk-gen used to generate this ydk-go, use the below commands:
+
+.. code-block:: sh
+
+  git clone repo-url
+  git checkout commit-id
 
 
 Documentation and Support
 =========================
 
-- Read the `API documentation <http://ydk.cisco.com/go/docs>`_ for details on how to use the API and specific models (YDK-0.8.3)
-- Samples can be found under the `samples <https://github.com/CiscoDevNet/ydk-go/tree/master/samples>`_ directory
+- Read the `API documentation <http://ydk.cisco.com/go/docs>`_ for details on how to use the API and specific models
+- Samples can be found under the `samples directory <https://github.com/CiscoDevNet/ydk-go/tree/master/samples>`_
+- Additional samples can be found in the `YDK-Go samples repository <https://github.com/CiscoDevNet/ydk-go-samples>`_ (coming soon)
 - Join the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ to connect with other users and with the makers of YDK
-- Additional YDK information can be found on `GitHub Pages <https://ygorelik.github.io/ydk-gen/>`_
+- Additional YDK information can be found at `ydk.io <http://ydk.io>`_
 
 Release Notes
 =============
 
-The current YDK release version is 0.8.6.4.
-
-YDK is licensed under the Apache 2.0 License.
+The current YDK release version is 0.8.5. YDK-Go is licensed under the Apache 2.0 License.
diff --git a/sdk/go/core/docsgen/guides/crud_guide.rst b/sdk/go/core/docsgen/guides/crud_guide.rst
index ff4e36c04..c6f5f0477 100644
--- a/sdk/go/core/docsgen/guides/crud_guide.rst
+++ b/sdk/go/core/docsgen/guides/crud_guide.rst
@@ -1,6 +1,6 @@
 ..
   #  YDK - YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -32,20 +32,16 @@ How do I create, update, read and delete?
 
 .. contents:: Table of Contents
 
-This document contains some examples of creating, reading and deleting yang data using YDK.
-To perform these operations, the :go:struct:`CrudService<ydk/services/CrudService>` is used.
-Also, in these examples, :ref:`YFilter <y-filter>` is used to mark parts of the data for particular operations.
+This document contains some examples of creating, reading and deleting yang data using YDK. To perform these operations, the :go:struct:`CrudService<ydk/services/CrudService>` is used. Also, in these examples, :ref:`YFilter <y-filter>` is used to mark parts of the data for particular operations.
 
 Creating a configuration with a list
 ------------------------------------
 
 To configure a rule in the SNMP trap correlator, the below approach can be used.
 
-Note that the `Rule` field in :go:struct:`Snmp_Correlator_Rules <ydk/models/cisco_ios_xr/snmp_agent_cfg/Snmp_Correlator_Rules>`
-is a Go ``slice`` of :go:struct:`Snmp_Correlator_Rules_Rule<ydk/models/cisco_ios_xr/snmp_agent_cfg/Snmp_Correlator_Rules_Rule>`,
-which needs to be instantiated in its parent constructor.
+Note that the ``Rule`` field in :go:struct:`Snmp_Correlator_Rules <ydk/models/cisco_ios_xr/snmp_agent_cfg/Snmp_Correlator_Rules>` is a Go ``slice`` of :go:struct:`Snmp_Correlator_Rules_Rule<ydk/models/cisco_ios_xr/snmp_agent_cfg/Snmp_Correlator_Rules_Rule>`, which needs to be instantiated in its parent's constructor.
 
-Also, the field `NonStateful` is set to `nil` by default. Therefore it needs to be instantiated.
+Also, the field ``NonStateful`` is set to ``nil`` by default. Therefore it needs to be instantiated.
 
 .. code-block:: c
     :linenos:
@@ -77,8 +73,7 @@ Also, the field `NonStateful` is set to `nil` by default. Therefore it needs to
 Creating and replacing a configuration
 --------------------------------------
 
-First, let us create a configuration for the :go:struct:`Bgp_Global_Config<ydk/models/openconfig/openconfig_bgp/Bgp_Global_Config>` class.
-Here, we set the leaf `As`, which represents the autonomous system number, to `65001` and the leaf `RouterId` to `"10.0.0.1"`
+First, let us create a configuration for the :go:struct:`Bgp_Global_Config<ydk/models/openconfig/openconfig_bgp/Bgp_Global_Config>` class. Here, we set the leaf ``As``, which represents the autonomous system number, to ``65001`` and the leaf ``RouterId`` to ``"10.0.0.1"``.
 
 .. code-block:: c
     :linenos:
@@ -106,9 +101,7 @@ Here, we set the leaf `As`, which represents the autonomous system number, to `6
     }
 
 
-Now, let us replace the above configuration with a new configuration for the
-:go:struct:`openconfig_bgp.Bgp_Global_Config<ydk/models/openconfig/openconfig_bgp/Bgp_Global_Config>`
-class using the below code.
+Now, let us replace the above configuration with a new configuration for the :go:struct:`openconfig_bgp.Bgp_Global_Config<ydk/models/openconfig/openconfig_bgp/Bgp_Global_Config>` class using the below code.
 
 .. code-block:: c
     :linenos:
@@ -142,9 +135,7 @@ class using the below code.
 Reading a list
 --------------
 
-For example, to read the instances of a deeply nested ``slice`` called
-:go:struct:`Rib_Vrfs_Vrf_Afs_Af_Safs_Saf_IpRibRouteTableNames_IpRibRouteTableName_Routes_Route<ydk/models/cisco_ios_xr/ip_rib_ipv4_oper/Rib_Vrfs_Vrf_Afs_Af_Safs_Saf_IpRibRouteTableNames_IpRibRouteTableName_Routes_Route>`
-in the `ip_rib_ipv4_oper` package using YDK's :go:struct:`CrudService<ydk/services/CrudService>`, the below approach can be used.
+For example, to read the instances of a deeply nested ``slice`` called :go:struct:`Rib_Vrfs_Vrf_Afs_Af_Safs_Saf_IpRibRouteTableNames_IpRibRouteTableName_Routes_Route<ydk/models/cisco_ios_xr/ip_rib_ipv4_oper/Rib_Vrfs_Vrf_Afs_Af_Safs_Saf_IpRibRouteTableNames_IpRibRouteTableName_Routes_Route>`  in the ``ip_rib_ipv4_oper`` package using YDK's :go:struct:`CrudService<ydk/services/CrudService>`, the below approach can be used.
 
 .. code-block:: c
     :linenos:
@@ -203,8 +194,7 @@ in the `ip_rib_ipv4_oper` package using YDK's :go:struct:`CrudService<ydk/servic
 Accessing list elements
 -----------------------
 
-Lets continue previous example to demonstrate, how user can access `rib.Vrfs.Vrf` directly and by key identifier,
-which is `vrf.VrfName`.
+Lets continue previous example to demonstrate, how user can access `rib.Vrfs.Vrf` directly and by key identifier, which is `vrf.VrfName`.
 
 .. code-block:: c
     :linenos:
@@ -244,10 +234,7 @@ which is `vrf.VrfName`.
 Reading a leaf
 --------------
 
-For example, to read a `YLeaf` called `Running` in the
-:go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances_Instance>`
-class in the `clns_isis_cfg` module using YDK's :go:struct:`CrudService <ydk/services/CrudService>`,
-the below approach can be used.
+For example, to read a ``YLeaf`` called ``Running`` in the :go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances_Instance>` class in the ``clns_isis_cfg`` module using YDK's :go:struct:`CrudService <ydk/services/CrudService>`, the below approach can be used.
 
 .. code-block:: c
     :linenos:
@@ -283,10 +270,7 @@ the below approach can be used.
 Deleting a list
 ---------------
 
-In order to delete entire list from configuration, all its elements must be deleted. For example, to delete
-a Go ``slice`` called :go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances_Instance>`
-in the `clns_isis_cfg` module using YDK's :go:struct:`CrudService<ydk/services/CrudService>`,
-the below approach can be used.
+For example, to delete a Go ``slice`` called :go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances_Instance>` in the ``clns_isis_cfg`` module using YDK's :go:struct:`CrudService<ydk/services/CrudService>`, the below approach can be used.
 
 .. code-block:: c
     :linenos:
@@ -299,28 +283,30 @@ the below approach can be used.
     )
 
     func main() {
-        // First read the ISIS configuration
-        // (assuming you have already instantiated the service and provider)
-        isis := clns_isis_cfg.Isis{}
-        isisEntity := crud.ReadConfig(&provider, &isis)
-        isisConfig := isisEntity.(&clns_isis_cfg.Isis)
+        // First create the top-level Isis object
+        isis = clns_isis_cfg.Isis{}
 
-        // Go over all ISIS instances (list elements) to set yfilter.Delete flag
-        for _, ins := range isisConfig.Instances.Instance {
-            ins.YFilter = yfilter.Delete
-        }
-        // Call the CRUD update on the isisConfig object
-        // This operation will remove the entire list 'instance' from ISIS configuration
-        result := crud.Update(&provider, &isisConfig)
+        // Create the ISIS instance
+        ins := clns_isis_cfg.Isis.Instances.Instance{}
+        ins.InstanceName = "xyz"
+
+        // Set the YFilter attribute of the leaf called 'ins' to yfilter.Delete
+        ins.YFilter = yfilter.Delete
+
+        // Create the list and append the instance
+        isis.Instances = clns_isis_cfg.Isis.Instances{}
+        isis.Instances.Instance = append(isis.Instances.Instance, &ins)
+
+        // Call the CRUD update on the isis object
+        // (assuming you have already instantiated the service and provider)
+        result := crud.Update(&provider, &isis)
     }
 
 
 Deleting a leaf
 ---------------
 
-In order to delete a leaf from configuration, instead of a value assign it yfilter.Delete flag.
-For example, to delete a `YLeaf` called `Running` in the :go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances>`
-class in the `clns_isis_cfg` module using YDK's :go:struct:`CrudService<ydk/services/CrudService>`, the below approach can be used.
+For example, to delete a ``YLeaf`` called ``Running`` in the :go:struct:`Instance <ydk/models/cisco_ios_xr/clns_isis_cfg/Isis_Instances>` class in the ``clns_isis_cfg`` module using YDK's :go:struct:`CrudService<ydk/services/CrudService>`, the below approach can be used.
 
 .. code-block:: c
     :linenos:
@@ -362,9 +348,9 @@ delete operation filter to avoid Libyang error on emty value. For this purpose t
 .. code-block:: c
     :linenos:
 
-    package main
+	package main
 
-    import (
+	import (
 		"github.com/CiscoDevNet/ydk-go/ydk/types"
 		"github.com/CiscoDevNet/ydk-go/ydk/types/yfilter"
 		ysanity_bgp "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/openconfig_bgp"
@@ -374,7 +360,7 @@ delete operation filter to avoid Libyang error on emty value. For this purpose t
 		"github.com/CiscoDevNet/ydk-go/ydk/services"
 	)
 
-    func configBgp(bgp *ysanity_bgp.Bgp) {
+	func configBgp(bgp *ysanity_bgp.Bgp) {
 		bgp.Global.Config.As = 65001
 
 		ipv6_afisafi := ysanity_bgp.Bgp_Global_AfiSafis_AfiSafi{}
@@ -402,7 +388,7 @@ delete operation filter to avoid Libyang error on emty value. For this purpose t
 		bgp.PeerGroups.PeerGroup = append(bgp.PeerGroups.PeerGroup, &peer_group)
 	}
 
-    func deletePolicy(bgp *ysanity_bgp.Bgp, policy string) {
+	func deletePolicy(bgp *ysanity_bgp.Bgp, policy string) {
 		peer_group := ysanity_bgp.Bgp_PeerGroups_PeerGroup{}
 		peer_group.PeerGroupName = "EBGP"
 
@@ -418,7 +404,7 @@ delete operation filter to avoid Libyang error on emty value. For this purpose t
 		bgp.PeerGroups.PeerGroup = append(bgp.PeerGroups.PeerGroup, &peer_group)
 	}
 
-    func configRoutingPolicies(routingPolicy *ysanity_rp.RoutingPolicy) {
+	func configRoutingPolicies(routingPolicy *ysanity_rp.RoutingPolicy) {
 		policy_def1 := ysanity_rp.RoutingPolicy_PolicyDefinitions_PolicyDefinition{Name: "POLICY1"}
 		policy_def3 := ysanity_rp.RoutingPolicy_PolicyDefinitions_PolicyDefinition{Name: "POLICY3"}
 		policy_def1.Config.Name = "POLICY1"
@@ -429,7 +415,7 @@ delete operation filter to avoid Libyang error on emty value. For this purpose t
 			append(routingPolicy.PolicyDefinitions.PolicyDefinition, &policy_def3)
 	}
 
-    func main() {
+	func main() {
 		// Connect to the device
 		var provider = providers.NetconfServiceProvider{
 					Address:  "127.0.0.1",
@@ -475,8 +461,8 @@ In this example we read interfaces and BGP configuration as defined by openconfi
 
     func main() {
         // Build filter
-        interfacesFilter := ocInterfaces.Interfaces{}
-        bgpFilter := ocBgp.Bgp{}
+        interfacesFilter := ocInterfaces.Interfaces{};
+        bgpFilter := ocBgp.Bgp{};
         filterList := types.NewFilter(&interfacesFilter, &bgpFilter)
 
         // Read running config
diff --git a/sdk/go/core/docsgen/guides/path_api.rst b/sdk/go/core/docsgen/guides/path_api.rst
index 1a3209c63..5d7f0bbea 100644
--- a/sdk/go/core/docsgen/guides/path_api.rst
+++ b/sdk/go/core/docsgen/guides/path_api.rst
@@ -1,30 +1,3 @@
-..
-  #  YDK - YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 .. _howto-path:
 
 .. _path-api-guide:
@@ -34,32 +7,27 @@ How do I use the Path API?
 
 .. contents:: Table of Contents
 
-The :ref:`Path API<path-api-guide>` (part of the `YDK core <https://github.com/CiscoDevNet/ydk-py/tree/master/core>`_)
-is a generic API which can be used to create and access YANG data nodes without having to use the model bundle APIs
-(for example, `openconfig <https://github.com/CiscoDevNet/ydk-py/tree/master/openconfig>`_). Applications can be written
-using xpath-like path expressions as illustrated below.
+The :ref:`Path API<path-api-guide>` (part of the `YDK core <https://github.com/CiscoDevNet/ydk-py/tree/master/core>`_) is a generic API which can be used to create and access YANG data nodes without having to use the model bundle APIs (for example, `openconfig <https://github.com/CiscoDevNet/ydk-py/tree/master/openconfig>`_). Applications can be written using xpath-like path expressions as illustrated below.
 
 
 Path Syntax
 -----------
 
-Full XPath notation is supported for find operations on :go:struct:`DataNode<DataNode>`\(s\).
-This XPath conforms to the YANG specification \(`RFC 6020 section 6.4 <https://tools.ietf.org/html/rfc6020#section-6.4>`_\).
-Some useful examples:
+Full XPath notation is supported for find operations on :go:struct:`DataNode<DataNode>`\(s\). This XPath conforms to the YANG specification \(`RFC 6020 section 6.4 <https://tools.ietf.org/html/rfc6020#section-6.4>`_\). Some useful examples:
 
-- Get `list` element with `key1` of value `1` and `key2` of value `2` \(this can return more `list` instances if there are more keys than `key1` and `key2`\)
+- Get ``list`` instance with ``key1`` of value ``1`` and ``key2`` of value ``2`` \(this can return more ``list`` instances if there are more keys than ``key1`` and ``key2``\)
 
 .. code-block:: bash
 
     /module-name:container/list[key1='1'][key2='2']
 
-- Get `leaf-list` instance with the value `val`
+- Get ``leaf-list`` instance with the value ``val``
 
 .. code-block:: bash
 
     /module-name:container/leaf-list[.='val']
 
-- Get `aug-leaf`, which was added to `module-name` from an augment module `augment-module`
+- Get ``aug-leaf``, which was added to ``module-name`` from an augment module ``augment-module``
 
 .. code-block:: bash
 
@@ -83,85 +51,4 @@ Almost the same XPath is accepted by :go:struct:`SchemaNode<SchemaNode>` methods
 
 .. note::
 
-    In all cases the node's prefix is specified as the name of the appropriate YANG schema.
-    Any node can be prefixed by the module name. However, if the prefix is omitted, the module name is inherited
-    from the previous (parent) node. It means, that the first node in the path is always supposed to have a prefix.
-
-Example of Path API with Netconf Session
-----------------------------------------
-
-This Path API example uses :go:struct:`NetconfSession<ydk/path/NetconfSession>` to connect and communicate with Netconf server.
-It is also using openconfig-bgp.yang model to build BGP configuration on a router.
-
-.. code-block:: c
-   :linenos:
-
-    package main
-
-    import (
-        "fmt"
-        "github.com/CiscoDevNet/ydk-go/ydk"
-        "github.com/CiscoDevNet/ydk-go/ydk/path"
-        "github.com/CiscoDevNet/ydk-go/ydk/types"
-        encoding "github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format"
-    )
-
-    type PathApiTest struct {
-        Session    path.NetconfSession
-        RootSchema types.RootSchemaNode
-    }
-
-    func (suite *PathApiTest) Setup() {
-        suite.Session = path.NetconfSession{
-        Address:  "127.0.0.1",
-        Username: "admin",
-        Password: "admin",
-        Port:     12022}
-        suite.Session.Connect()
-        suite.RootSchema = suite.Session.GetRootSchemaNode()
-    }
-
-    func (suite *PathApiTest) TearDown() {
-        suite.Session.Disconnect()
-    }
-
-    func (suite *PathApiTest) TestBgpConfig() {
-        // Delete BGP config
-        bgp := path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-        deleteRpc := path.CreateRpc( suite.RootSchema, "ydk:delete")
-        path.CreateDataNode( deleteRpc.Input, "entity", path.CodecEncode( bgp, encoding.XML, true))
-        suite.Session.ExecuteRpc(deleteRpc)
-
-        // Greate BGP config
-        bgp = path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-        path.CreateDataNode( bgp, "global/config/as", 65172)
-        path.CreateDataNode( bgp, "global/config/router-id", "1.2.3.4")
-        neighbor := path.CreateDataNode( bgp, "neighbors/neighbor[neighbor-address='172.16.255.2']", "")
-        path.CreateDataNode( neighbor, "config/neighbor-address", "172.16.255.2")
-        path.CreateDataNode( neighbor, "config/peer-as","65172")
-
-        createRpc := path.CreateRpc( suite.RootSchema, "ydk:create")
-        path.CreateDataNode( createRpc.Input, "entity", path.CodecEncode( bgp, encoding.XML, true))
-        suite.Session.ExecuteRpc(createRpc)
-
-        // Read BGP config
-        bgp = path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-        readRpc := path.CreateRpc( suite.RootSchema, "ydk:read")
-        path.CreateDataNode( readRpc.Input, "filter", path.CodecEncode( bgp, encoding.XML, true))
-        path.CreateDataNode( readRpc.Input, "only-config", "")
-        result := suite.Session.ExecuteRpc(readRpc)
-
-        config := path.CodecEncode( result, encoding.XML, true)
-        ydk.YLogInfo("Got BGP config:\n" + config)
-
-        // Delete BGP config
-        suite.Session.ExecuteRpc(deleteRpc)
-    }
-
-    func main() {
-        ydk.EnableLogging(ydk.Info)
-        suite := PathApiTest{}
-        suite.Setup()
-        suite.TestBgpConfig()
-        suite.TearDown()
-    }
+    In all cases the node's prefix is specified as the name of the appropriate YANG schema. Any node can be prefixed by the module name. However, if the prefix is omitted, the module name is inherited from the previous (parent) node. It means, that the first node in the path is always supposed to have a prefix.
diff --git a/sdk/go/core/samples/bgp_create/bgp_create.go b/sdk/go/core/samples/bgp_create/bgp_create.go
index 82d4308cc..4967d8c47 100644
--- a/sdk/go/core/samples/bgp_create/bgp_create.go
+++ b/sdk/go/core/samples/bgp_create/bgp_create.go
@@ -34,9 +34,7 @@ import (
 	oc_bgp_types "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/openconfig_bgp_types"
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
 	"github.com/CiscoDevNet/ydk-go/ydk/services"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	"runtime"
-	"path/filepath"
+	//"github.com/CiscoDevNet/ydk-go/ydk/types"
 )
 
 func config_bgp(bgp *oc_bgp.Bgp) {
@@ -107,18 +105,12 @@ func main() {
 	}
 
 	// create NETCONF provider
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repo_path := executablePath + "/../../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repo_path}
 	provider := providers.NetconfServiceProvider{
-		Repo: repo,
 		Address: device["address"],
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 
diff --git a/sdk/go/core/samples/bgp_delete/bgp_delete.go b/sdk/go/core/samples/bgp_delete/bgp_delete.go
index 2e5064e99..31c7f1aa2 100644
--- a/sdk/go/core/samples/bgp_delete/bgp_delete.go
+++ b/sdk/go/core/samples/bgp_delete/bgp_delete.go
@@ -34,8 +34,6 @@ import (
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
 	"github.com/CiscoDevNet/ydk-go/ydk/services"
 	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	"runtime"
-	"path/filepath"
 )
 
 func main() {
@@ -89,18 +87,12 @@ func main() {
 	}
 
 	// create NETCONF provider
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repo_path := executablePath + "/../../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repo_path}
 	provider := providers.NetconfServiceProvider{
-		Repo: repo,
 		Address: device["address"],
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 
diff --git a/sdk/go/core/samples/bgp_read/bgp_read.go b/sdk/go/core/samples/bgp_read/bgp_read.go
index e6185dc4f..f02212a80 100644
--- a/sdk/go/core/samples/bgp_read/bgp_read.go
+++ b/sdk/go/core/samples/bgp_read/bgp_read.go
@@ -33,9 +33,7 @@ import (
 	oc_bgp "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/openconfig_bgp"
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
 	"github.com/CiscoDevNet/ydk-go/ydk/services"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	"runtime"
-	"path/filepath"
+	//"github.com/CiscoDevNet/ydk-go/ydk/types"
 )
 
 func main() {
@@ -88,18 +86,12 @@ func main() {
 	}
 
 	// create NETCONF provider
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repo_path := executablePath + "/../../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repo_path}
 	provider := providers.NetconfServiceProvider{
-		Repo: repo,
 		Address: device["address"],
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	crud := services.CrudService{}
diff --git a/sdk/go/core/samples/cgo_path/cgo_path.go b/sdk/go/core/samples/cgo_path/cgo_path.go
index 00d9b06a7..189f16795 100644
--- a/sdk/go/core/samples/cgo_path/cgo_path.go
+++ b/sdk/go/core/samples/cgo_path/cgo_path.go
@@ -75,25 +75,11 @@ func main() {
 	defer C.CodecFree(codec)
 	repo := C.RepositoryInit()
 	defer C.RepositoryFree(repo)
-
-	var cOnDemand C.boolean = 1
-	var cCommonCache C.boolean = 0
-	var ctimeout C.int = C.int(-1)
-
-	var cserver *C.char = C.CString("")
-	defer C.free(unsafe.Pointer(cserver))
-	var cclient *C.char = C.CString("")
-	defer C.free(unsafe.Pointer(cclient))
-
-	provider := C.NetconfServiceProviderInit(cstate, repo, address, username, password, 12022, protocol,
-		cOnDemand, cCommonCache, ctimeout, cserver, cclient)
+	provider := C.NetconfServiceProviderInitWithRepo(cstate, repo, address, username, password, 12022, protocol)
 	defer C.NetconfServiceProviderFree(provider)
 	root_schema := C.ServiceProviderGetRootSchema(cstate, provider)
 
-	var cvalue *C.char = C.CString("")
-	defer C.free(unsafe.Pointer(cvalue))
-
-	runner := C.RootSchemaNodeCreate(cstate, root_schema, runner_path, cvalue)
+	runner := C.RootSchemaNodeCreate(cstate, root_schema, runner_path)
 
 	C.DataNodeCreate(cstate, runner, number_path, number_value)
 	var create_xml *C.char = C.CodecEncode(cstate, codec, runner, C.XML, 0)
@@ -106,7 +92,7 @@ func main() {
 
 	read_rpc := C.RootSchemaNodeRpc(cstate, root_schema, read_path)
 	input = C.RpcInput(cstate, read_rpc)
-	runner_filter := C.RootSchemaNodeCreate(cstate, root_schema, runner_path, cvalue)
+	runner_filter := C.RootSchemaNodeCreate(cstate, root_schema, runner_path)
 	var read_xml *C.char = C.CodecEncode(cstate, codec, runner_filter, C.XML, 0)
 	defer C.free(unsafe.Pointer(read_xml))
 
diff --git a/sdk/go/core/samples/crud/cisco_ios_xe/native/interface_30/interface_30.go b/sdk/go/core/samples/crud/cisco_ios_xe/native/interface_30/interface_30.go
index 53da69f89..88340ebe4 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xe/native/interface_30/interface_30.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xe/native/interface_30/interface_30.go
@@ -101,8 +101,7 @@ func main() {
         Username: device["username"],
         Password: device["password"],
         Port: port,
-        Protocol: device["protocol"],
-        OnDemand: true}
+        Protocol: device["protocol"]}
     provider.Connect()
 
     // create CRUD service
diff --git a/sdk/go/core/samples/crud/cisco_ios_xr/ifmgr_cfg/nc_create_20/nc_create_20.go b/sdk/go/core/samples/crud/cisco_ios_xr/ifmgr_cfg/nc_create_20/nc_create_20.go
index 7b1f734e2..1af4cca99 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xr/ifmgr_cfg/nc_create_20/nc_create_20.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xr/ifmgr_cfg/nc_create_20/nc_create_20.go
@@ -96,8 +96,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/crud/cisco_ios_xr/infra_infra_clock_linux_cfg/nc_create_20/nc_create_20.go b/sdk/go/core/samples/crud/cisco_ios_xr/infra_infra_clock_linux_cfg/nc_create_20/nc_create_20.go
index 9f8eb26d3..c97640b2d 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xr/infra_infra_clock_linux_cfg/nc_create_20/nc_create_20.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xr/infra_infra_clock_linux_cfg/nc_create_20/nc_create_20.go
@@ -98,8 +98,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/crud/cisco_ios_xr/policy_repository_cfg/nc_create_20/nc_create_20.go b/sdk/go/core/samples/crud/cisco_ios_xr/policy_repository_cfg/nc_create_20/nc_create_20.go
index e7ad07134..8719f6280 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xr/policy_repository_cfg/nc_create_20/nc_create_20.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xr/policy_repository_cfg/nc_create_20/nc_create_20.go
@@ -107,8 +107,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_filesystem_oper/nc_read_20/nc_read_20.go b/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_filesystem_oper/nc_read_20/nc_read_20.go
index b9cf30f19..2e9a87130 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_filesystem_oper/nc_read_20/nc_read_20.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_filesystem_oper/nc_read_20/nc_read_20.go
@@ -121,8 +121,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_oper/nc_read_20/nc_read_20.go b/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_oper/nc_read_20/nc_read_20.go
index 9c28265ed..927f38d03 100644
--- a/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_oper/nc_read_20/nc_read_20.go
+++ b/sdk/go/core/samples/crud/cisco_ios_xr/shellutil_oper/nc_read_20/nc_read_20.go
@@ -150,8 +150,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/crud/openconfig/leaf_list_delete.go b/sdk/go/core/samples/crud/openconfig/leaf_list_delete.go
index bc41b67bc..1706e0cf0 100644
--- a/sdk/go/core/samples/crud/openconfig/leaf_list_delete.go
+++ b/sdk/go/core/samples/crud/openconfig/leaf_list_delete.go
@@ -113,14 +113,13 @@ func main() {
 // 	ydk.EnableLogging(ydk.Info)
 
 	// Connect to the device
-	provider := providers.NetconfServiceProvider{
+	var provider = providers.NetconfServiceProvider{
 				Address:  "127.0.0.1",
 				Username: "admin",
 				Password: "admin",
-				Port:     12022,
-				OnDemand: true}
+				Port:     12022}
 	provider.Connect()
-	CRUD := services.CrudService{}
+	var CRUD = services.CrudService{}
 
 	// Build routing policies list
 	routingPolicy := ysanity_rp.RoutingPolicy{}
diff --git a/sdk/go/core/samples/executor/cisco_ios_xr/cfgmgr_rollback_act/nc_execute_20/nc_execute_20.go b/sdk/go/core/samples/executor/cisco_ios_xr/cfgmgr_rollback_act/nc_execute_20/nc_execute_20.go
index 0b7deea12..345f39525 100644
--- a/sdk/go/core/samples/executor/cisco_ios_xr/cfgmgr_rollback_act/nc_execute_20/nc_execute_20.go
+++ b/sdk/go/core/samples/executor/cisco_ios_xr/cfgmgr_rollback_act/nc_execute_20/nc_execute_20.go
@@ -96,8 +96,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/executor/cisco_ios_xr/ping_act/nc_execute_20/nc_execute_20.go b/sdk/go/core/samples/executor/cisco_ios_xr/ping_act/nc_execute_20/nc_execute_20.go
index cdbc5af9a..38f929799 100644
--- a/sdk/go/core/samples/executor/cisco_ios_xr/ping_act/nc_execute_20/nc_execute_20.go
+++ b/sdk/go/core/samples/executor/cisco_ios_xr/ping_act/nc_execute_20/nc_execute_20.go
@@ -120,8 +120,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/executor/cisco_ios_xr/snmp_test_trap_act/nc_execute_200/nc_execute_200.go b/sdk/go/core/samples/executor/cisco_ios_xr/snmp_test_trap_act/nc_execute_200/nc_execute_200.go
index 1f436be02..733c7187f 100644
--- a/sdk/go/core/samples/executor/cisco_ios_xr/snmp_test_trap_act/nc_execute_200/nc_execute_200.go
+++ b/sdk/go/core/samples/executor/cisco_ios_xr/snmp_test_trap_act/nc_execute_200/nc_execute_200.go
@@ -91,8 +91,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/executor/cisco_ios_xr/syslog_act/nc_execute_20/nc_execute_20.go b/sdk/go/core/samples/executor/cisco_ios_xr/syslog_act/nc_execute_20/nc_execute_20.go
index f3484c968..7f5274704 100644
--- a/sdk/go/core/samples/executor/cisco_ios_xr/syslog_act/nc_execute_20/nc_execute_20.go
+++ b/sdk/go/core/samples/executor/cisco_ios_xr/syslog_act/nc_execute_20/nc_execute_20.go
@@ -98,8 +98,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create CRUD service
diff --git a/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_20/nc_edit_20.go b/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_20/nc_edit_20.go
index 025b04b66..349efda13 100644
--- a/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_20/nc_edit_20.go
+++ b/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_20/nc_edit_20.go
@@ -98,8 +98,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create NETCONF service
diff --git a/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_22/nc_edit_22.go b/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_22/nc_edit_22.go
index ae4891e85..7132c30a7 100644
--- a/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_22/nc_edit_22.go
+++ b/sdk/go/core/samples/netconf/cisco_ios_xr/infra_infra_locale_cfg/nc_edit_22/nc_edit_22.go
@@ -98,8 +98,7 @@ func main() {
 		Username: device["username"],
 		Password: device["password"],
 		Port: port,
-		Protocol: device["protocol"],
-		OnDemand: true}
+		Protocol: device["protocol"]}
 	provider.Connect()
 
 	// create NETCONF service
diff --git a/sdk/go/core/tests/errors_test.go b/sdk/go/core/tests/errors_test.go
index fced7b982..f4eabfecd 100644
--- a/sdk/go/core/tests/errors_test.go
+++ b/sdk/go/core/tests/errors_test.go
@@ -23,8 +23,7 @@ func (suite *ErrorsTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 	suite.CRUD.Delete(&suite.Provider, &ysanity.Runner{})
 }
diff --git a/sdk/go/core/tests/filter_read_test.go b/sdk/go/core/tests/filter_read_test.go
index 61e717534..529aeabc1 100644
--- a/sdk/go/core/tests/filter_read_test.go
+++ b/sdk/go/core/tests/filter_read_test.go
@@ -61,8 +61,7 @@ func (suite *FilterReadTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 
 	suite.CRUD.Delete(&suite.Provider, &filterread.A{})
diff --git a/sdk/go/core/tests/levels_test.go b/sdk/go/core/tests/levels_test.go
index c95e78306..4c20c09a0 100644
--- a/sdk/go/core/tests/levels_test.go
+++ b/sdk/go/core/tests/levels_test.go
@@ -24,8 +24,7 @@ func (suite *SanityLevelsTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
diff --git a/sdk/go/core/tests/netconf_op_test.go b/sdk/go/core/tests/netconf_op_test.go
index c6de8863d..41817ed92 100644
--- a/sdk/go/core/tests/netconf_op_test.go
+++ b/sdk/go/core/tests/netconf_op_test.go
@@ -47,8 +47,7 @@ func (suite *NETCONFOperationsTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
diff --git a/sdk/go/core/tests/path_api_test.go b/sdk/go/core/tests/path_api_test.go
deleted file mode 100644
index d167f7a0b..000000000
--- a/sdk/go/core/tests/path_api_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- ------------------------------------------------------------------*/
-
-package test
-
-import (
-	"fmt"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/CiscoDevNet/ydk-go/ydk"
-	"github.com/CiscoDevNet/ydk-go/ydk/path"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	encoding "github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format"
-	"github.com/stretchr/testify/suite"
-)
-
-type PathApiTestSuite struct {
-	suite.Suite
-	Session    path.NetconfSession
-	RootSchema types.RootSchemaNode
-}
-
-func (suite *PathApiTestSuite) SetupSuite() {
-	suite.Session = path.NetconfSession{
-		Address:  "127.0.0.1",
-		Username: "admin",
-		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
-	suite.Session.Connect()
-	suite.RootSchema = suite.Session.GetRootSchemaNode()
-}
-
-func (suite *PathApiTestSuite) TearDownSuite() {
-	suite.Session.Disconnect()
-}
-
-func (suite *PathApiTestSuite) BeforeTest(suiteName, testName string) {
-	runner := path.CreateRootDataNode( suite.RootSchema, "ydktest-sanity:runner")
-	payload := path.CodecEncode( runner, encoding.XML, false)
-
-	deleteRpc := path.CreateRpc( suite.RootSchema, "ydk:delete")
-	path.CreateDataNode( deleteRpc.Input, "entity", payload)
-	suite.Session.ExecuteRpc(deleteRpc);
-
-	fmt.Printf("%v: %v ...\n", suiteName, testName)
-}
-
-func (suite *PathApiTestSuite) TestBgpConfig() {
-	// Delete BGP config
-	bgp := path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-	deleteRpc := path.CreateRpc( suite.RootSchema, "ydk:delete")
-	path.CreateDataNode( deleteRpc.Input, "entity", path.CodecEncode( bgp, encoding.XML, true))
-	suite.Session.ExecuteRpc(deleteRpc)
-
-	// Greate BGP config
-	bgp = path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-	path.CreateDataNode( bgp, "global/config/as", 65172)
-	path.CreateDataNode( bgp, "global/config/router-id", "1.2.3.4")
-	neighbor := path.CreateDataNode( bgp, "neighbors/neighbor[neighbor-address='172.16.255.2']", "")
-	path.CreateDataNode( neighbor, "config/neighbor-address", "172.16.255.2")
-	path.CreateDataNode( neighbor, "config/peer-as","65172")
-
-	createRpc := path.CreateRpc( suite.RootSchema, "ydk:create")
-	path.CreateDataNode( createRpc.Input, "entity", path.CodecEncode( bgp, encoding.XML, true))
-	suite.Session.ExecuteRpc(createRpc)
-
-	// Read BGP config
-	bgp = path.CreateRootDataNode( suite.RootSchema, "openconfig-bgp:bgp")
-	readRpc := path.CreateRpc( suite.RootSchema, "ydk:read")
-	path.CreateDataNode( readRpc.Input, "filter", path.CodecEncode( bgp, encoding.XML, true))
-	path.CreateDataNode( readRpc.Input, "only-config", "")
-	result := suite.Session.ExecuteRpc(readRpc)
-	suite.NotNil(result)
-	config := path.CodecEncode( result, encoding.XML, true)
-	// ydk.YLogInfo("Got BGP config:\n" + config)
-	expected :=
-`<bgp xmlns="http://openconfig.net/yang/bgp">
-  <global>
-    <config>
-      <as>65172</as>
-      <router-id>1.2.3.4</router-id>
-    </config>
-  </global>
-  <neighbors>
-    <neighbor>
-      <neighbor-address>172.16.255.2</neighbor-address>
-      <config>
-        <neighbor-address>172.16.255.2</neighbor-address>
-        <peer-as>65172</peer-as>
-      </config>
-    </neighbor>
-  </neighbors>
-</bgp>
-`
-	suite.Equal(expected, config)
-
-	// Delete BGP config
-	suite.Session.ExecuteRpc(deleteRpc)
-}
-
-func (suite *PathApiTestSuite) TestCapabilities() {
-    capabilities := suite.Session.GetCapabilities()
-    suite.True(len(capabilities) > 0)
-    fmt.Printf("===== Capabilities (%d):\n", len(capabilities))
-    for i := 0; i < 2; i++ {
-        fmt.Println(capabilities[i])
-    }
-}
-
-func TestPathApiTestSuite(t *testing.T) {
-	if testing.Verbose() {
-		ydk.EnableLogging(ydk.Debug)
-	}
-	suite.Run(t, new(PathApiTestSuite))
-}
-
-func TestRestconfSessionPathApi(t *testing.T) {
-	if testing.Verbose() {
-		ydk.EnableLogging(ydk.Debug)
-	}
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repopath := executablePath + "/../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repopath}
-	session := path.RestconfSession{Repo: repo, Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12306, Encoding: encoding.JSON}
-	session.Connect()
-	schema := session.GetRootSchemaNode()
-	if schema.Private == nil {
-		t.Error("Could not get root schema")
-	}
-	// check capabilities
-	capabilities := session.GetCapabilities()
-	fmt.Printf("===== Capabilities (%d):\n", len(capabilities))
-	for i := 0; i < 2; i++ {
-		fmt.Println(capabilities[i])
-	}
-
-	// first delete
-	runner := path.CreateRootDataNode(schema, "ydktest-sanity:runner")
-
-	deleteRpc := path.CreateRpc(schema, "ydk:delete")
-	path.CreateDataNode(deleteRpc.Input, "entity", path.CodecEncode(runner, encoding.JSON, true))
-	session.ExecuteRpc(deleteRpc)
-
-	// config
-	path.CreateDataNode(runner, "ytypes/built-in-t/number8", "3")
-	json := path.CodecEncode(runner, encoding.JSON, true)
-
-	createRpc := path.CreateRpc(schema, "ydk:create")
-	path.CreateDataNode(createRpc.Input, "entity", path.CodecEncode(runner, encoding.JSON, true))
-	session.ExecuteRpc(createRpc)
-
-	// read and check result
-	runnerRead := path.CreateRootDataNode(schema, "ydktest-sanity:runner")
-
-	readRpc := path.CreateRpc(schema, "ydk:read")
-	path.CreateDataNode(readRpc.Input, "filter", path.CodecEncode(runnerRead, encoding.JSON, true))
-	path.CreateDataNode(readRpc.Input, "only-config", "")
-	readRunner := session.ExecuteRpc(readRpc)
-	if readRunner.Private == nil {
-		t.Error("Unexpected nil for read RPC result")
-	}
-	json = path.CodecEncode(readRunner, encoding.JSON, false)
-	if `{"ydktest-sanity:runner":{"ytypes":{"built-in-t":{"number8":3}}}}` != json {
-		t.Error("Incorrect RPC read result")
-	}
-
-	// delete config
-	session.ExecuteRpc(deleteRpc)
-
-	session.Disconnect()
-}
diff --git a/sdk/go/core/tests/provider_netconf_test.go b/sdk/go/core/tests/provider_netconf_test.go
index e4c0afa6f..61afcb1b8 100644
--- a/sdk/go/core/tests/provider_netconf_test.go
+++ b/sdk/go/core/tests/provider_netconf_test.go
@@ -22,8 +22,7 @@ func (suite *NetconfProviderTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
diff --git a/sdk/go/core/tests/service_codec_test.go b/sdk/go/core/tests/service_codec_test.go
index b78dc4592..974cfef7e 100644
--- a/sdk/go/core/tests/service_codec_test.go
+++ b/sdk/go/core/tests/service_codec_test.go
@@ -590,34 +590,6 @@ func (suite *CodecTestSuite) TestNative() {
 	suite.Equal(types.EntityEqual(&native, runnerDecode), true)
 }
 
-func (suite *CodecTestSuite) TestBoolLists() {
-	r := ysanity.Runner{}
-	r.Ytypes.BuiltInT.BoolLeafList = append(r.Ytypes.BuiltInT.BoolLeafList, true)
-        r.Ytypes.BuiltInT.BoolLeafList = append(r.Ytypes.BuiltInT.BoolLeafList, false)
-
-        boolListElem := ysanity.Runner_Ytypes_BuiltInT_BoolList{}
-        boolListElem.BoolLeaf = true
-        r.Ytypes.BuiltInT.BoolList = append(r.Ytypes.BuiltInT.BoolList, &boolListElem)
-
-        xml := suite.Codec.Encode(&suite.Provider, &r)
-        expected := `<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <ytypes>
-    <built-in-t>
-      <bool-leaf-list>true</bool-leaf-list>
-      <bool-leaf-list>false</bool-leaf-list>
-      <bool-list>
-        <bool-leaf>true</bool-leaf>
-      </bool-list>
-    </built-in-t>
-  </ytypes>
-</runner>
-`
-        suite.Equal(expected, xml)
-
-        entity := suite.Codec.Decode(&suite.Provider, xml)
-        suite.True(types.EntityEqual(entity, &r))
-}
-
 func TestCodecTestSuite(t *testing.T) {
 	if testing.Verbose() {
 		ydk.EnableLogging(ydk.Debug)
diff --git a/sdk/go/core/tests/service_crud_test.go b/sdk/go/core/tests/service_crud_test.go
index 301b686e1..7bb48a020 100644
--- a/sdk/go/core/tests/service_crud_test.go
+++ b/sdk/go/core/tests/service_crud_test.go
@@ -1,31 +1,8 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
-
 package test
 
 import (
 	"fmt"
 	ysanity "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/sanity"
-	ysanity_bgp "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/openconfig_bgp"
 	"github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/ietf_netconf_acm"
 	"github.com/CiscoDevNet/ydk-go/ydk"
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
@@ -36,7 +13,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	"strconv"
 	"testing"
-	"github.com/stretchr/testify/assert"
 )
 
 func getE(code int) ysanity.Runner_InbtwList_Ldata {
@@ -91,8 +67,7 @@ func (suite *CrudTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
@@ -105,29 +80,29 @@ func (suite *CrudTestSuite) BeforeTest(suiteName, testName string) {
 	fmt.Printf("%v: %v ...\n", suiteName, testName)
 }
 
-func (suite *CrudTestSuite) TestReadVsReadConfig() {
-    // Delete BGP config
-    bgp := ysanity_bgp.Bgp{}
-    suite.CRUD.Delete(&suite.Provider, &bgp)
-
-    // Create BGP config
-    bgp.Global.Config.As = 65172
-    bgp.Global.Config.RouterId = "1.2.3.4"
-    neighbor := ysanity_bgp.Bgp_Neighbors_Neighbor{}
-    neighbor.NeighborAddress = "172.16.255.2"
-    neighbor.Config.NeighborAddress = "172.16.255.2"
-    neighbor.Config.PeerAs = 65172
-    bgp.Neighbors.Neighbor = append(bgp.Neighbors.Neighbor, &neighbor)
-    suite.CRUD.Create(&suite.Provider, &bgp)
-
-    // Read  BGP Config and Status, then compare
-    bgp = ysanity_bgp.Bgp{}
-    bgpConfigEntity := suite.CRUD.ReadConfig(&suite.Provider, &bgp)
-    bgpStatusEntity := suite.CRUD.Read(&suite.Provider, &bgp)
-    suite.False(types.EntityEqual(bgpConfigEntity, bgpStatusEntity))
-
-    suite.CRUD.Delete(&suite.Provider, &bgp)
-}
+// todo: Read and ReadConfig both not working for OneReadOnly
+// func (suite *CrudTestSuite) TestReadOnlyContainer() {
+// 	intrfaces := interfaces.Interfaces{}
+// 	intrfaces.Interface = make([]interfaces.Interfaces_Interface, 1)
+
+// 	funcDidPanic, panicValue := didPanic(func() {
+// 		suite.CRUD.ReadConfig(&suite.Provider, &intrfaces) })
+
+// 	fmt.Println(intrfaces)
+
+// 	runner := ysanity.Runner{}
+// 	runner.OneReadOnly.Name = "runner.OneReadOnly.Name"
+
+// 	suite.CRUD.Read(&suite.Provider, &runner)
+// 	fmt.Println(runner)
+
+// 	// Try ReadConfig, expecting failure
+// 	funcDidPanic, panicValue = didPanic(func() {
+// 		suite.CRUD.ReadConfig(&suite.Provider, &runner) })
+
+// 	suite.Equal(funcDidPanic, true)
+// 	fmt.Println(panicValue)
+// }
 
 func (suite *CrudTestSuite) TestDeleteObjectOnLeaf() {
 	runnerCreate := ysanity.Runner{}
@@ -147,26 +122,49 @@ func (suite *CrudTestSuite) TestDeleteObjectOnLeaf() {
 	suite.Equal(types.EntityEqual(entityRead, &runnerCmp), true)
 }
 
-func (suite *CrudTestSuite) TestDeleteOnLeafListElement() {
+func (suite *CrudTestSuite) TestDeleteOnLeafListSlice() {
     runnerCreate := ysanity.Runner{}
-    runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "0")
+    runnerCreate.One.Name = "runner.YdktestSanityOne.Name"
     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "1")
     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "2")
     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "3")
     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "4")
-
+    runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "5")
     suite.CRUD.Create(&suite.Provider, &runnerCreate)
 
-    runnerUpdate := ysanity.Runner{}
-    deleteElement := types.LeafData{Value: "3", Filter: yfilter.Delete}
-    runnerUpdate.Ytypes.BuiltInT.Llstring = append(runnerUpdate.Ytypes.BuiltInT.Llstring, deleteElement)
+    entityRead := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+    suite.True(types.EntityEqual(&runnerCreate, entityRead))
+}
+
+// TODO: delete leaf from leaf-list
+// func (suite *CrudTestSuite) TestDeleteOnLeafList() {
+//     runnerCreate := ysanity.Runner{}
+//     runnerCreate.One.Name = "runner.YdktestSanityOne.Name"
+//     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "0")
+//     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "1")
+//     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "2")
+//     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "3")
+//     runnerCreate.Ytypes.BuiltInT.Llstring = append(runnerCreate.Ytypes.BuiltInT.Llstring, "4")
 
-    suite.CRUD.Update(&suite.Provider, &runnerUpdate)
+//     suite.CRUD.Create(&suite.Provider, &runnerCreate)
 
-    // try delete again with expected error
-    assert.Panicsf(suite.T(), func() { suite.CRUD.Update(&suite.Provider, &runnerUpdate) },
-	"Did not receive OK reply from the device", "formatted")
-}
+//     runnerUpdate := ysanity.Runner{}
+//     // TODO: how to target a particular leaf from leaf-list using YFilter?
+//     runnerUpdate.Ytypes.BuiltInT.Llstring = append(runnerUpdate.Ytypes.BuiltInT.Llstring, "3")
+//     // runnerUpdate.Ytypes.BuiltInT.Llstring = yfilter.Delete
+//     suite.CRUD.Update(&suite.Provider, &runnerUpdate)
+
+//     entityRead := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+
+//     runnerCmp := ysanity.Runner{}
+//     runnerCmp.One.Name = "runner.YdktestSanityOne.Name"
+//     runnerCmp.Ytypes.BuiltInT.Llstring = append(runnerCmp.Ytypes.BuiltInT.Llstring, "0")
+//     runnerCmp.Ytypes.BuiltInT.Llstring = append(runnerCmp.Ytypes.BuiltInT.Llstring, "1")
+//     runnerCmp.Ytypes.BuiltInT.Llstring = append(runnerCmp.Ytypes.BuiltInT.Llstring, "2")
+//     runnerCmp.Ytypes.BuiltInT.Llstring = append(runnerCmp.Ytypes.BuiltInT.Llstring, "4")
+
+//     suite.Equal(types.EntityEqual(entityRead, &runnerCmp), true)
+// }
 
 func (suite *CrudTestSuite) TestDeleteOnListWithIdentitykey() {
 	il := ysanity.Runner_OneList_IdentityList{}
@@ -200,24 +198,25 @@ func (suite *CrudTestSuite) TestDeleteOnContainer() {
 	suite.Equal(types.EntityEqual(entityRead, &runnerCmp), true)
 }
 
-func (suite *CrudTestSuite) TestDeleteOnNestedList() {
-	runnerCreate := getNestedObject()
-	suite.CRUD.Create(&suite.Provider, &runnerCreate)
+// TODO: Delete whole list using YFilter
+// func (suite *CrudTestSuite) TestDeleteOnNestedList() {
+// 	runnerCreate := getNestedObject()
+// 	ydk.YLogDebug(ee22)
+// 	suite.CRUD.Create(&suite.Provider, &runnerCreate)
 
-	entity := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
-	runnerUpdate := entity.(*ysanity.Runner)
+//     entity := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+//     runnerUpdate := entity.(*ysanity.Runner)
 
-	for _, e := range runnerUpdate.InbtwList.Ldata[1].Subc.SubcSubl1 {
-	    e.YFilter = yfilter.Delete
-	}
-	suite.CRUD.Update(&suite.Provider, runnerUpdate)
+//     // TODO: YANG list is printed as []interface, not able to assign YFilter Delete to YANG list
+//     runnerUpdate.InbtwList.Ldata[1].Subc.SubcSubl1 = yfilter.Delete
+//     suite.CRUD.Update(&suite.Provider, runnerUpdate)
 
-	entity = suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+//     entity = suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+//     runnerCmp := runnerCreate
+//     runnerCmp.InbtwList.Ldata[1].Subc.SubcSubl1 = runnerCmp.InbtwList.Ldata[1].Subc.SubcSubl1[:0]
 
-	runnerCmp := getNestedObject()
-	runnerCmp.InbtwList.Ldata[1].Subc.SubcSubl1 = []*ysanity.Runner_InbtwList_Ldata_Subc_SubcSubl1{}
-	suite.True(types.EntityEqual(entity, &runnerCmp))
-}
+//     suite.Equal(types.EntityEqual(entity, &runnerCmp), true)
+// }
 
 func (suite *CrudTestSuite) TestDeleteOnListElement() {
 	runnerCreate := getNestedObject()
@@ -235,7 +234,7 @@ func (suite *CrudTestSuite) TestDeleteOnListElement() {
 	suite.Equal(types.EntityEqual(entity, &runnerCmp), true)
 }
 
-func (suite *CrudTestSuite) TestDeleteOnFewListElements() {
+func (suite *CrudTestSuite) TestDeleteOnListElements() {
 	runnerCreate := ysanity.Runner{}
 	runnerCreate.One.Name = "one"
 	foo := ysanity.Runner_OneList_Ldata{}
@@ -291,7 +290,7 @@ func (suite *CrudTestSuite) TestSanityMultipleEntities() {
 	filterEC := types.NewFilter(&runnerFilter, &nativeFilter)
 
 	// Read running config
-	readEntity := suite.CRUD.Read(&suite.Provider, filterEC)
+	readEntity := suite.CRUD.Read(&suite.Provider, filterEC);
 	suite.Equal( types.IsEntityCollection(readEntity), true)
 
 	// Get results
@@ -301,59 +300,58 @@ func (suite *CrudTestSuite) TestSanityMultipleEntities() {
 	}
 
 	// Delete configuration
-	result = suite.CRUD.Delete(&suite.Provider, configEC)
+	result = suite.CRUD.Delete(&suite.Provider, configEC);
 	suite.Equal(result, true)
 }
 
 func (suite *CrudTestSuite) TestSanityReadConfig() {
+
 	// Import ietf_netconf_acm package in order to register otherwise missing entity 
 	nacm := ietf_netconf_acm.Nacm{}
 	
-	// Build empty filter
-	filterEC := types.NewFilter(&nacm)
-	filterEC.Clear()
+    // Build empty filter
+    filterEC := types.NewFilter(&nacm)
+    filterEC.Clear()
+
+    // Read running config
+    readEntity := suite.CRUD.ReadConfig(&suite.Provider, filterEC);
+    suite.Equal( types.IsEntityCollection(readEntity), true)
+
+    // Get results
+    readEC := types.EntityToCollection(readEntity)
+    for _, entity := range readEC.Entities() {
+    	ydk.YLogDebug(fmt.Sprintf("Printing %s", GetEntityXMLString(entity)))
+    }
+}
 
-	// Read running config
-	readEntity := suite.CRUD.ReadConfig(&suite.Provider, filterEC)
-	suite.Equal( types.IsEntityCollection(readEntity), true)
+// TODO: Delete list using YFilter
+// func (suite *CrudTestSuite) TestDeleteOnList() {
+//     runnerCreate := ysanity.Runner{}
+//     runnerCreate.One.Name = "one"
+//     foo := ysanity.Runner_OneList_Ldata{}
+//     bar := ysanity.Runner_OneList_Ldata{}
+//     foo.Number = 1
+//     foo.Name = "foo"
+//     bar.Number = 2
+//     bar.Name = "bar"
 
-	// Get results
-	readEC := types.EntityToCollection(readEntity)
-	for _, entity := range readEC.Entities() {
-		ydk.YLogDebug(fmt.Sprintf("Printing %s", GetEntityXMLString(entity)))
-	}
-}
+//     runnerCreate.OneList.Ldata = append(runnerCreate.OneList.Ldata, foo)
+//     runnerCreate.OneList.Ldata = append(runnerCreate.OneList.Ldata, bar)
 
-func (suite *CrudTestSuite) TestDeleteList() {
-	// CREATE
-	runnerCreate := ysanity.Runner{}
-	runnerCreate.One.Name = "one"
-	foo := ysanity.Runner_OneList_Ldata{}
-	bar := ysanity.Runner_OneList_Ldata{}
-	foo.Number = 1
-	foo.Name = "foo"
-	bar.Number = 2
-	bar.Name = "bar"
+//     suite.CRUD.Create(&suite.Provider, &runnerCreate)
 
-	runnerCreate.OneList.Ldata = append(runnerCreate.OneList.Ldata, &foo)
-	runnerCreate.OneList.Ldata = append(runnerCreate.OneList.Ldata, &bar)
+//     entity := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
+//     runnerUpdate := entity.(*ysanity.Runner)
 
-	suite.CRUD.Create(&suite.Provider, &runnerCreate)
+//     // TODO: Delete whole list using YFilter
+//     // runnerUpdate.OneList.Ldata = yfilter.Delete
+//     // suite.CRUD.Update(&suite.Provider, runnerUpdate)
 
-	// READ then DELETE all list elements
-	entity := suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
-	runnerUpdate := entity.(*ysanity.Runner)
-	for _, e := range runnerUpdate.OneList.Ldata {
-		e.YFilter = yfilter.Delete
-	}
-	suite.CRUD.Update(&suite.Provider, runnerUpdate)
+//     runnerCmp := runnerCreate
+//     runnerCmp.OneList.Ldata = runnerCmp.OneList.Ldata[:0]
 
-	// READ and VALIDATE
-	entity = suite.CRUD.Read(&suite.Provider, &ysanity.Runner{})
-	runnerCmp := runnerCreate
-	runnerCmp.OneList.Ldata = []*ysanity.Runner_OneList_Ldata {}
-	suite.Equal(types.EntityEqual(entity, &runnerCmp), true)
-}
+//     suite.Equal(types.EntityEqual(entity, &runnerCmp), true)
+// }
 
 func (suite *CrudTestSuite) TestDeleteContainer() {
 	// Build loopback configuration
diff --git a/sdk/go/core/tests/service_executor_test.go b/sdk/go/core/tests/service_executor_test.go
index 091463b1a..781ebf0db 100644
--- a/sdk/go/core/tests/service_executor_test.go
+++ b/sdk/go/core/tests/service_executor_test.go
@@ -1,25 +1,3 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
-
 package test
 
 import (
@@ -28,7 +6,6 @@ import (
 	"strconv"
 	ysanity "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/sanity"
 	ietfNetconf "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/ietf_netconf"
-	ietfNetconfMonitoring "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/ietf_netconf_monitoring"
 	"github.com/CiscoDevNet/ydk-go/ydk"
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
 	"github.com/CiscoDevNet/ydk-go/ydk/services"
@@ -53,8 +30,7 @@ func (suite *ExecutorServiceTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.NetconfProvider.Connect()
 	suite.CrudService		= services.CrudService{}
 	suite.CodecService 		= services.CodecService{}
@@ -359,39 +335,6 @@ func (suite *ExecutorServiceTestSuite) TestDeleteConfig() {
 	suite.Equal(readEntity, nil)
 }
 
-// RpcOutput entity to get output from RPC
-type RpcOutput struct {
-    EntityData types.CommonEntityData
-
-    // Contains the schema content. The type is string.
-    Data interface{}
-}
-
-func (output *RpcOutput) GetEntityData() *types.CommonEntityData {
-    output.EntityData.SegmentPath = "ietf-netconf-monitoring:get-schema"
-    output.EntityData.AbsolutePath = "ietf-netconf-monitoring:get-schema"
-
-    output.EntityData.Children = types.NewOrderedMap()
-    output.EntityData.Leafs = types.NewOrderedMap()
-    output.EntityData.Leafs.Append("data", types.YLeaf{"Data", output.Data})
-
-    output.EntityData.YListKeys = []string {}
-
-    return &(output.EntityData)
-}
-
-func (suite *ExecutorServiceTestSuite) TestGetSchemaRpc() {
-    rpcEntity := ietfNetconfMonitoring.GetSchema{}
-    rpcEntity.Input.Identifier = "main"
-    returnTopEntity := RpcOutput{}
-    replyEntity := suite.ExecutorService.ExecuteRpc(&suite.NetconfProvider, &rpcEntity, &returnTopEntity)
-    suite.NotNil(replyEntity)
-
-    replyOutput := replyEntity.(*RpcOutput)
-    module := types.GetLeafValue(replyOutput.Data).Value
-    suite.Equal(0, strings.Index(module, "module main {"))
-}
-
 func (suite *ExecutorServiceTestSuite) TestCloseSession() {
 	closeRpc := ietfNetconf.CloseSession{}
 	readEntity := suite.ExecutorService.ExecuteRpc(&suite.NetconfProvider, &closeRpc, nil)
@@ -437,8 +380,5 @@ func (suite *ExecutorServiceTestSuite) TestKillSession() {
 }
 
 func TestExecutorServiceTestSuite(t *testing.T) {
-	if testing.Verbose() {
-		ydk.EnableLogging(ydk.Debug)
-	}
 	suite.Run(t, new(ExecutorServiceTestSuite))
 }
diff --git a/sdk/go/core/tests/service_netconf_test.go b/sdk/go/core/tests/service_netconf_test.go
index e390e04ef..641026d02 100644
--- a/sdk/go/core/tests/service_netconf_test.go
+++ b/sdk/go/core/tests/service_netconf_test.go
@@ -55,8 +55,7 @@ func (suite *NetconfServiceTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
diff --git a/sdk/go/core/tests/types_test.go b/sdk/go/core/tests/types_test.go
index aa0dba5e2..0f39c61c3 100644
--- a/sdk/go/core/tests/types_test.go
+++ b/sdk/go/core/tests/types_test.go
@@ -25,8 +25,7 @@ func (suite *SanityTypesTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
@@ -324,13 +323,13 @@ func (suite *SanityTypesTestSuite) TestIdentityFromOtherModule() {
 }
 
 func (suite *SanityTypesTestSuite) TestCascadingTypes() {
-	cascadingTypesHelper(suite, ysanity.CompInstType_unknown, ysanity.CompNicInstType_unknown)
-	cascadingTypesHelper(suite, ysanity.CompInstType_phys, ysanity.CompNicInstType_phys)
-	cascadingTypesHelper(suite, ysanity.CompInstType_virt, ysanity.CompNicInstType_virt)
-	cascadingTypesHelper(suite, ysanity.CompInstType_hv, ysanity.CompNicInstType_hv)
+	cascadingTypesHelper(suite, ysanity.CompInstType_unknown, ysanity.CompInstType__unknown)
+	cascadingTypesHelper(suite, ysanity.CompInstType_phys, ysanity.CompInstType__phys)
+	cascadingTypesHelper(suite, ysanity.CompInstType_virt, ysanity.CompInstType__virt)
+	cascadingTypesHelper(suite, ysanity.CompInstType_hv, ysanity.CompInstType__hv)
 }
 
-func cascadingTypesHelper(suite *SanityTypesTestSuite, enum1 ysanity.CompInstType, enum2 ysanity.CompNicInstType){
+func cascadingTypesHelper(suite *SanityTypesTestSuite, enum1 ysanity.CompInstType, enum2 ysanity.CompInstType_){
 	ctypes := ysanity.CascadingTypes{}
 	ctypes.CompInstType = enum1
 	ctypes.CompNicInstType = enum2
diff --git a/sdk/go/core/tests/yfilters_test.go b/sdk/go/core/tests/yfilters_test.go
index 7ab62bbc9..841363736 100644
--- a/sdk/go/core/tests/yfilters_test.go
+++ b/sdk/go/core/tests/yfilters_test.go
@@ -25,8 +25,7 @@ func (suite *FiltersTestSuite) SetupSuite() {
 		Address:  "127.0.0.1",
 		Username: "admin",
 		Password: "admin",
-		Port:     12022,
-		OnDemand: true}
+		Port:     12022}
 	suite.Provider.Connect()
 }
 
diff --git a/sdk/go/core/ydk/logging.go b/sdk/go/core/ydk/logging.go
index cdec956df..9f2688681 100644
--- a/sdk/go/core/ydk/logging.go
+++ b/sdk/go/core/ydk/logging.go
@@ -11,8 +11,7 @@ import "fmt"
 type LogLevel int
 
 const (
-	Off LogLevel = iota
-	Debug
+	Debug LogLevel = iota
 	Info
 	Warning
 	Error
@@ -21,9 +20,6 @@ const (
 // EnableLogging enables logging on the code that runs in C++
 func EnableLogging(level LogLevel) {
 	switch level {
-	case Off:
-		C.EnableLogging(C.OFF)
-
 	case Debug:
 		C.EnableLogging(C.DEBUG)
 
@@ -40,20 +36,20 @@ func EnableLogging(level LogLevel) {
 
 func YLogInfo(msg string){
 	msg = fmt.Sprintf("[Go] %s", msg)
-	C.YLogInfo(C.CString(msg));
+    C.YLogInfo(C.CString(msg));
 }
 
 func YLogDebug(msg string){
 	msg = fmt.Sprintf("[Go] %s", msg)
-	C.YLogDebug(C.CString(msg));
+    C.YLogDebug(C.CString(msg));
 }
 
 func YLogWarn(msg string){
 	msg = fmt.Sprintf("[Go] %s", msg)
-	C.YLogWarn(C.CString(msg));
+    C.YLogWarn(C.CString(msg));
 }
 
 func YLogError(msg string){
 	msg = fmt.Sprintf("[Go] %s", msg)
-	C.YLogError(C.CString(msg));
+    C.YLogError(C.CString(msg));
 }
diff --git a/sdk/go/core/ydk/path/netconf_session.go b/sdk/go/core/ydk/path/netconf_session.go
deleted file mode 100644
index 48065977a..000000000
--- a/sdk/go/core/ydk/path/netconf_session.go
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ----------------------------------------------------------------------
- YANG Development Kit
- Package path implements support for Netconf Session in Go.
-
- Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- --------------------------------------------------------------------- */
-
-package path
-
-// #include <ydk/ydk.h>
-// #include <stdlib.h>
-import "C"
-
-import (
-	"github.com/CiscoDevNet/ydk-go/ydk"
-	"github.com/CiscoDevNet/ydk-go/ydk/errors"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	"unsafe"
-)
-
-// NetconfSession declaration and methods
-//
-type NetconfSession struct {
-	Repo        types.Repository
-	Address     string
-	Username    string
-	Password    string
-	Port        int
-	Protocol    string
-	OnDemand    bool
-	CommonCache bool
-	Timeout     int
-	ServerCert  string
-	PrivateKey  string
-
-	Private     interface{}
-	State       errors.State
-}
-
-// Connect to Netconf Session
-func (ns *NetconfSession) Connect() {
-
-	var caddress *C.char = C.CString(ns.Address)
-	defer C.free(unsafe.Pointer(caddress))
-
-	var cport C.int = C.int(ns.Port)
-	if ns.Timeout == 0 {
-		ns.Timeout = -1
-	}
-	var ctimeout C.int = C.int(ns.Timeout)
-
-	var cprotocol *C.char = C.CString(ns.Protocol)
-	defer C.free(unsafe.Pointer(cprotocol))
-
-	var cOnDemand C.boolean = 1
-	if ! ns.OnDemand { cOnDemand = 0 }
-	var cCommonCache C.boolean = 0
-	if ns.CommonCache { cCommonCache = 1 }
-
-	var cserver *C.char = C.CString(ns.ServerCert)
-	defer C.free(unsafe.Pointer(cserver))
-	var cclient *C.char = C.CString(ns.PrivateKey)
-	defer C.free(unsafe.Pointer(cclient))
-
-	var cusername *C.char = C.CString(ns.Username)
-	defer C.free(unsafe.Pointer(cusername))
-	var cpassword *C.char = C.CString(ns.Password)
-	defer C.free(unsafe.Pointer(cpassword))
-
-	AddCState(&ns.State)
-	cstate := GetCState(&ns.State)
-
-	var repo C.Repository
-	if len(ns.Repo.Path) > 0 {
-		var path *C.char = C.CString(ns.Repo.Path)
-		repo = C.RepositoryInitWithPath(*cstate, path)
-		defer C.RepositoryFree(repo)
-		PanicOnCStateError(cstate)
-	}
-
-	ns.Private = C.NetconfSessionInit( *cstate, repo, caddress, cusername, cpassword, cport,
-	                                   cprotocol, cOnDemand, cCommonCache, ctimeout,
-	                                   cserver, cclient);
-	PanicOnCStateError(cstate)
-}
-
-// Disconnect from gNMI Session
-func (ns *NetconfSession) Disconnect() {
-	if ns.Private == nil {
-		return
-	}
-	realSession := ns.Private.(C.Session)
-	C.NetconfSessionFree(realSession)
-	CleanUpErrorState(&ns.State)
-}
-
-// Get root schema node
-func (ns *NetconfSession) GetRootSchemaNode() types.RootSchemaNode {
-	cstate := GetCState(&ns.State)
-
-	realSession := ns.Private.(C.Session)
-
-	var rootSchema C.RootSchemaWrapper = C.SessionGetRootSchemaNode(*cstate, realSession)
-	PanicOnCStateError(cstate)
-
-	if rootSchema == nil {
-		ydk.YLogError("Root schema is nil!")
-		panic(1)
-	}
-
-	rsn := types.RootSchemaNode{Private: rootSchema}
-	return rsn
-}
-
-// Execute RPC
-func (ns *NetconfSession) ExecuteRpc(rpc types.Rpc) types.DataNode {
-	cstate := GetCState(&ns.State)
-
-	csession := ns.Private.(C.Session)
-	crpc := rpc.Private.(C.Rpc)
-
-	cdn := C.SessionExecuteRpc(*cstate, csession, crpc)
-	PanicOnCStateError(cstate)
-
-	dn := types.DataNode{Private: cdn}
-	return dn
-}
-
-// GetState returns error state from NetconfSession
-func (ns *NetconfSession) GetState() *errors.State {
-	return &ns.State
-}
-
-// GetCapabilities returns list of capabilities supported by NetconfSession
-func (ns *NetconfSession) GetCapabilities() []string {
-    session := types.Session{Private: ns.Private}
-    return GetSessionCapabilities(session)
-}
-
-// GetSessionCapabilities returns list of capabilities supported by Session
-func GetSessionCapabilities(session types.Session) []string {
-
-	csession := session.Private.(C.Session)
-	var state errors.State
-	AddCState(&state)
-	cstate := GetCState(&state)
-	length := C.int(0)
-	var theCArray **C.char = C.SessionGetCapabilities(*cstate, csession, &length)
-	PanicOnCStateError(cstate)
-
-	capLen := int(length)
-	slice := (*[1 << 30]*C.char)(unsafe.Pointer(theCArray))[:capLen:capLen]
-	capabilities := make([]string, capLen)
-	for i := range capabilities {
-		capabilities[i] = C.GoString(slice[i])
-	}
-	C.CapabilitiesArrayFree(theCArray, length)
-	return capabilities
-}
diff --git a/sdk/go/core/ydk/path/path.go b/sdk/go/core/ydk/path/path.go
index 493f945f0..e02211ced 100644
--- a/sdk/go/core/ydk/path/path.go
+++ b/sdk/go/core/ydk/path/path.go
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -104,7 +104,8 @@ func GetDataPayload(
 
 	codec := C.CodecInit()
 	defer C.CodecFree(codec)
-	cprovider := provider.GetPrivate().(types.CServiceProvider).Private.(C.ServiceProvider)
+	cprovider := provider.GetPrivate().(
+		types.CServiceProvider).Private.(C.ServiceProvider)
 	cencoding := C.ServiceProviderGetEncoding(cprovider)
 
 	retString := ""
@@ -156,7 +157,7 @@ func ExecuteRPCEntity(
 	PanicOnCStateError(cstate)
 
 	if rootSchema == nil {
-		ydk.YLogError("root schema is nil!")
+        ydk.YLogError("root schema is nil!")
 		panic(1)
 	}
 
@@ -166,7 +167,7 @@ func ExecuteRPCEntity(
 	ydk.YLogDebug(fmt.Sprintf("Calling GetChildByName for Entity: %s: childYangName: %s, segmentPath: %s", types.EntityToString(rpcEntity), "input", ""))
 
 	child := types.GetChildByName(rpcEntity, "input", "")
-	if child != nil && types.HasDataOrFilter(child) {
+	if (child != nil && types.HasDataOrFilter(child)) {
 		ydk.YLogDebug("Calling walkRPCChildren")
 		walkRPCChildren(state, child, rpcInput, "")
 	}
@@ -176,7 +177,7 @@ func ExecuteRPCEntity(
 
 	output := types.GetChildByName(rpcEntity, "output", "")
 
-	if output == nil || readDataNode.Private == nil {
+	if (output == nil || readDataNode.Private == nil) {
 		return nil
 	}
 	return ReadDatanode(topEntity, readDataNode)
@@ -186,7 +187,7 @@ func walkRPCChildren(
 	state *errors.State, rpcEntity types.Entity, rpcInput C.DataNode, path string) {
 
 	ydk.YLogDebug("Walking Rpc Children...")
-	if rpcEntity != nil {
+	if(rpcEntity != nil) {
 		children := types.GetYChildrenMap(rpcEntity)
 		entityPath := types.GetEntityPath(rpcEntity)
 		ydk.YLogDebug(fmt.Sprintf(
@@ -194,21 +195,21 @@ func walkRPCChildren(
 		ydk.YLogDebug(fmt.Sprintf(
 			"Got %d leafs in '%s'", len(entityPath.ValuePaths), entityPath.Path))
 
-		if path != "" {
+		if (path != "") {
 			path = fmt.Sprintf("%s/", path)
 		}
 
-		if entityPath.Path != "input" {
+		if (entityPath.Path != "input") {
 			path = fmt.Sprintf("%s%s", path, entityPath.Path)
 		}
 
-		if path != "" {
+		if (path != "") {
 			ydk.YLogDebug(fmt.Sprintf("Path: %s", path))
 		}
 
 		for _, child := range children {
-			if child.Value != nil &&
-				types.HasDataOrFilter(child.Value) {
+			if (child.Value != nil &&
+				types.HasDataOrFilter(child.Value)) {
 
 				segmentPath := child.Value.GetEntityData().SegmentPath
 				ydk.YLogDebug(fmt.Sprintf("Looking at entity child '%s'", segmentPath))
@@ -217,7 +218,7 @@ func walkRPCChildren(
 		}
 
 		// if there are leafs, create from entity path
-		if len(entityPath.ValuePaths) != 0 {
+		if (len(entityPath.ValuePaths) != 0) {
 			createFromEntityPath(state, rpcEntity, rpcInput, path)
 		}
 
@@ -234,7 +235,7 @@ func createFromEntityPath(
 			nameValue.Name, nameValue.Data.Value, entityPath.Path))
 
 		tempPath := ""
-		if path != "" {
+		if (path != "") {
 			tempPath = fmt.Sprintf("%s/", path)
 		}
 		tempPath = fmt.Sprintf("%s%s", tempPath, nameValue.Name)
@@ -264,13 +265,13 @@ func GetTopEntity(entity types.Entity) types.Entity {
 	if types.IsEntityCollection(entity) {
 		entCollection := types.EntityToCollection(entity)
 		topEntityCollection := types.NewEntityCollection()
-		for _, ent := range entCollection.Entities() {
-			topEntity := GetTopEntity(ent)
-			if topEntity != nil {
-				topEntityCollection.Add(topEntity)
-			}
-		}
-		return topEntityCollection
+	        for _, ent := range entCollection.Entities() {
+	        	topEntity := GetTopEntity(ent)
+	        	if topEntity != nil {
+		        	topEntityCollection.Add(topEntity)
+	        	}
+	        }
+	        return topEntityCollection
 	} else {
 		parent := types.GetParent(entity)
 		if parent == nil {
@@ -289,7 +290,7 @@ func GetTopEntity(entity types.Entity) types.Entity {
 
 func findEntityInChildren(parentEntity types.Entity, filterAbsPath string) types.Entity {
 	parentAbsPath := types.GetAbsolutePath(parentEntity)
-	if filterAbsPath == parentAbsPath {
+	if (filterAbsPath == parentAbsPath) {
 		ydk.YLogDebug("path.findEntityInChildren: Filter matches with parent entity, returning")
 		return parentEntity
 	}
@@ -297,31 +298,31 @@ func findEntityInChildren(parentEntity types.Entity, filterAbsPath string) types
 	// Traverse parentEntity tree for search of matching filter entity
 	ydk.YLogDebug(fmt.Sprintf("path.findEntityInChildren: Searching for filter entity '%s' under parent entity '%s'", filterAbsPath, parentAbsPath))
 	ychildren := types.GetYChildren(parentEntity.GetEntityData())
-	for _, ychild := range ychildren {
+	for _, ychild := range(ychildren) {
 		child := ychild.Value
 		if child == nil {
 			continue
-		}
-		childAbsPath := types.GetAbsolutePath(child)
-		if childAbsPath == filterAbsPath {
-			return child
-		}
-		if strings.Index(filterAbsPath, childAbsPath) == 0 {
-			ch := findEntityInChildren(child, filterAbsPath)
-			if ch != nil {
+	    	}
+	    	childAbsPath := types.GetAbsolutePath(child)
+	        if childAbsPath == filterAbsPath {
+	            return child
+	        }
+	        if strings.Index(filterAbsPath, childAbsPath) == 0 {
+	        	ch := findEntityInChildren(child, filterAbsPath)
+	        	if ch != nil {
 				return ch
 			}
-		}
+	        }
 	}
-	return nil
+        return nil
 }
 
 func findChildEntity(topEntity types.Entity, filterAbsPath string) types.Entity {
 
-	ydk.YLogDebug(fmt.Sprintf("path.findChildEntity: Searching for child entity matching non-top level filter '%s'", filterAbsPath))
-	childEntity := findEntityInChildren(topEntity, filterAbsPath)
-	if childEntity != nil {
-		ydk.YLogDebug("Found matching child entity!!")
+        ydk.YLogDebug(fmt.Sprintf("path.findChildEntity: Searching for child entity matching non-top level filter '%s'", filterAbsPath))
+        childEntity := findEntityInChildren(topEntity, filterAbsPath)
+        if childEntity != nil {
+        	ydk.YLogDebug("Found matching child entity!!")
 
 		// Set paren of found entity to nil
 		s := reflect.ValueOf(childEntity).Elem()
@@ -329,9 +330,9 @@ func findChildEntity(topEntity types.Entity, filterAbsPath string) types.Entity
 		if v.IsValid() {
 			v.Set(reflect.ValueOf(nil))
 		}
-	} else {
-		ydk.YLogDebug("Matching child entity was not found")
-	}
+        } else {
+        	ydk.YLogDebug("Matching child entity was not found")
+        }
 	return childEntity
 }
 
@@ -423,9 +424,7 @@ func ConnectToNetconfProvider(
 	address, username, password string,
 	port int,
 	protocol string,
-	onDemand, commonCache bool,
-	timeout int,
-	serverCertPath, privateKeyPath string) types.CServiceProvider {
+	onDemand, commonCache bool) types.CServiceProvider {
 
 	var caddress *C.char = C.CString(address)
 	defer C.free(unsafe.Pointer(caddress))
@@ -439,33 +438,27 @@ func ConnectToNetconfProvider(
 	defer C.free(unsafe.Pointer(cprotocol))
 
 	var cOnDemand C.boolean = 1
-	if ! onDemand { cOnDemand = 0 }
+	if onDemand { cOnDemand = 0 }
 	var cCommonCache C.boolean = 0
 	if commonCache { cCommonCache = 1 }
 
-	var ctimeout C.int = C.int(timeout)
-
-	var cserver *C.char = C.CString(serverCertPath)
-	defer C.free(unsafe.Pointer(cserver))
-	var cclient *C.char = C.CString(privateKeyPath)
-	defer C.free(unsafe.Pointer(cclient))
-
 	AddCState(state)
 	cstate := GetCState(state)
 
 	var p C.ServiceProvider
 
-	var crepo C.Repository
 	if len(repo.Path) > 0 {
 		var path *C.char = C.CString(repo.Path)
-		crepo = C.RepositoryInitWithPath(*cstate, path)
+		repo := C.RepositoryInitWithPath(*cstate, path)
+		PanicOnCStateError(cstate)
+		p = C.NetconfServiceProviderInitWithOnDemandRepo(
+			*cstate, repo, caddress, cusername, cpassword, cport, cprotocol, cOnDemand)
+		PanicOnCStateError(cstate)
+	} else {
+		p = C.NetconfServiceProviderInitWithOnDemand(
+			*cstate, caddress, cusername, cpassword, cport, cprotocol, cOnDemand, cCommonCache)
 		PanicOnCStateError(cstate)
 	}
-	p = C.NetconfServiceProviderInit(
-		*cstate, crepo, caddress, cusername, cpassword, cport,
-		cprotocol, cOnDemand, cCommonCache,
-		ctimeout, cserver, cclient)
-	PanicOnCStateError(cstate)
 
 	cprovider := types.CServiceProvider{Private: p}
 	return cprovider
@@ -478,6 +471,19 @@ func DisconnectFromNetconfProvider(provider types.CServiceProvider) {
 	C.NetconfServiceProviderFree(realProvider)
 }
 
+// GetCapabilitesFromNetconfProvider gets the capabilities supported by the provider.
+// Returns the list of capabilities.
+func GetCapabilitesFromNetconfProvider(provider types.CServiceProvider) []string {
+	realProvider := provider.Private.(C.ServiceProvider)
+	size := C.NetconfServiceProviderGetNumCapabilities(realProvider)
+	capabilities := make([]string, size)
+	for i := range capabilities {
+		ccapability := C.NetconfServiceProviderGetCapabilityByIndex(realProvider, C.int(i))
+		capabilities[i] = C.GoString(ccapability)
+	}
+	return capabilities
+}
+
 // CleanUpErrorState cleans up memory for CState.
 func CleanUpErrorState(state *errors.State) {
 	realState := GetCState(state)
@@ -610,7 +616,7 @@ func CodecEncode( datanode types.DataNode, encoding encodingFormat.EncodingForma
 	cstate := GetCState(&state)
 
 	var cPretty C.boolean = 0
-	if pretty {
+	if  pretty {
 		cPretty = 1
 	}
 
@@ -757,15 +763,15 @@ func CodecServiceDecode(
 func DatanodeToEntity(node C.DataNode) types.Entity {
 
 	nodeName := C.GoString(C.DataNodeGetArgument(node))
-	moduleName := C.GoString(C.DataNodeGetModuleName(node))
-	path := fmt.Sprintf("%s:%s", moduleName, nodeName)
-	ydk.YLogDebug(fmt.Sprintf("path.DatanodeToEntity: Got datanode with path: '%s'", path))
-
-	topEntity, ok := ydk.GetTopEntity(path)
-	if ok {
-		getEntityFromDataNode(node, topEntity)
-	}
-	return topEntity
+    moduleName := C.GoString(C.DataNodeGetModuleName(node))
+    path := fmt.Sprintf("%s:%s", moduleName, nodeName)
+    ydk.YLogDebug(fmt.Sprintf("path.DatanodeToEntity: Got datanode with path: '%s'", path))
+
+    topEntity, ok := ydk.GetTopEntity(path)
+    if ok {
+	    getEntityFromDataNode(node, topEntity)
+    }
+    return topEntity
 }
 
 // ConnectToOpenDaylightProvider connects to OpenDaylight device.
@@ -879,14 +885,10 @@ func getDataNodeFromEntity(
 
 	entPath := types.GetEntityPath(entity)
 	entAbsPath := types.GetAbsolutePath(entity)
-
 	path := C.CString(entAbsPath)
 	defer C.free(unsafe.Pointer(path))
 
-	var cvalue *C.char = C.CString("")
-	defer C.free(unsafe.Pointer(cvalue))
-
-	cdn := C.RootSchemaNodeCreate(*GetCState(state), rootSchema, path, cvalue)
+	cdn := C.RootSchemaNodeCreate(*GetCState(state), rootSchema, path)
 	PanicOnCStateError(GetCState(state))
 	dnPath := C.GoString(C.DataNodeGetPath(cdn))[1:]
 	ydk.YLogDebug(fmt.Sprintf("path.getDataNodeFromEntity: Created datanode with path '%s'", dnPath))
@@ -931,7 +933,7 @@ func populateDataNode(
 	PanicOnCStateError(GetCState(state))
 
 	if dataNode == nil {
-		ydk.YLogError(fmt.Sprintf("Datanode could not be created for: %v", path.Path))
+        ydk.YLogError(fmt.Sprintf("Datanode could not be created for: %v", path.Path))
 		panic("Datanode could not be created for: " + path.Path)
 	}
 
@@ -985,11 +987,11 @@ func getEntityFromDataNode(node C.DataNode, entity types.Entity) {
 
 	for _, childDataNode := range children {
 		childName := C.GoString(C.DataNodeGetArgument(childDataNode))
-		childModuleName := C.GoString(C.DataNodeGetModuleName(childDataNode))
+	        childModuleName := C.GoString(C.DataNodeGetModuleName(childDataNode))
 		ydk.YLogDebug(fmt.Sprintf("Looking at child datanode: '%s'", childName))
-		if moduleName != childModuleName {
-			childName = childModuleName + ":" + childName
-		}
+	        if(moduleName != childModuleName) {
+	            childName = childModuleName + ":" + childName
+	        }
 
 		if dataNodeIsLeaf(childDataNode) {
 
@@ -1020,9 +1022,8 @@ func getEntityFromDataNode(node C.DataNode, entity types.Entity) {
 }
 
 func dataNodeIsLeaf(dataNode C.DataNode) bool {
-	keyword := C.GoString(C.DataNodeGetKeyword(dataNode))
-	return keyword == "leaf" || keyword == "leaf-list" ||
-	       keyword == "anyxml" || keyword == "anydata"
+	return C.GoString(C.DataNodeGetKeyword(dataNode)) == "leaf" ||
+		C.GoString(C.DataNodeGetKeyword(dataNode)) == "leaf-list"
 }
 
 func dataNodeIsList(dataNode C.DataNode) bool {
@@ -1150,13 +1151,10 @@ func CreateRootDataNode(rsn types.RootSchemaNode, path string) types.DataNode {
 	var cpath *C.char = C.CString(path)
 	defer C.free(unsafe.Pointer(cpath))
 
-	var cvalue *C.char = C.CString("")
-	defer C.free(unsafe.Pointer(cvalue))
-
 	rootSchemaWrapper := rsn.Private.(C.RootSchemaWrapper)
 	realRootSchema := C.RootSchemaWrapperUnwrap(rootSchemaWrapper)
 
-	cdatanode := C.RootSchemaNodeCreate(*cstate, realRootSchema, cpath, cvalue)
+	cdatanode := C.RootSchemaNodeCreate(*cstate, realRootSchema, cpath)
 	PanicOnCStateError(cstate)
 
 	datanode := types.DataNode{Private: cdatanode}
@@ -1194,12 +1192,12 @@ func GetRootSchemaNode(provider types.CServiceProvider) types.RootSchemaNode {
 	rootSchema := C.ServiceProviderGetRootSchemaNode(*cstate, realProvider)
 	PanicOnCStateError(cstate)
 	if rootSchema == nil {
-		ydk.YLogError("Root schema is nil!")
+	        ydk.YLogError("Root schema is nil!")
 		panic(1)
 	}
 
 	rsn := types.RootSchemaNode{Private: rootSchema}
-	return rsn
+    return rsn
 }
 
 func ServiceProviderGetSession(provider types.CServiceProvider) types.Session {
@@ -1209,5 +1207,5 @@ func ServiceProviderGetSession(provider types.CServiceProvider) types.Session {
 	realSession := C.ServiceProviderGetSession(realProvider)
 
 	session := types.Session{Private: realSession}
-	return session
+    return session
 }
diff --git a/sdk/go/core/ydk/path/path_test.go b/sdk/go/core/ydk/path/path_test.go
index b2bf104a6..fa935e9bd 100644
--- a/sdk/go/core/ydk/path/path_test.go
+++ b/sdk/go/core/ydk/path/path_test.go
@@ -1,37 +1,11 @@
-/*  ----------------------------------------------------------------
-YDK - YANG Development Kit
-Copyright 2017-2019 Cisco Systems. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--------------------------------------------------------------------
-This file has been modified by Yan Gorelik, YDK Solutions.
-All modifications in original under CiscoDevNet domain
-introduced since October 2019 are copyrighted.
-All rights reserved under Apache License, Version 2.0.
-------------------------------------------------------------------*/
-
 package path
 
 import (
-	"path/filepath"
-	"runtime"
-	"testing"
-
 	"github.com/CiscoDevNet/ydk-go/ydk"
-	oc_bgp "github.com/CiscoDevNet/ydk-go/ydk/models/ydktest/openconfig_bgp"
+	oc_bgp "github.com/CiscoDevNet/ydk-go/ydk/models/openconfig/bgp"
+	"github.com/CiscoDevNet/ydk-go/ydk/path"
 	"github.com/CiscoDevNet/ydk-go/ydk/providers"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	encoding "github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format"
+	"testing"
 )
 
 func TestExecuteRpc(t *testing.T) {
@@ -40,62 +14,10 @@ func TestExecuteRpc(t *testing.T) {
 	provider.Connect()
 
 	bgp := oc_bgp.Bgp{}
-	data := make(map[string]string)
-	result := provider.ExecuteRpc("create", &bgp, data)
+	result := path.ExecuteRpc(&provider, &bgp, "ydk:create", "entity", false)
 	if result.Private == nil {
 		t.Error("Operation failed")
-	} else {
-		provider.ExecuteRpc("delete", &bgp, data)
 	}
 
 	provider.Disconnect()
 }
-
-func TestNetconfSessionConnectNoRepo(t *testing.T) {
-	ydk.EnableLogging(ydk.Info)
-	session := NetconfSession{Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12022}
-	session.Connect()
-
-	rootSchema := session.GetRootSchemaNode()
-
-	bgp := CreateRootDataNode(rootSchema, "openconfig-bgp:bgp")
-	CreateDataNode(bgp, "global/config/as", 65172)
-	bgpCreatePayload := CodecEncode(bgp, encoding.XML, false)
-	ydk.YLogInfo("RPC Payload:\n" + bgpCreatePayload)
-
-	createRpc := CreateRpc(rootSchema, "ydk:create")
-	CreateDataNode(createRpc.Input, "entity", bgpCreatePayload)
-	session.ExecuteRpc(createRpc)
-
-	session.Disconnect()
-}
-
-func TestNetconfSessionConnectWithRepo(t *testing.T) {
-	ydk.EnableLogging(ydk.Debug)
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repopath := executablePath + "/../../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repopath}
-	session := NetconfSession{Repo: repo, Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12022}
-	session.Connect()
-	schema := session.GetRootSchemaNode()
-	if schema.Private == nil {
-		t.Error("Could not get root schema")
-	}
-	session.Disconnect()
-}
-
-func TestRestconfSessionConnect(t *testing.T) {
-	ydk.EnableLogging(ydk.Debug)
-	_, callerFile, _, _ := runtime.Caller(0)
-	executablePath := filepath.Dir(callerFile)
-	repopath := executablePath + "/../../../../cpp/core/tests/models"
-	repo := types.Repository{Path: repopath}
-	session := RestconfSession{Repo: repo, Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12306, Encoding: encoding.XML}
-	session.Connect()
-	schema := session.GetRootSchemaNode()
-	if schema.Private == nil {
-		t.Error("Could not get root schema")
-	}
-	session.Disconnect()
-}
diff --git a/sdk/go/core/ydk/path/restconf_session.go b/sdk/go/core/ydk/path/restconf_session.go
deleted file mode 100644
index 3a5da98da..000000000
--- a/sdk/go/core/ydk/path/restconf_session.go
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ----------------------------------------------------------------------
-YANG Development Kit
-Package path implements support for Restconf Session in Go.
-
-Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---------------------------------------------------------------------- */
-
-package path
-
-// #include <ydk/ydk.h>
-// #include <stdlib.h>
-import "C"
-
-import (
-	"unsafe"
-
-	"github.com/CiscoDevNet/ydk-go/ydk"
-	"github.com/CiscoDevNet/ydk-go/ydk/errors"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	encoding "github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format"
-)
-
-// RestconfSession declaration and methods
-//
-type RestconfSession struct {
-	Repo       types.Repository
-	Address    string
-	Username   string
-	Password   string
-	Port       int
-	Encoding   encoding.EncodingFormat
-	ConfigRoot string
-	StateRoot  string
-
-	Private interface{}
-	State   errors.State
-}
-
-// Connect to Restconf Session
-func (rs *RestconfSession) Connect() {
-	var cAddress *C.char = C.CString(rs.Address)
-	defer C.free(unsafe.Pointer(cAddress))
-
-	var cUsername *C.char = C.CString(rs.Username)
-	defer C.free(unsafe.Pointer(cUsername))
-
-	var cPassword *C.char = C.CString(rs.Password)
-	defer C.free(unsafe.Pointer(cPassword))
-
-	if rs.Port == 0 {
-		rs.Port = 80
-	}
-	var cPort C.int = C.int(rs.Port)
-
-	var cEncoding C.EncodingFormat = C.JSON
-	if rs.Encoding == encoding.XML {
-		cEncoding = C.XML
-	}
-
-	if len(rs.ConfigRoot) == 0 {
-		rs.ConfigRoot = "/data"
-	}
-	var cConfigRoot *C.char = C.CString(rs.ConfigRoot)
-	defer C.free(unsafe.Pointer(cConfigRoot))
-
-	if len(rs.StateRoot) == 0 {
-		rs.StateRoot = "/data"
-	}
-	var cStateRoot *C.char = C.CString(rs.StateRoot)
-	defer C.free(unsafe.Pointer(cStateRoot))
-
-	AddCState(&rs.State)
-	cstate := GetCState(&rs.State)
-
-	var repo C.Repository
-	if len(rs.Repo.Path) > 0 {
-		var path *C.char = C.CString(rs.Repo.Path)
-		repo = C.RepositoryInitWithPath(*cstate, path)
-		defer C.RepositoryFree(repo)
-		PanicOnCStateError(cstate)
-	}
-
-	rs.Private = C.RestconfSessionInit(*cstate, repo,
-		cAddress, cUsername, cPassword, cPort,
-		cEncoding, cConfigRoot, cStateRoot)
-	PanicOnCStateError(cstate)
-}
-
-// Disconnect from gNMI Session
-func (ns *RestconfSession) Disconnect() {
-	if ns.Private == nil {
-		return
-	}
-	realSession := ns.Private.(C.Session)
-	C.RestconfSessionFree(realSession)
-	CleanUpErrorState(&ns.State)
-}
-
-// Get root schema node
-func (rs *RestconfSession) GetRootSchemaNode() types.RootSchemaNode {
-	cstate := GetCState(&rs.State)
-
-	realSession := rs.Private.(C.Session)
-
-	var rootSchema C.RootSchemaWrapper = C.SessionGetRootSchemaNode(*cstate, realSession)
-	PanicOnCStateError(cstate)
-
-	if rootSchema == nil {
-		ydk.YLogError("Root schema is nil!")
-		panic(1)
-	}
-
-	rsn := types.RootSchemaNode{Private: rootSchema}
-	return rsn
-}
-
-// Execute RPC
-func (rs *RestconfSession) ExecuteRpc(rpc types.Rpc) types.DataNode {
-	cstate := GetCState(&rs.State)
-
-	csession := rs.Private.(C.Session)
-	crpc := rpc.Private.(C.Rpc)
-
-	cdn := C.SessionExecuteRpc(*cstate, csession, crpc)
-	PanicOnCStateError(cstate)
-
-	dn := types.DataNode{Private: cdn}
-	return dn
-}
-
-// GetState returns error state from RestconfSession
-func (rs *RestconfSession) GetState() *errors.State {
-	return &rs.State
-}
-
-// GetCapabilities returns list of capabilities supported by RestconfSession
-func (rs *RestconfSession) GetCapabilities() []string {
-
-    session := types.Session{Private: rs.Private}
-    return GetSessionCapabilities(session)
-}
diff --git a/sdk/go/core/ydk/providers/netconf_provider.go b/sdk/go/core/ydk/providers/netconf_provider.go
deleted file mode 100644
index c56ecef52..000000000
--- a/sdk/go/core/ydk/providers/netconf_provider.go
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ----------------------------------------------------------------------
- YANG Development Kit
- Package path implements support for Netconf Session in Go.
-
- Copyright 2021 Yan Gorelik, YDK Solutions. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- --------------------------------------------------------------------- */
-
-package providers
-
-import (
-	"fmt"
-	"github.com/CiscoDevNet/ydk-go/ydk"
-	"github.com/CiscoDevNet/ydk-go/ydk/errors"
-	"github.com/CiscoDevNet/ydk-go/ydk/path"
-	"github.com/CiscoDevNet/ydk-go/ydk/types"
-	"github.com/CiscoDevNet/ydk-go/ydk/types/yfilter"
-)
-
-// NetconfServiceProvider Implementation of ServiceProvider for the NETCONF protocol: https://tools.ietf.org/html/rfc6241
-type NetconfServiceProvider struct {
-	Repo     	types.Repository
-	Address  	string
-	Username 	string
-	Password 	string
-	Port     	int
-	Protocol 	string
-	OnDemand 	bool
-	CommonCache	bool
-	Timeout		int
-	ServerCert	string
-	PrivateKey	string
-
-	Private types.CServiceProvider
-	State   errors.State
-}
-
-// Connect to NetconfServiceProvider using Repo/Address/Username/Password/Port
-func (provider *NetconfServiceProvider) Connect() {
-	if len(provider.Protocol) == 0 {
-		provider.Protocol = "ssh"
-	}
-	if provider.Port == 0 {
-		provider.Port = 830
-	}
-	if provider.Timeout == 0 {
-		provider.Timeout = -1
-	}
-	provider.Private = path.ConnectToNetconfProvider(
-		&provider.State,
-		provider.Repo,
-		provider.Address,
-		provider.Username,
-		provider.Password,
-		provider.Port,
-		provider.Protocol,
-		provider.OnDemand,
-		provider.CommonCache,
-		provider.Timeout,
-		provider.ServerCert,
-		provider.PrivateKey)
-}
-
-// Disconnect from NetconfServiceProvider
-func (provider *NetconfServiceProvider) Disconnect() {
-	if provider.Private.Private == nil {
-		return
-	}
-	path.DisconnectFromNetconfProvider(provider.Private)
-	path.CleanUpErrorState(&provider.State)
-}
-
-// GetPrivate returns private pointer for NetconfServiceProvider
-func (provider *NetconfServiceProvider) GetPrivate() interface{} {
-	return provider.Private
-}
-
-// GetState returns error state from NetconfServiceProvider
-func (provider *NetconfServiceProvider) GetState() *errors.State {
-	return &provider.State
-}
-
-// GetCapabilities returns the capabilities supported by NetconfServiceProvider
-func (provider *NetconfServiceProvider) GetCapabilities() []string {
-	session := path.ServiceProviderGetSession(provider.Private)
-	return path.GetSessionCapabilities(session)
-}
-
-func (provider *NetconfServiceProvider) ExecuteRpc(operation string, entity types.Entity, params map[string]string) types.DataNode {
-	return executeNetconfRpc(provider, operation, entity, params)
-}
-
-func executeNetconfRpc(provider types.ServiceProvider, operation string, entity types.Entity, params map[string]string) types.DataNode {
-	rpcTag := getRpcTag(operation)
-	dataTag := "entity"
-	if operation == "read" {
-		dataTag = "filter"
-		types.SetNontopEntityFilter(entity, yfilter.Read)
-	} else {
-		if operation == "delete" {
-			types.SetNontopEntityFilter(entity, yfilter.Delete)
-		}
-	}
-	data := make(map[string]interface{})
-	data[dataTag] = entity
-
-	setConfigFlag := false
-	mode, ok := params["mode"]
-	if ok && mode == "config" {
-		setConfigFlag = true
-	}
-	dn := path.ExecuteRPC(provider, rpcTag, data, setConfigFlag)
-	types.SetNontopEntityFilter(entity, yfilter.NotSet)
-	return dn
-}
-
-func getRpcTag(operation string) string {
-	var rpc string
-	if operation == "create" {
-		rpc = "ydk:create"
-	} else if operation == "update" {
-		rpc = "ydk:update"
-	} else if operation == "delete" {
-		rpc = "ydk:delete"
-	} else if operation == "read" {
-		rpc = "ydk:read"
-	} else {
-		ydk.YLogError(fmt.Sprintf("getRpcTag: Operation '%s' is not supported", operation));
-		panic(1)
-	}
-	return rpc;
-}
diff --git a/sdk/go/core/ydk/providers/providers.go b/sdk/go/core/ydk/providers/providers.go
index 30d79af67..8530bc63a 100644
--- a/sdk/go/core/ydk/providers/providers.go
+++ b/sdk/go/core/ydk/providers/providers.go
@@ -1,25 +1,21 @@
-/*  ----------------------------------------------------------------
- YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
- ------------------------------------------------------------------*/
-
+// Package providers implements support for Go service providers.
+//
+// YANG Development Kit Copyright 2017 Cisco Systems. All rights reserved.
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package providers
 
 import (
@@ -28,6 +24,7 @@ import (
 	"github.com/CiscoDevNet/ydk-go/ydk/errors"
 	"github.com/CiscoDevNet/ydk-go/ydk/path"
 	"github.com/CiscoDevNet/ydk-go/ydk/types"
+	"github.com/CiscoDevNet/ydk-go/ydk/types/yfilter"
 	encoding "github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format"
 	"github.com/CiscoDevNet/ydk-go/ydk/types/protocol"
 )
@@ -48,6 +45,21 @@ type OpenDaylightServiceProvider struct {
 	State           errors.State
 }
 
+// NetconfServiceProvider Implementation of ServiceProvider for the NETCONF protocol: https://tools.ietf.org/html/rfc6241
+type NetconfServiceProvider struct {
+	Repo     	types.Repository
+	Address  	string
+	Username 	string
+	Password 	string
+	Port     	int
+	Protocol 	string
+	OnDemand 	bool
+	CommonCache	bool
+
+	Private types.CServiceProvider
+	State   errors.State
+}
+
 // RestconfServiceProvider Implementation of ServiceProvider for the RESTCONF protocol: https://tools.ietf.org/html/draft-ietf-netconf-restconf-18
 type RestconfServiceProvider struct {
 	Path          string
@@ -114,6 +126,92 @@ func (provider *OpenDaylightServiceProvider) Disconnect() {
 	path.CleanUpErrorState(&provider.State)
 }
 
+// GetPrivate returns private pointer for NetconfServiceProvider
+func (provider *NetconfServiceProvider) GetPrivate() interface{} {
+	return provider.Private
+}
+
+// GetState returns error state from NetconfServiceProvider
+func (provider *NetconfServiceProvider) GetState() *errors.State {
+	return &provider.State
+}
+
+// GetCapabilities returns the capabilities supported by NetconfServiceProvider
+func (provider *NetconfServiceProvider) GetCapabilities() []string {
+	return path.GetCapabilitesFromNetconfProvider(provider.Private)
+}
+
+// Connect to NetconfServiceProvider using Repo/Address/Username/Password/Port
+func (provider *NetconfServiceProvider) Connect() {
+	if len(provider.Protocol) == 0 {
+		provider.Protocol = "ssh"
+	}
+	provider.Private = path.ConnectToNetconfProvider(
+		&provider.State,
+		provider.Repo,
+		provider.Address,
+		provider.Username,
+		provider.Password,
+		provider.Port,
+		provider.Protocol,
+		provider.OnDemand,
+		provider.CommonCache)
+}
+
+// Disconnect from NetconfServiceProvider
+func (provider *NetconfServiceProvider) Disconnect() {
+	if provider.Private.Private == nil {
+		return
+	}
+	path.DisconnectFromNetconfProvider(provider.Private)
+	path.CleanUpErrorState(&provider.State)
+}
+
+func getRpcTag(operation string) string {
+    var rpc string
+    if operation == "create" {
+        rpc = "ydk:create"
+    } else if operation == "update" {
+    	rpc = "ydk:update"
+    } else if operation == "delete" {
+    	rpc = "ydk:delete"
+    } else if operation == "read" {
+    	rpc = "ydk:read"
+    } else {
+        ydk.YLogError(fmt.Sprintf("getRpcTag: Operation '{}' is not supported", operation));
+        panic(1)
+    }
+    return rpc;
+}
+
+func executeNetconfRpc(provider types.ServiceProvider, operation string, entity types.Entity, params map[string]string) types.DataNode {
+	rpcTag := getRpcTag(operation)
+	dataTag := "entity"
+	if operation == "read" {
+		dataTag = "filter"
+		types.SetNontopEntityFilter(entity, yfilter.Read)
+	} else {
+		if operation == "delete" {
+			types.SetNontopEntityFilter(entity, yfilter.Delete)
+		}
+	}
+	data := make(map[string]interface{})
+	data[dataTag] = entity
+
+	setConfigFlag := false
+	mode, ok := params["mode"]
+	if ok && mode == "config" {
+		setConfigFlag = true
+	}
+	dn := path.ExecuteRPC(provider, rpcTag, data, setConfigFlag)
+	types.SetNontopEntityFilter(entity, yfilter.NotSet)
+	return dn
+}
+
+func (provider *NetconfServiceProvider) ExecuteRpc(operation string, entity types.Entity, params map[string]string) types.DataNode {
+	return executeNetconfRpc(provider, operation, entity, params)
+}
+
 func (provider *RestconfServiceProvider) ExecuteRpc(operation string, entity types.Entity, params map[string]string) types.DataNode {
 	return executeNetconfRpc(provider, operation, entity, params)
 }
diff --git a/sdk/go/core/ydk/providers/providers_test.go b/sdk/go/core/ydk/providers/providers_test.go
index add1f4ca9..805ce888e 100644
--- a/sdk/go/core/ydk/providers/providers_test.go
+++ b/sdk/go/core/ydk/providers/providers_test.go
@@ -1,34 +1,35 @@
 package providers
 
-import (
-	"fmt"
-	"testing"
-	"github.com/CiscoDevNet/ydk-go/ydk"
-)
+import "testing"
 
 const testHome = "."
 
 func TestNetconfServiceProvider_Connect(t *testing.T) {
-	if testing.Verbose() {
-		ydk.EnableLogging(ydk.Debug)
-	}
 	provider := NetconfServiceProvider{Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12022}
 	provider.Connect()
-	capabilities := provider.GetCapabilities()
-	if len(capabilities) > 0 {
-		fmt.Printf("===== Capabilities (%d):\n", len(capabilities))
-		for i := 0; i < 2; i++ {
-			fmt.Println(capabilities[i])
-		}
-	}
+}
+
+func TestNetconfServiceProvider_Disconnect(t *testing.T) {
+	provider := NetconfServiceProvider{Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12022}
+	provider.Disconnect()
+}
+
+func TestNetconfServiceProvider_GetPrivate(t *testing.T) {
+	provider := NetconfServiceProvider{Address: "127.0.0.1", Username: "admin", Password: "admin", Port: 12022}
+	provider.GetPrivate()
+}
+
+func TestRestconfServiceProvider_Connect(t *testing.T) {
+	provider := RestconfServiceProvider{Path: testHome, Address: "localhost", Username: "admin", Password: "admin", Port: 12306}
+	provider.Connect()
+}
+
+func TestRestconfServiceProvider_Disconnect(t *testing.T) {
+	provider := RestconfServiceProvider{Path: testHome, Address: "localhost", Username: "admin", Password: "admin", Port: 12306}
 	provider.Disconnect()
 }
 
 func TestRestconfServiceProvider_GetPrivate(t *testing.T) {
-	if testing.Verbose() {
-		ydk.EnableLogging(ydk.Debug)
-	}
 	provider := RestconfServiceProvider{Path: testHome, Address: "localhost", Username: "admin", Password: "admin", Port: 12306}
 	provider.GetPrivate()
-	provider.Disconnect()
 }
diff --git a/sdk/go/core/ydk/types/types.go b/sdk/go/core/ydk/types/types.go
index 81bafd031..a58ebfc9f 100644
--- a/sdk/go/core/ydk/types/types.go
+++ b/sdk/go/core/ydk/types/types.go
@@ -1,6 +1,6 @@
 /*  ----------------------------------------------------------------
  YDK - YANG Development Kit
- Copyright 2016-2019 Cisco Systems. All rights reserved.
+ Copyright 2016 Cisco Systems. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -301,7 +301,6 @@ func (ec *EntityCollection) Add(entities ... Entity) {
 }
 
 func (ec *EntityCollection) Append(entities []Entity) {
-	if ec.EcMap == nil { ec.Clear() }
 	for i:=0; i<len(entities); i++ {
 		entity := entities[i]
 		key := GetSegmentPath(entity)
@@ -310,17 +309,15 @@ func (ec *EntityCollection) Append(entities []Entity) {
 }
 
 func (ec *EntityCollection) Len() int {
-	if ec.EcMap == nil { ec.Clear() }
-	return ec.EcMap.Len()
+    return ec.EcMap.Len()
 }
 
 func (ec *EntityCollection) Get(key string) (Entity, bool) {
-	if ec.EcMap == nil { ec.Clear() }
-	elem, exists := ec.EcMap.Get(key)
-	if exists {
-		return elem.(Entity), exists
-	}
-	return nil, exists
+    elem, exists := ec.EcMap.Get(key)
+    if exists {
+        return elem.(Entity), exists
+    }
+    return nil, exists
 }
 
 func (ec *EntityCollection) GetItem(item int) Entity {
@@ -332,18 +329,16 @@ func (ec *EntityCollection) GetItem(item int) Entity {
 }
 
 func (ec *EntityCollection) HasKey(key string) bool {
-	if ec.EcMap == nil { ec.Clear() }
-	_, exists := ec.EcMap.Get(key)
-	return exists
+    _, exists := ec.EcMap.Get(key)
+    return exists
 }
 
 func (ec *EntityCollection) Pop(key string) (Entity, bool) {
-	if ec.EcMap == nil { ec.Clear() }
-	iEntity, exists := ec.EcMap.Pop(key)
-	if !exists {
-		return nil, exists
-	}
-	return iEntity.(Entity), exists
+    iEntity, exists := ec.EcMap.Pop(key)
+    if !exists {
+        return nil, exists
+    }
+    return iEntity.(Entity), exists
 }
 
 func (ec *EntityCollection) Clear() {
@@ -351,12 +346,10 @@ func (ec *EntityCollection) Clear() {
 }
 
 func (ec *EntityCollection) Keys() []string {
-	if ec.EcMap == nil { ec.Clear() }
-	return ec.EcMap.Keys()
+    return ec.EcMap.Keys()
 }
 
 func (ec *EntityCollection) Entities() []Entity {
-	if ec.EcMap == nil { ec.Clear() }
 	entities := make([]Entity, ec.Len())
 	iEntities := ec.EcMap.Values()
 	for i:=0; i<ec.Len(); i++ {
@@ -366,19 +359,18 @@ func (ec *EntityCollection) Entities() []Entity {
 }
 
 func (ec *EntityCollection) String() string {
-	if ec.Len() == 0 {
-		return "EntityCollection is empty"
-	}
-	entities := ec.Entities()
-	entity_str := make([]string, ec.Len())
-	for i, entity := range entities {
-		entity_str[i] = EntityToString(entity)
-	}
-	return fmt.Sprintf("EntityCollection [%s]", strings.Join(entity_str, "; "))
+    if ec.Len() == 0 {
+        return "EntityCollection is empty"
+    }
+    entities := ec.Entities()
+    entity_str := make([]string, ec.Len())
+    for i, entity := range entities {
+        entity_str[i] = EntityToString(entity)
+    }
+    return fmt.Sprintf("EntityCollection [%s]", strings.Join(entity_str, "; "))
 }
 
 func (ec *EntityCollection) SetFilter(filter yfilter.YFilter) {
-	if ec.EcMap == nil { ec.Clear() }
 	iEntities := ec.EcMap.Values()
 	for i:=0; i<ec.Len(); i++ {
 		ent := iEntities[i].(Entity)
@@ -543,7 +535,7 @@ func HasData(entity Entity) bool {
 	return false
 }
 
-func GetLeafValue(value interface{}) LeafData {
+func getLeafValue(value interface{}) LeafData {
 	var leafData LeafData
 	switch value.(type) {
 	case yfilter.YFilter:
@@ -587,7 +579,7 @@ func GetEntityPath(entity Entity) EntityPath {
 			continue
 		}
 		if field.Kind() != reflect.Slice {
-			leafData = GetLeafValue(leaf.Value)
+			leafData = getLeafValue(leaf.Value)
             //fmt.Printf("Adding leaf: name: %s, data: %v\n", name, leafData)
 			entityPath.ValuePaths = append(
 				entityPath.ValuePaths,
@@ -596,7 +588,7 @@ func GetEntityPath(entity Entity) EntityPath {
 		    // leaf-list
 		    sliceInt := leaf.Value.([]interface{})
 			for i := range sliceInt {
-				leafData = GetLeafValue(sliceInt[i])
+				leafData = getLeafValue(sliceInt[i])
 				path := name
 				if len(leafData.Value) > 0 {
 				    path = fmt.Sprintf("%s[.=\"%v\"]", name, leafData.Value)
@@ -897,28 +889,33 @@ func deepValueEqual(e1, e2 Entity) bool {
 
 	marker := make(map[string]bool)
 
+	ret := true
 	for k, c1 := range children1 {
 		if c1.Value != nil {
 			marker[k] = true
-			c2, ok := children2[k]
-			if ok && deepValueEqual(c1.Value, c2.Value) {
-				continue
-			} else {
-				return false
+			if HasDataOrFilter(c1.Value) {
+				c2, ok := children2[k]
+				if ok && deepValueEqual(c1.Value, c2.Value) {
+					ret = ret && nameValuesEqual(c1.Value, c2.Value)
+				} else {
+					ret = false
+					break
+				}
 			}
 		}
 	}
 
 	for k := range children2 {
-		if children2[k].Value != nil {
+		if children2[k].Value != nil{
 			_, ok := marker[k]
 			if !ok {
-				return false
+				ret = false
+				break
 			}
 		}
 	}
 
-	return nameValuesEqual(e1, e2)
+	return ret
 }
 
 // EntityEqual returns whether the entities x and y and their children are equal in value
@@ -931,10 +928,6 @@ func EntityEqual(x, y Entity) bool {
 
 func AddKeyToken(attr interface{}, attrName string) string {
     attrStr := fmt.Sprintf("%v", attr)
-    if attrStr == "{}" {
-        // correct key value for type Empty
-        attrStr = ""
-    }
     var token string
     if strings.Index(attrStr, "'") >= 0 {
         token = fmt.Sprintf("[%s=\"%s\"]", attrName, attrStr)
diff --git a/sdk/go/gnmi/README.md b/sdk/go/gnmi/README.md
index 20f30440c..80e7e32b2 100644
--- a/sdk/go/gnmi/README.md
+++ b/sdk/go/gnmi/README.md
@@ -30,11 +30,11 @@ In order to enable YDK support for gNMI protocol, which is optional, the followi
 
 ### gNMI package installation
 
-For gNMI Go package installation, which is optional, perform these steps.
+For gNMI Go package installation, which is optional, perform this steps.
 
 ```
 $ cd /your-path-to-ydk-gen
-$ python3 generate.py -i --service profiles/services/gnmi-0.4.0.json --go
+$ ./generate.py -i --service profiles/services/gnmi-0.4.0.json --go
 ```
 
 #### Runtime environment
@@ -44,5 +44,6 @@ See this issue on [GRPC GitHub](https://github.com/grpc/grpc/issues/10942#issuec
 As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
 
 ```
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+    PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
 ```
diff --git a/sdk/go/gnmi/tests/gnmi_service_test.go b/sdk/go/gnmi/tests/gnmi_service_test.go
index c4f024c20..f28cfc2be 100644
--- a/sdk/go/gnmi/tests/gnmi_service_test.go
+++ b/sdk/go/gnmi/tests/gnmi_service_test.go
@@ -290,9 +290,6 @@ func (suite *GnmiServiceTestSuite) TestCrudSingle() {
     // Read all
     ifcFilter := ysanity_int.Interfaces_Interface{}
     ifcFilter.Name = "Loopback10"
-    ifcs := ysanity_int.Interfaces{}
-    ifcs.Interface = append(ifcs.Interface, &ifcFilter)
-    types.SetAllParents(&ifcs)
 
     readIfc := crud.Read(&suite.Provider, &ifcFilter)
     suite.NotNil(readIfc)
diff --git a/sdk/go/gnmi/ydk/providers/gnmi_provider.go b/sdk/go/gnmi/ydk/providers/gnmi_provider.go
index 5a702a49e..7f6b6516d 100644
--- a/sdk/go/gnmi/ydk/providers/gnmi_provider.go
+++ b/sdk/go/gnmi/ydk/providers/gnmi_provider.go
@@ -99,7 +99,7 @@ func (provider *GnmiServiceProvider) ExecuteRpc(operation string, entity types.E
 			options["mode"] = "update"
 		}
 	} else {
-		ydk.YLogError(fmt.Sprintf("GnmiServiceProvider.ExecuteRpc: Invalid operation '%s' requested", operation))
+		ydk.YLogError(fmt.Sprintf("GnmiServiceProvider.ExecuteRpc: Invalid operation '{}' requested", operation))
 		panic(1)
 	}
 	return path.ExecuteGnmiRPC(provider, rpcTag, entity, options)
diff --git a/sdk/python/CHANGES.md b/sdk/python/CHANGES.md
index 03cddc31e..8ba9b3baf 100644
--- a/sdk/python/CHANGES.md
+++ b/sdk/python/CHANGES.md
@@ -1,40 +1,4 @@
-### 2023-01-31 version 0.8.6.4
-
-#### New features and enhancements
-  * install_ydk.sh: Installation of Python and Go YDK packages should not require root access ([#1069](https://github.com/CiscoDevNet/ydk-gen/issues/1069))
-  * Expanded unit test cases to retrieve list elements
-
-#### Resolved GitHub issues
-  * CodecService fails to decode XML in python when referencing namespace prefix ([#1071](https://github.com/CiscoDevNet/ydk-gen/issues/1071))
-
-
-### 2022-03-31 version 0.8.6.2
-
-#### New features and enhancements
-  * Upgraded pyang version to 2.5.0
-  * Dropped Python2 support in the code
-
-#### Resolved GitHub issues
-  * vrf route-target leaf stitching(bool) fails as invalid ([#1059](https://github.com/CiscoDevNet/ydk-gen/issues/1059))
-
-
-### 2021-05-30 version 0.8.5.2
-
-#### Resolved GitHub issues
-  * Version numbers in bundle resolver to comply with PEP 440 ([#1007](https://github.com/CiscoDevNet/ydk-gen/issues/1007))
-  * The Executor Service fails to return module content to user ([#1035](https://github.com/CiscoDevNet/ydk-gen/issues/1035))
-  * Docker base image python error ([#1036](https://github.com/CiscoDevNet/ydk-gen/issues/1036))
-  * XmlSubtreeCodec fails encode leaf-list data ([#1045](https://github.com/CiscoDevNet/ydk-gen/issues/1045))
-  * C++ CodecService fails to encode non-top level entity to XML subtree ([#1049](https://github.com/CiscoDevNet/ydk-gen/issues/1049))
-
-#### Other resolved issues and enhancements
-  * Fixed few minor bugs in C++ code
-  * Added installation of flex and bison for CentOS platform
-  * Added scripts for local unit testing of YDK release
-  * Tested YDK on Windows 10 using Windows Subsystem for Linux and Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) virtual machines.
-
-
-### 2020-09-30 version 0.8.5
+### 2020-07-30 version 0.8.5
 
 #### New features and enhancements
   * Added Entity class member function to clone entity object
@@ -42,7 +6,6 @@
 #### Resolved GitHub issues
   * python bundle generator must escape 'async' as variable name ([#980](https://github.com/CiscoDevNet/ydk-gen/issues/980))
   * YDK fails instantiate some of the generated bundle classes ([#983](https://github.com/CiscoDevNet/ydk-gen/issues/983))
-  * Python 3 TypeError while initializing CRUDService class ([#1032](https://github.com/CiscoDevNet/ydk-gen/issues/1032))
 
 #### Bundle improvements
   * Updated cisco-ios-xe bundle to support Cisco IOS XE 16.9.3 due to bug in Python generated code
@@ -379,7 +342,7 @@ tconf / Codec / Path API improvements
 #### Note on backward compatibility
 The [backward incompatible](http://ydk.cisco.com/py/docs/backward_compatibility.html) changes introduced with `0.6.0` release include:
 
-* **Installation:** When installing `YDK-Py`, there is a new system requirement which needs to be installed. This is the `libydk` library, which is available on the DevHub website for various OS platforms. Please refer to the [system requirements](https://github.com/CiscoDevNet/ydk-py/blob/master/README.rst#system-requirements) for details.
+ * **Installation:** When installing `YDK-Py`, there is a new system requirement which needs to be installed. This is the `libydk` library, which is available on the DevHub website for various OS platforms. Please refer to the [system requirements](https://github.com/CiscoDevNet/ydk-py/blob/master/README.rst#system-requirements) for details.
 * **Windows support:** From release ``0.6.0`` onwards, YDK is no longer supported on the Windows platform. We plan to add back support for this platform in the future.
 * **API changes:** Please refer to the [developer guide](http://ydk.cisco.com/py/docs/developer_guide.html) and [API guide](http://ydk.cisco.com/py/docs/api_guide.html) for details about APIs and how to use them.
    * `NetconfServiceProvider` no longer has the `close()` method. There is no need to explicitly close the provider as it will be automatically cleaned up when the object goes out of scope.
diff --git a/sdk/python/README.rst b/sdk/python/README.rst
index 56d2b300d..372ca8496 100644
--- a/sdk/python/README.rst
+++ b/sdk/python/README.rst
@@ -1,7 +1,7 @@
 ..
   # *************************************************************
   #  YDK-YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -42,28 +42,25 @@ YANG Development Kit (Python)
 Overview
 ========
 
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
+The YANG Development Kit (YDK) is a Software Development Kit that provides API's that are modeled in YANG.
 The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API and abstracting protocol/encoding details.
 YDK is composed of a core package that defines services and providers, plus one or more module bundles that are based on YANG models.
 
 Backward Compatibility
 ======================
 
-The Python YDK-0.8.6 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
-However the YDK-0.8.6 generates slightly different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling of YList objects.
-
-**NOTE.** Starting from release 0.8.5 the YDK does not support Python2 interpreter as it was deprecated.
+The Python YDK-0.8.5 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
+However the YDK-0.8.5 generates slightly different code and model API comparing to YDK-0.8.4.
+The YDK-0.8.5 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling YList objects.
 
+..
+  Please see `the release notes <https://github.com/CiscoDevNet/ydk-py/releases/tag/0.8.5>`_ for details.
 
 Docker
 ======
 
-To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command.
-See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
-
-  docker run -it ydksolutions/ydk-gen:0.8.6.4
-
+Currently the `docker image <https://docs.docker.com/engine/reference/run/>`_ for ydk-py is not been generated.
+Please use `ydk-gen <https://github.com/ygorelik/ydk-gen/tree/0.8.5#docker>`_ docker image, which has complete environment for ydk-py based development.
 
 ..
   A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-py commit to the GitHub.
@@ -72,239 +69,351 @@ See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_
   To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command.
   See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
 
-    docker run -it ydksolutions/ydk-gen:0.8.6.4
+    docker run -it ydkdev/ydk-py
 
 
 System Requirements
 ===================
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
+Linux
+-----
+
+**Ubuntu (Debian-based)**
+
+The following packages must be present in your system before installing YDK-Py::
+
+  # Install Third-party software
+  sudo apt-get install gdebi-core python3-dev python-dev libtool-bin
+  sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
+
+Download and install YDK core library `libydk`. You can install the library using prebuilt debian packages for Xenial and Bionic LTS distributions.
+For other Ubuntu distributions it is recommended to build core library from source.
+
+For Xenial (Ubuntu 16.04.4)::
+
+  # Upgrade compiler to gcc 5.*
+  sudo apt-get install gcc-5 g++-5 -y > /dev/null
+  sudo ln -sf /usr/bin/gcc-5 /usr/bin/cc
+  sudo ln -sf /usr/bin/g++-5 /usr/bin/c++
+
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
 
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x
- - MacOS up to 11.6.2 (Big Sur)
+For Bionic (Ubuntu 18.04.1)::
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check `this <https://www.windowscentral.com/install-windows-subsystem-linux-windows-10>`_ for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
 
-On supported platforms the YDK can be installed using `Installation Script`_.
-On other platforms the YDK should be installed manually `Building from source`_.
-For both the methods the user must install `git` package prior to the installation procedure.
+**Centos (Fedora-based)**
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+The following packages must be present in your system before installing YDK-Py. Currently, only Centos7/RHEL7 are known to work::
 
-**NOTE.** Due to GitHub issue `#1050 <https://github.com/CiscoDevNet/ydk-gen/issues/1050>`_ YDK is not supported with Python 3.9.x.
+  # Install Third-party software
+  sudo yum install epel-release
+  sudo yum install libssh-devel gcc-c++ python-devel python3-devel
 
-**NOTE.** It is strongly recommended to use Python virtual environment on Centos/RHEL and Mac platforms.
+  # Upgrade compiler to gcc 5.*
+  sudo yum install centos-release-scl -y > /dev/null
+  sudo yum install devtoolset-4-gcc* -y > /dev/null
+  sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/cc
+  sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/c++
 
-Core Installation
-=================
+  # Install YDK core library
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 
-Installation Script
+MacOS
+-----
+
+It is required to install Xcode command line tools, `homebrew <http://brew.sh>`_ and the following homebrew packages on your system before installing YDK-Py::
+
+  xcode-select --install
+  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  brew install pkg-config libssh xml2 libxml2 curl pcre cmake pybind11 doxygen libgcrypt
+
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+  sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+
+Libssh Installation
 -------------------
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
+The libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. If after installation of libssh package the `libssh_threads.a` is missing, please downgrade the installation to libssh-0.7.6,
+or upgrade to libssh-0.8.1 or higher.
 
-If the script installs any YDK component, it also creates an environment activation file '.env' in the 'ydk-gen'
-directory, which can be used to activate YDK runtime environment identical to the installation environment.
-To activate YDK runtime environment simply run this command once in bash shell:
+**Note for MacOS**
+Before installing `libssh` make sure the environment for `openssl` is setup::
 
-.. code-block:: sh
+  brew reinstall openssl
+  export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 
-    cd ydk-gen
-    source .env
+Download libssh-0.7.6 source code, compile it and install::
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-If user has different location, the PYTHON_VENV environment variable should be set to that location.
+  wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+  tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
+  mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
+  cmake ..
+  sudo make install
 
-When installing YDK for Python programming language, the third party dependencies and C++ packages must be installed first.
-These steps require sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Python programming language and Python virtual environment:
+gNMI Requirements
+-----------------
+
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
+
+Install protobuf and protoc
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: sh
 
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-    export YDKGEN_HOME=`pwd`  # optional
-    export PYTHON_VENV=$HOME/ydk_vne  # optional
-    ./install_ydk.sh --cpp --core --venv
-    ./install_ydk.sh --py --core --venv
-
-
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this::
-
-    ./install_ydk.sh --help
-    usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-    Options and arguments:
-      --cpp                 install YDK for C++ programming language;
-                            requires sudo access for dependencies and libraries installation
-      --go                  install YDK for Go programming language
-      --py|--python         install YDK for Python programming language
-      --all                 install YDK for all available programming languages;
-                            requires sudo access for dependencies and libraries installation
-      -v|--venv             create python virtual environment
-      -c|--core             install YDK core package
-      -s|--service gnmi     install gNMI service package
-      -n|--no-deps          skip installation of dependencies;
-                            applicable only with --cpp and --all options
-      -h|--help             print this help message and exit
-
-    Environment variables:
-    YDKGEN_HOME         specifies location of ydk-gen git repository;
-                        if not set, $HOME/ydk-gen is assumed
-    PYTHON_VENV         specifies location of python virtual environment;
-                        if not set, $HOME/venv is assumed
-    GOROOT              specifies installation directory of go software;
-                        if not set, /usr/local/go is assumed
-    GOPATH              specifies location of go source directory;
-                        if not set, $HOME/go is assumed
-    C_INCLUDE_PATH      location of C include files;
-                        if not set, /usr/local/include is assumed
-    CPLUS_INCLUDE_PATH  location of C++ include files;
-                        if not set, /usr/local/include is assumed
-    CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                        if not set, default system library location is assumed
-
-If user environment is different from the default one (different Python installation or different
-location of libraries) then building from source method should be used.
-
-Building from source
---------------------
-
-Environment variables
-~~~~~~~~~~~~~~~~~~~~~
+  wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+  unzip protobuf-cpp-3.5.0.zip
+  cd protobuf-3.5.0
+  ./configure
+  make
+  sudo make install
+  sudo ldconfig
 
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the headers file location must be specified explicitly (in below commands the default location is shown)::
+Install gRPC
+~~~~~~~~~~~~
+
+.. code-block:: sh
 
-    export C_INCLUDE_PATH=/usr/local/include
-    export CPLUS_INCLUDE_PATH=/usr/local/include
+  git clone -b v1.9.1 https://github.com/grpc/grpc
+  cd grpc
+  git submodule update --init
+  make
+  sudo make install
+  sudo ldconfig
 
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
+Instal YDK gNMI library
+~~~~~~~~~~~~~~~~~~~~~~~
 
-Installing third party dependencies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Ubuntu**
 
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script.
-The script will also install Python virtual environment in default or specified location, when '--venv' is specified::
+For Xenial (Ubuntu 16.04.4)::
 
-    # Clone ydk-gen from GitHub
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 
-    # Define optional environment variables and install dependencies
-    export YDKGEN_HOME=`pwd`
-    export PYTHON_VENV=$HOME/ydk_venv
-    ./install_ydk.sh -v   # also builds Python virtual environment
+For Bionic (Ubuntu 18.04.1)::
 
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
 
-Installing core components
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+**CentOS**::
 
-Please follow this procedure to install YDK core components for Python apps development::
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
 
-    # Activate YDK runtime environment
-    source .env
+**MacOS**::
 
-    # Generate and install YDK core library
-    python3 generate.py -is --core --cpp
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+  sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
 
-    # Generate and install Python core package
-    python3 generate.py -i --py --core -v
+Runtime environment
+~~~~~~~~~~~~~~~~~~~
 
-Adding gNMI Service
+There is an open issue with gRPC on Centos/Fedora, which requires an extra step before running any YDK gNMI application.
+See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
+As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+
+  PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
+
+Python Requirements
 -------------------
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package.
+YDK supports both Python2 and Python3 versions. At least Python2.7 or Python3.4 must be installed on your system.
 
-gNMI service installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
+It is also required for Python installation to include corresponding shared library. As example::
 
-Here is simple example, how gNMI service package for Python could be added::
+  python2.7  - /usr/lib/x86_64-linux-gnu/libpython2.7.so
+  python3.5m - /usr/lib/x86_64-linux-gnu/libpython3.5m.so
 
-    cd ydk-gen
-    ./install_ydk.sh --cpp --service gnmi --venv  # requires sudo access
-    ./install_ydk.sh --py --service gnmi --venv
+Please follow `System Requirements`_ to assure presence of shared Python libraries.
 
+If you choose to install Python from source (need specific version), please include `--enable-shared` flag in `configure`
+command to include build of shared library::
 
-gNMI runtime environment
-~~~~~~~~~~~~~~~~~~~~~~~~
+  cd Python3.4.1
+  ./configure --prefix=/opt/python --enable-shared
+  make
+  make install
 
-When YDK is installed using 'install_ydk.sh' script, the runtime environment is set by running 'source .env' in bash shell.
-The below information is applicable only when YDK is installed manually, which is not recommended.
+Here the `/opt/python` is your Python installation directory. If installation directory is different from the system path,
+you need to configure `CMAKE_LIBRARY_PATH` environment variable to assure that `cmake` uses correct Python library::
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
-As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+  export CMAKE_LIBRARY_PATH=/opt/python/lib
 
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+Run `pip install ydk` command with `-v` option and in the console output note location of found `PythonLibs`.
+Make sure it matches with your installed Pyton dynamic library location::
 
+  -- Found PythonLibs: /opt/python/lib/libpython3.4m.so
 
-Bundle Installation
-===================
+In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
+In this case the header location must be specified explicitly (in below commands the default location is shown)::
+
+  export C_INCLUDE_PATH=/usr/local/include
+  export CPLUS_INCLUDE_PATH=/usr/local/include
+
+Mac OS
+~~~~~~
 
-Once you have installed the `ydk` core package, you can install one or more model bundles.  Note that some bundles have dependencies on other bundles.
-Those dependencies are already captured in the bundle package.  Make sure you install the desired bundles in the order below.
-To install the `ietf` bundle from `ydk-gen` execute::
+The developers of Python2 on Mac OS might face an `installation issue <https://github.com/CiscoDevNet/ydk-gen/issues/837>`_.
+This is well known and documented issue. Each developer might have different approaches for its resolution.
+One of them is to use Python2 virtual environment. See section `Using Python virtual environment`_ for details.
 
-  # Navigate to ydk-gen directory and activate runtime environment
-  cd ydk-gen
-  source .env  # if not ran previously
+In addition it is required properly set `CMAKE_LIBRARY_PATH` environment variable to assure that `cmake` uses correct Python library.
+Follow these steps to find and set correct library path.
 
-  # Generate and install the bundle
-  python3 generate.py -i --bundle profiles/bundles/ietf_0_1_6.json
+1. Find installations of `libpython2.7` library:
 
-To install the `openconfig` bundle, execute::
+.. code-block:: sh
+
+  locate libpython2.7.dylib
+  /System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib
+  /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config/libpython2.7.dylib
+  /usr/lib/libpython2.7.dylib
+  /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib
+  /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config/libpython2.7.dylib
+
+2. Choose non-system Python library installation and set `CMAKE_LIBRARY_PATH` before any YDK component installation. Example:
+
+.. code-block:: sh
 
-  # Navigate to ydk-gen directory and activate runtime environment, if applicable
-  source $PYTHON_VENV/bin/activate
-  cd ydk-gen
-  source .env  # if not ran previously
+  export CMAKE_LIBRARY_PATH=/usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib
 
-  # Generate and install the bundle
-  python3 generate.py --bundle profiles/bundles/openconfig_0_1_9.json -i
+3. Run YDK core package installation with '-v' flag to check that `PythonLibs` points to correct library path. Example:
 
-To install the `cisco-ios-xr` bundle, execute::
+.. code-block:: sh
+
+  $ ./generate.py --core
+  $ pip install -v gen-api/python/ydk/dist/ydk*.tar.gz
 
-  # Navigate to ydk-gen directory and activate runtime environment
-  cd ydk-gen
-  source .env  # if not ran previously
+4. In 'cmake' log look for 'PythonLibs' and 'found version' settings line:
 
-  # Generate and install the bundle
-  python3 generate.py --bundle profiles/bundles/cisco-ios-xr-6_7_4.json -i
+.. code-block:: sh
 
+  -- Found PythonLibs: /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib (found version "2.7.15")
+
+5. Finally test you YDK core library installation from CLI, making sure there are no errors:
+
+.. code-block:: sh
+
+  $ python -c "import ydk.types"
+
+
+How to install
+==============
+
+Using Python virtual environment
+--------------------------------
+
+You may want to perform the installation under Python virtual environment (`virtualenv <https://pypi.python.org/pypi/virtualenv/>`_/`virtualenvwrapper  <https://pypi.python.org/pypi/virtualenvwrapper>`_).
+The virtual environment allows you to install multiple versions of YDK if needed.  In addition, it prevents any potential conflicts between package dependencies in your system.
+
+To install virtual environment support in your system, execute::
+
+  pip install virtualenv virtualenvwrapper
+  source /usr/local/bin/virtualenvwrapper.sh
+
+To create and activate new virtual environment::
+
+  mkvirtualenv -p python2.7 ydk-py
+
+To activate existing virtual environment::
+
+  source ~/.virtualenvs/py2/bin/activate
+
+To exit virtual environment::
+
+  deactivate
+
+Once Python virtual environment is activated, you can perform quick installation or installation from source described above.
+Take into consideration that you must not attempt to install YDK as root user under virtual environment.
+
+Quick Install
+-------------
+
+You can install the latest model packages from the Python package index.  Note that, in some systems, you need to install the new package as root.
+You get a fully operational YDK environment by installing the ``cisco-ios-xr`` and/or ``cisco-ios-xe`` bundle(s) (depending on whether you're developing for an IOS XR or IOS XE platform),
+which automatically installs all other YDK-related packages (``ydk``, ``openconfig`` and ``ietf`` packages)::
+
+  pip install ydk-models-cisco-ios-xr
+  pip install ydk-models-cisco-ios-xe
+
+Alternatively, you can perform a partial installation.  If you only want to install the ``openconfig`` bundle and its dependencies (``ydk`` and ``ietf`` packages), execute::
+
+  pip install ydk-models-openconfig
+
+If you only want to install the ``ietf`` bundle and its dependencies (``ydk`` package), execute::
+
+  pip install ydk-models-ietf
+
+To installation of model bundles on CentOS/RedHat platforms require special handling; please follow the below steps.
+
+**Python2.7**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-cisco-ios-xe
+
+**Python3.4**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-cisco-ios-xe
+
+**Python3.6**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-cisco-ios-xe
+
+Installing from Source
+----------------------
+
+If you prefer not to use the YDK packages in the Python package index, you need to install manually the ``ydk`` core package and then the model bundles you plan to use.
+To install the ``ydk`` core package, execute::
+
+  $ cd core
+  core$ python setup.py sdist
+  core$ pip install dist/ydk*.gz
+
+Once you have installed the ``ydk`` core package, you can install one more model bundles.  Note that some bundles have dependencies on other bundles.
+Those dependencies are already captured in the bundle package.  Make sure you install the desired bundles in the order below.  To install the ``ietf`` bundle, execute::
+
+  core$ cd ../ietf
+  ietf$ python setup.py sdist
+  ietf$ pip install dist/ydk*.gz
+
+To install the ``openconfig`` bundle, execute::
+
+  ietf$ cd ../openconfig
+  openconfig$ python setup.py sdist
+  openconfig$ pip install dist/ydk*.gz
+
+To install the ``cisco-ios-xr`` bundle, execute::
+
+  openconfig$ cd ../cisco-ios-xr
+  cisco-ios-xr$ python setup.py sdist
+  cisco-ios-xr$ pip install dist/ydk*.gz
+  cisco-ios-xr$ cd ..
 
 Documentation and Support
 =========================
 
-Available resources:
-
-- Check `GitHub Pages <https://ciscodevnet.github.io/ydk-gen/>`_ for the latest YDK release documentation
-- Find some Python app samples in the `samples directory <https://github.com/CiscoDevNet/ydk-py/tree/master/core/samples>`_
-- Find hundreds of additional samples in the `YDK Python samples repository <https://github.com/CiscoDevNet/ydk-py-samples/tree/master/samples/basic>`_
-- Join the `YDK community <https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk>`_ to connect with YDK users and developers
+- Read the `API documentation <http://ydk.cisco.com/py/docs>`_ for details on how to use the API and specific models
+- Samples can be found under the `samples directory <https://github.com/CiscoDevNet/ydk-py/tree/master/core/samples>`_
+- Hundreds of additional samples can be found in the `YDK-PY samples repository <https://github.com/CiscoDevNet/ydk-py-samples>`_
+- Join the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ to connect with other users and with the makers of YDK
+- Additional YDK information can be found at `ydk.io <http://ydk.io>`_
 
 Release Notes
 =============
 
-The current YDK release version is 0.8.6.4.
-
-YDK is licensed under the Apache 2.0 License.
+The current YDK release version is 0.8.5. YDK-Py is licensed under the Apache 2.0 License.
diff --git a/sdk/python/core/CMakeLists.txt b/sdk/python/core/CMakeLists.txt
index 4eba75ec4..d12831d10 100644
--- a/sdk/python/core/CMakeLists.txt
+++ b/sdk/python/core/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0.0)
 cmake_policy(SET CMP0048 NEW)
 
-project(path VERSION 0.8.6 LANGUAGES C CXX)
+project(path VERSION 0.8.5 LANGUAGES C CXX)
 
 set(CMAKE_MACOSX_RPATH 1)
 
diff --git a/sdk/python/core/docsgen/.nojekyll b/sdk/python/core/docsgen/.nojekyll
deleted file mode 100644
index 8d1c8b69c..000000000
--- a/sdk/python/core/docsgen/.nojekyll
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/sdk/python/core/docsgen/about_ydk.rst b/sdk/python/core/docsgen/about_ydk.rst
index fb60d1723..e3baf2d7e 100644
--- a/sdk/python/core/docsgen/about_ydk.rst
+++ b/sdk/python/core/docsgen/about_ydk.rst
@@ -1,43 +1,10 @@
-..
-  #  YDK-YANG Development Kit
-  #  Copyright 2016 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 About YDK
 =========
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
-The YDK allows generate YANG model API and provides services to apply generated API over various communication protocols.
-Currently implemented protocols are: Netconf, Restconf, OpenDaylight and gNMI.
-YDK provides CRUD and protocol specific services over above protocols.
-YDK also provides codec services to translate API models to/from XML and JSON encoded strings.
-
-The YDK is a multi-language software. Currently supported languages are Python, Go, and C++.
+A Software Development Kit that provides API's that are modeled in YANG.
 
 License
 -------
-Copyright 2016-2019 Cisco Systems. All rights reserved
+Copyright 2016 Cisco Systems. All rights reserved
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. 
 See the NOTICE file distributed with this work for additional information regarding copyright ownership.  
@@ -47,33 +14,27 @@ You may obtain a copy of the License at:
 
     `http://www.apache.org/licenses/LICENSE-2.0 <http://www.apache.org/licenses/LICENSE-2.0>`_
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
 See the License for the specific language governing permissions and limitations under the License.
 
-Some of the source files in this release have been modified by Yan Gorelik, YDK Solutions.
-All modifications in original files under CiscoDevNet domain introduced since October 2019 are copyrighted
-and protected under Apache License, Version 2.0.
-
 Version
 -------
 Version : version-id
 
-This YDK for Python documentation is generated using
-`ydk-gen/generate.py <https://github.com/CiscoDevNet/ydk-gen/blob/master/generate.py>`_ script.
+This ydk-py is generated using `ydk-gen <https://github.com/CiscoDevNet/ydk-gen>`_.
 
-To check out this version of ydk-gen use the below commands:
+To check out the latest version of ydk-gen, which is used to generate this ydk-py, use the below commands:
 
 .. code-block:: sh
 
     $ git clone repo-url
     $ git checkout commit-id
 
-..
-	Backwards Compatibility Notes
-	-----------------------------
-	When installing and using the ``0.6.0`` and newer releases of ``YDK-Py``, please refer to the :ref:`compatibility`.
+Backwards Compatibility Notes
+-----------------------------
+When installing and using the ``0.6.0`` and newer releases of ``YDK-Py``, please refer to the :ref:`compatibility`.
 
-Release Changes
----------------
- - `Changelog <https://github.com/CiscoDevNet/ydk-gen/blob/master/CHANGES.md>`_
+Changelog
+----------
+ - `Changelog <https://github.com/CiscoDevNet/ydk-py/blob/master/CHANGES.md>`_
diff --git a/sdk/python/core/docsgen/api/errors.rst b/sdk/python/core/docsgen/api/errors.rst
index 1e1650ebe..aa503718b 100644
--- a/sdk/python/core/docsgen/api/errors.rst
+++ b/sdk/python/core/docsgen/api/errors.rst
@@ -1,30 +1,3 @@
-..
-  #  YDK-YANG Development Kit
-  #  Copyright 2016 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 Errors
 ======
 
@@ -39,18 +12,6 @@ This module contains YDK Python errors classes. These errors are thrown in case
 
     Base class for Y Errors. The subclasses give a specialized view of the error that has occurred.
 
-.. py:exception:: YCoreError
-
-    Bases: :exc:`ydk.errors.YError`
-
-    Core Error. Base exception class for all YDK core errors.
-
-.. py:exception:: YCodecError
-
-    Bases: :exc:`ydk.errors.YCoreError`
-
-    Codec Error. Thrown when a Path Codec fails to perform encoding or decoding.
-
 .. py:exception:: YModelError
 
     Bases: :exc:`ydk.errors.YError`
@@ -91,4 +52,6 @@ This module contains YDK Python errors classes. These errors are thrown in case
 
     Bases: :exc:`ydk.errors.YError`
 
-    Exception for Service Side Validation.
+    Exception for Service Side Validation
+
+
diff --git a/sdk/python/core/docsgen/api/path/codec.rst b/sdk/python/core/docsgen/api/path/codec.rst
index c1538a9df..94d782e52 100644
--- a/sdk/python/core/docsgen/api/path/codec.rst
+++ b/sdk/python/core/docsgen/api/path/codec.rst
@@ -1,58 +1,23 @@
-..
-  #  YDK-YANG Development Kit
-  #  Copyright 2016 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 Codec
-=====
+=============
 
 .. module:: ydk.path
     :synopsis: Path API Codec
 
 .. py:class:: Codec
 
-    YDK Path Codec provides encode and decode translations between string payload and :py:class:`DataNode<ydk.path.DataNode>`.
-
-    .. py:method:: encode(data_node, encoding, pretty=True):
+    YDK Path Codec used to encode and decode between payload and ``DataNode``.
 
-        Encodes data in `data_node` to string payload.
+    .. py:method:: encode(data_node, encoding, pretty):
 
-        :param data_node: (:py:class:`DataNode<ydk.path.DataNode>`) for single data node to encode.
+        Encoding data in ``data_node`` to string payload.
 
-              For multiple data nodes encapsulate :py:class:`DataNode<ydk.path.DataNode>` instances into Python ``list``.
+        :param data_node: (:py:class:`DataNode<ydk.path.DataNode>`) Path ``DataNode`` to encode.
         :param encoding: (:py:class:`EncodingFormat<ydk.types.EncodingFormat>`) Encoding format.
         :param pretty: (``bool``) Pretty format.
-        :return: (``str``) encoded payload.
-        :raises: ``RuntimeError`` with :py:exc:`YCodecError<ydk.errors.YCodecError>` prefix, if an error has occurred.
 
     .. py:method:: decode(root_schema_node, payload, encoding):
 
-        Decodes payload string into :py:class:`DataNode<ydk.path.DataNode>` instance.
-
-        :param root_schema_node: (:py:class:`RootSchemaNode<ydk.path.RootSchemaNode>`) An instance of `root_schema_node`.
+        :param root_schema_node: (:py:class:`RootSchemaNode<ydk.path.RootSchemaNode>`) A Path ``RootSchemaNode``
         :param payload: (``str``) Payload to decode.
         :param encoding: (:py:class:`EncodingFormat<ydk.types.EncodingFormat>`) Encoding format.
-        :return: (:py:class:`DataNode<ydk.path.DataNode>`) instance of a `data-node`.
-        :raises: ``RuntimeError`` with :py:exc:`YCodecError<ydk.errors.YCodecError>` prefix, if an error has occurred.
diff --git a/sdk/python/core/docsgen/api/path/netconf_session.rst b/sdk/python/core/docsgen/api/path/netconf_session.rst
index bf526058a..1d70f4257 100644
--- a/sdk/python/core/docsgen/api/path/netconf_session.rst
+++ b/sdk/python/core/docsgen/api/path/netconf_session.rst
@@ -5,22 +5,21 @@ NetconfSession
     :synopsis: NetconfSession
 
 
-.. py:class:: NetconfSession(repo, address, username, password, port=830, protocol="ssh", on_demand=True, common_cache=False, int timeout=None, repo=None, private_key_path="", public_key_path="")
+.. py:class:: NetconfSession(address, username, password, port=830, protocol="ssh", on_demand=True, common_cache=False, int timeout=None, repo=None, private_key_path="", public_key_path="")
 
     Constructs an instance of the `NetconfSession` class and connects to Netconf server, which **must** support model download. 
 
     :param address: (``str``) IP address or DNS name of device, which supports Netconf server; required parameter.
     :param username: (``str``) Username to log in to the device; required parameter.
-    :param password: (``str``) Password to log in to the device; not required, if `public_key_path` specified.
-    :param port: (``int``) Device port number, which is used to access the Netconf interface; default value is 830.
-    :param protocol: (``str``) Currently supported "ssh" for secure connection and "tcp" for insecure connection; default - "ssh".
+    :param password: (``str``) Password to log in to the device.
+    :param port: (``int``) Device port used to access the Netconf interface. Default value is 830.
+    :param protocol: (``str``) Currently supported `ssh` for secure connection and `tcp` for insecure connection; default - `ssh`.
     :param on_demand: (``bool``) On demand model downloading by default.
     :param common_cache: (``bool``) Use common cache directory, if enabled.
-    :param timeout: (``int``) The timeout in microseconds: None or -1 for infinite timeout, 0 - for non-blocking.
-    :param repo: (:py:class:`Repository<Repository>`) User provided repository - directory, which stores cached YANG models.
-        If not specified, the temporary repository at "~/.ydk/<address>" is created.
-    :param private_key_path: (``str``) Path to private key file. This is optional parameter, which requires `public_key_path` field.
-    :param public_key_path: (``str``) Path to public key file. This is optional parameter.
+    :param timeout: (``int``) The timeout in microseconds: None or -1 for infinite timeout, 0 - for non-blocking
+    :param repo: (:py:class:`Repository<Repository>`) User provided repository - directory, which stores cached Yang models.
+    :param private_key_path: (``str``) Path to private key file. Requires public_key_path field.
+    :param public_key_path: (``str``) Path to public key file. Does not allow `password` field, if specified.
 
     .. py:method:: get_root_schema()
 
@@ -54,6 +53,6 @@ NetconfSession
 
     .. py:method:: get_capabilities()
 
-        Returns a list of capabilities for the Netconf server.
+        Returns a list of capabilities of the client
 
-        :returns: A list of ``str`` representing the Netconf server capabilities.
+        :returns: A list of ``str`` representing the client's/server's capabilities
\ No newline at end of file
diff --git a/sdk/python/core/docsgen/api/path/restconf_session.rst b/sdk/python/core/docsgen/api/path/restconf_session.rst
index 43ba1d580..3a93fef33 100644
--- a/sdk/python/core/docsgen/api/path/restconf_session.rst
+++ b/sdk/python/core/docsgen/api/path/restconf_session.rst
@@ -1,29 +1,3 @@
-..
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
-  # *************************************************************
-  # Licensed to the Apache Software Foundation (ASF) under one
-  # or more contributor license agreements.  See the NOTICE file
-  # distributed with this work for additional information
-  # regarding copyright ownership.  The ASF licenses this file
-  # to you under the Apache License, Version 2.0 (the
-  # "License"); you may not use this file except in compliance
-  # with the License.  You may obtain a copy of the License at
-  #
-  #   http:#www.apache.org/licenses/LICENSE-2.0
-  #
-  #  Unless required by applicable law or agreed to in writing,
-  # software distributed under the License is distributed on an
-  # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  # KIND, either express or implied.  See the License for the
-  # specific language governing permissions and limitations
-  # under the License.
-  # *************************************************************
-  # This file has been modified by Yan Gorelik, YDK Solutions.
-  # All modifications in original under CiscoDevNet domain
-  # introduced since October 2019 are copyrighted.
-  # All rights reserved under Apache License, Version 2.0.
-  # *************************************************************
-
 RestconfSession
 ===============
 
@@ -36,20 +10,20 @@ RestconfSession
             encoding=EncodingFormat.JSON, \
             config_url_root="/data", state_url_root="/data")
 
-        :param repo: (:py:class:`Repository`) Defines location of YANG model repository.
+        :param repo: (:py:class:`Repository`) Reference to an instance of :py:class:`Repository<Repository>`
         :param address: (``str``) IP address or DNC name of the device supporting Netconf interface.
         :param username: (``str``) Username to log in to the device.
         :param password: (``str``) Password to log in to the device.
         :param port: (``int``) Type of encoding to be used for the payload. Default is 80.
         :param encoding: (:py:class:`EncodingFormat<ydk.types.EncodingFormat>`) Encoding Format, default is :py:attr:`JSON<ydk.types.EncodingFormat.JSON>`.
-        :param config_url_root: (``str``) To provider backwards compatibility with older drafts of Restconf RFC, this can be "/config" or "/data" (which is the default).
-        :param state_url_root: (``str``) To provider backwards compatibility with older drafts of Restconf RFC, this can be "/operational" or "/data" (which is the default)
+        :param config_url_root: (``str``) To provider backwards compatibility with older drafts of Restconf RFC, this can be ``/config`` or ``/data`` (which is the default).
+        :param state_url_root: (``str``) To provider backwards compatibility with older drafts of Restconf RFC, this can be ``/operational`` or ``/data`` (which is the default)
 
     .. py:method:: get_root_schema()
 
         Returns the :py:class:`RootSchemaNode<RootSchemaNode>` tree supported by this instance of the :py:class:`RestconfSession<RestconfSession>`.
 
-        :returns: Pointer to the :py:class:`RootSchemaNode<RootSchemaNode>` or ``None``, if one was not created.
+        :returns: Pointer to the :py:class:`RootSchemaNode<RootSchemaNode>` or ``nullptr`` if one could not be created.
 
     .. py:method:: invoke(rpc)
 
@@ -57,9 +31,3 @@ RestconfSession
 
         :param rpc: (:py:class:`Rpc<Rpc>`)
         :returns: Pointer to the :py:class:`DataNode<DataNode>` representing the output.
-
-    .. py:method:: get_capabilities()
-
-        Returns a list of capabilities for the Restconf server.
-
-        :returns: A list of ``str`` representing the Restconf server capabilities.
diff --git a/sdk/python/core/docsgen/api/services/codec_service.rst b/sdk/python/core/docsgen/api/services/codec_service.rst
index 27077cb24..87169c477 100644
--- a/sdk/python/core/docsgen/api/services/codec_service.rst
+++ b/sdk/python/core/docsgen/api/services/codec_service.rst
@@ -1,6 +1,6 @@
 ..
   #  YDK-YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -44,9 +44,7 @@ which represent containers in the device supported YANG models.
         :param entity: :py:class:`Entity<ydk.types.Entity>` instance or collection of :py:class:`Entity<ydk.types.Entity>` instances of type ``list`` or ``dict``
                        or :py:class:`EntityCollection<ydk.types.EntityCollection>`.
         :param pretty: ``bool`` flag, which specifies if resulting string must be in human readable way with indentation.
-        :param subtree: ``bool`` flag, which directs to encode entity to XML or JSON subtree. When set to `true`,
-                        the :py:class:`XmlSubtreeCodec<ydk.entity_utils.XmlSubtreeCodec>`
-                        or :py:class:`JsonSubtreeCodec<ydk.entity_utils.JsonSubtreeCodec>` is called accordingly.
+        :param subtree: ``bool`` flag, which directs to encode entity to XML subtree.
         :return: Type of returned object corresponds to the type of **entity**: single payload ``str``, or ``list`` of ``str``, or a ``dictionary`` of ``str``.
         :raises: :py:exc:`YServiceError<ydk.errors.YServiceError>`, if error has occurred.
 
@@ -56,9 +54,7 @@ which represent containers in the device supported YANG models.
 
         :param provider: :py:class:`CodecServiceProvider<ydk.providers.CodecServiceProvider>` - Codec Provider instance.
         :param payload: ``str`` or collection of ``str`` Either a single encoded payload or a collection of payloads encapsulated to ``list`` or ``dict``.
-        :param subtree: ``bool`` flag, which directs to encode entity to XML or JSON subtree. When set to `true`,
-                        the :py:class:`XmlSubtreeCodec<ydk.entity_utils.XmlSubtreeCodec>`
-                        or :py:class:`JsonSubtreeCodec<ydk.entity_utils.JsonSubtreeCodec>` is called accordingly.
+        :param subtree: ``bool`` flag, which directs to encode entity to XML subtree.
         :return: Type of returned object corresponds to the type of **payload**. It is either an instance of :py:class:`Entity<ydk.types.Entity>`,
                  or a collection of :py:class:`Entity<ydk.types.Entity>` instances of type ``list`` or ``dict``.
         :raises: :py:exc:`YServiceError<ydk.errors.YServiceError>`, if error has occurred.
@@ -70,7 +66,6 @@ XmlSubtreeCodec
 
     XmlSubtreeCodec class designed to provide encoding and decoding Python model API objects of type :py:class:`Entity<ydk.types.Entity>` to/from XML encoded string.
     Compared to :py:class:`CodecService<ydk.services.CodecService>` the class does not validate encoded data for their types and values.
-    It is also can be used to encode/decode non-top level entities.
 
     .. py:method:: XmlSubtreeCodec()
 
@@ -101,7 +96,6 @@ JsonSubtreeCodec
 
     JsonSubtreeCodec class designed to provide encoding and decoding Python model API objects of type :py:class:`Entity<ydk.types.Entity>` to/from JSON encoded string.
     Compared to :py:class:`CodecService<ydk.services.CodecService>` the class does not validate encoded data for their types and values.
-    It is also can be used to encode/decode non-top level entities.
 
     .. py:method:: JsonSubtreeCodec()
 
diff --git a/sdk/python/core/docsgen/faq.rst b/sdk/python/core/docsgen/faq.rst
index 89d2ca854..4bc5ded31 100644
--- a/sdk/python/core/docsgen/faq.rst
+++ b/sdk/python/core/docsgen/faq.rst
@@ -1,6 +1,6 @@
 ..
   #  YDK-YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -28,54 +28,65 @@
 Questions and Answers
 =====================
 
-Please join the `YDK community <https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk>`_ to get answers to any
-YDK-related questions you may have.
+Please join the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ to get answers to any YDK-related questions you may have.
 
 How do I report a bug I found?
 ------------------------------
 
-Please use the `YDK-Gen GitHub issue tracker <https://github.com/CiscoDevNet/ydk-gen/issues>`_ to report any bugs that you discovered.
-Please use the `YDK community <https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk>`_ for any other questions.
+Please use the `YDK-Gen GitHub issue tracker <https://github.com/CiscoDevNet/ydk-gen/issues>`_ to report any bugs you discovered. Please use the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ for any questions.
 
 I am interested in contributing. How do I do this?
 --------------------------------------------------
 
-YDK is an open-source project and we welcome contributions.
-Please refer to this `brief guide <https://github.com/CiscoDevNet/ydk-gen/blob/master/CONTRIBUTIONS.md>`_,
-make the changes on your fork of `ydk-gen <https://github.com/CiscoDevNet/ydk-gen>`_ and submit a pull request
-`here <https://github.com/CiscoDevNet/ydk-gen/pulls>`_.
+YDK is an open-source project and we welcome contributions. Please refer to this `brief guide <https://github.com/CiscoDevNet/ydk-gen/blob/master/CONTRIBUTIONS.md>`_, make the changes on your fork of `ydk-gen <https://github.com/CiscoDevNet/ydk-gen>`_ and submit a pull request `here <https://github.com/CiscoDevNet/ydk-gen/pulls>`_.
 
 Can you help me change something in a model bundle API?
 -------------------------------------------------------
 
-The YDK model bundle APIs are autogenerated from `predefined sets of YANG models <https://github.com/CiscoDevNet/ydk-gen/tree/9c36cd1ab5c85c4017a784dc7175c75056e7b3fd/profiles/bundles>`_.
-Please contact the owners of the respective YANG models to request any changes.
+The YDK model bundle APIs are autogenerated from `predefined sets of yang models <https://github.com/CiscoDevNet/ydk-gen/tree/9c36cd1ab5c85c4017a784dc7175c75056e7b3fd/profiles/bundles>`_. Please contact the owners of the respective yang models to request any changes.
 
 What version of YDK core can be used with YDK bundles?
 ------------------------------------------------------
 
-Currently, we do not have a central location where the compatibility information between the YDK core and
-the bundle APIs is maintained.
-In general, we try to maintain backward compatibility between the releases of the core and bundles.
+Currently, we do not have a central location where the compatibility information between the `YDK core <https://github.com/CiscoDevNet/ydk-py/tree/master/core>`_
+and the bundle APIs (for example, `openconfig <https://github.com/CiscoDevNet/ydk-py/tree/master/openconfig>`_) is maintained.
+In principle, going forward, we plan to maintain backward compatibility between the releases of the core and bundles.
 
-Check the `Backward Compatibility <https://github.com/CiscoDevNet/ydk-gen#backward-compatibility>`_ notes
-for more information.
+The `release notes <https://github.com/CiscoDevNet/ydk-py/releases>`_ contains some information about which bundles were changed in which release of YDK.
 
-Also, we use the `ydk-gen/generate.py <https://github.com/CiscoDevNet/ydk-gen>`_ script to generate and install the bundles.
+Also, the pypi page provides some information about this under the “Requires Distributions” section. For example, see:
+
+ - https://pypi.python.org/pypi/ydk-models-cisco-ios-xr/6.5.1
+ - https://pypi.python.org/pypi/ydk-models-cisco-ios-xr/6.4.1
+
+Also, we use the `ydk-gen <https://github.com/CiscoDevNet/ydk-gen>`_ tool to generate the bundles.
 This tool is available for anyone to use in order to generate the bundle version in combination with YDK core version of their choice.
-For example, the below steps will generate & install the `cisco-ios-xr 6.5.1` bundle compatible with `ydk core 0.8.6`:
+For example, the below steps will generate & install the ``cisco-ios-xr 6.5.1`` bundle compatible with ``ydk core 0.8.0``
+(assuming you have already installed the `system dependencies <https://github.com/CiscoDevNet/ydk-py#system-requirements>`_):
+
+1) Install libydk (taking CentOS as example. For other OS, please see `here <https://github.com/CiscoDevNet/ydk-py#quick-install>`_)
+
+.. code-block:: sh
+    :linenos:
+
+    sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5-beta/libydk-0.8.5-1.x86_64.rpm
 
-1) Install third party dependency software and core components
+2) Generate and install ydk-py core
 
 .. code-block:: sh
+    :linenos:
 
     git clone https://github.com/CiscoDevNet/ydk-gen.git
+    git checkout tags/0.8.5 -b 0.8.5
     cd ydk-gen
-    ./install_ydk.sh --core
+    pip install -r requirements.txt
+    ./generate --core --python
+    pip install gen-api/python/ydk/dist/ydk*.tar.gz
 
-2) Generate and install bundle after activating Python virtual environment that was automatically created in previous step.
+3) Generate and install bundle
 
 .. code-block:: sh
+    :linenos:
 
-    source ~/venv/bin/activate
-    ./generate --bundle profiles/bundles/cisco-ios-xr_6_5_1.json -i
+    ./generate --bundle profiles/bundles/cisco-ios-xr_6_5_1.json --python -v
+    pip install gen-api/python/cisco_ios_xr-bundle/dist/ydk*.tar.gz
diff --git a/sdk/python/core/docsgen/getting_started.rst b/sdk/python/core/docsgen/getting_started.rst
index c80ac5cf9..c2f5d1ae3 100644
--- a/sdk/python/core/docsgen/getting_started.rst
+++ b/sdk/python/core/docsgen/getting_started.rst
@@ -1,6 +1,6 @@
 ..
   #  YDK-YANG Development Kit
-  #  Copyright 2016-2019 Cisco Systems. All rights reserved
+  #  Copyright 2016 Cisco Systems. All rights reserved
   # *************************************************************
   # Licensed to the Apache Software Foundation (ASF) under one
   # or more contributor license agreements.  See the NOTICE file
@@ -33,7 +33,7 @@ Getting Started
 Overview
 ========
 
-The YANG Development Kit (YDK) is a software development tool, which provides API for building applications based on YANG models.
+The YANG Development Kit (YDK) is a Software Development Kit that provides API's that are modeled in YANG.
 The main goal of YDK is to reduce the learning curve of YANG data models by expressing the model semantics in an API
 and abstracting protocol/encoding details.  YDK is composed of a core package that defines services and providers,
 plus one or more module bundles that are based on YANG models.
@@ -41,233 +41,332 @@ plus one or more module bundles that are based on YANG models.
 Backward Compatibility
 ======================
 
-The Python YDK-0.8.6 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
-However the YDK-0.8.6 generates slightly different code and model API comparing to YDK-0.8.4.
-The YDK-0.8.6 generated code is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling YList objects.
-
-**NOTE.** Starting from release 0.8.5 the YDK does not support Python2 interpreter as it was deprecated.
-
+The Python YDK-0.8.5 core package is compatible with all model bundles generated previously with ydk-gen releases starting from 0.7.3.
+Please see `the release notes <https://github.com/CiscoDevNet/ydk-py/releases/tag/0.8.5>`_ for details.
 
 Docker
 ======
 
-A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-gen installed.
-This be used to run ydk-gen without installing anything natively on your platform.
+A `docker image <https://docs.docker.com/engine/reference/run/>`_ is automatically built with the latest ydk-py installed.
+This be used to run ydk-py without installing anything natively on your machine.
 
 To use the docker image, `install docker <https://docs.docker.com/install/>`_ on your system and run the below command.
 See the `docker documentation <https://docs.docker.com/engine/reference/run/>`_ for more details::
 
-  docker run -it ydksolutions/ydk-gen:0.8.6.4
+  docker run -it ydkdev/ydk-py
 
 
 System Requirements
 ===================
 
-The YDK is currently supported on the following platforms including native installations, virtual machines, and docker images:
+Please follow the below instructions to install the system requirements before installing YDK-Py:
 
- - Linux Ubuntu Xenial (16.04 LTS), Bionic (18.04 LTS), and Focal (20.04 LTS)
- - Linux CentOS versions 7 and Centos Stream 8 (Centos 8.x has been EOL as of December 31 of 2021)
- - Linux RHEL version 7.x and 8.x
- - MacOS up to 11.6.2 (Big Sur)
+Linux
+-----
 
-On Windows 10 the Linux virtual machine can run using Windows Subsystem for Linux (WSL);
-check `this <https://www.windowscentral.com/install-windows-subsystem-linux-windows-10>`_ for virtual machine installation procedure.
-The YDK has been tested in such environment on Ubuntu Bionic (18.04 LTS) and Focal (20.04 LTS) images obtained
-from Microsoft Store.
+Ubuntu (Debian-based)
+~~~~~~~~~~~~~~~~~~~~~
 
-On supported platforms the YDK can be installed using `Installation Script`_.
-On other platforms the YDK should be installed manually `Building from source`_.
-For both the methods the user must install `git` package prior to the installation procedure.
+Download and install third party dependency packages and then YDK core library `libydk`.
+You can install the library using prebuilt debian packages for Xenial and Bionic LTS distributions.
+For other Ubuntu distributions it is recommended to build core library from source.
 
-All YDK core components are based on C and C++ code. These components compiled using default compilers for the supported platform.
-Corresponding binaries, libraries, and header files are installed in default locations,
-which are `/usr/local/bin`, `/usr/local/lib`, and `/usr/local/include`.
-The user must have sudo access in order to install YDK core components to these locations.
-Make sure the `sudo` package is installed on your platform prior to the YDK installation procedure.
+Install Third-party software dependencies::
 
-**NOTE.** Due to GitHub issue `#1050 <https://github.com/CiscoDevNet/ydk-gen/issues/1050>`_ YDK is not supported with Python 3.9.x.
+  sudo apt-get install gdebi-core python3-dev python-dev libtool-bin
+  sudo apt-get install libcurl4-openssl-dev libpcre3-dev libssh-dev libxml2-dev libxslt1-dev cmake
 
-.. _howto-install:
+For Xenial (Ubuntu 16.04.4)::
+
+  # Upgrade compiler to gcc 5.*
+  sudo apt-get install gcc-5 g++-5 -y > /dev/null
+  sudo ln -sf /usr/bin/gcc-5 /usr/bin/cc
+  sudo ln -sf /usr/bin/g++-5 /usr/bin/c++
+
+  # Install YDK core library
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
+
+For Bionic (Ubuntu 18.04.1)::
+
+  # Install YDK core library
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk-0.8.5-1.amd64.deb
+  sudo gdebi libydk-0.8.5-1.amd64.deb
+
+Centos (Fedora-based)
+~~~~~~~~~~~~~~~~~~~~~
+
+**Note:** Currently, only Centos7 and RHEL7 are known to work with YDK.
+Please see this issue on `YDK GitHub <https://github.com/CiscoDevNet/ydk-gen/issues/518>`_ for any potential/usage installation on CentOS.
+
+The following packages must be present in your system before installing YDK-Py::
+
+  # Install Third-party software dependencies
+  sudo yum install epel-release
+  sudo yum install libssh-devel gcc-c++ python-devel python3-devel
+
+  # Upgrade compiler to gcc 5.*
+  sudo yum install centos-release-scl -y > /dev/null
+  sudo yum install devtoolset-4-gcc* -y > /dev/null
+  sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/gcc /usr/bin/cc
+  sudo ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/c++
+
+  # Install YDK core library
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk-0.8.5-1.x86_64.rpm
 
-Core Installation
-=================
 
-Installation Script
+MacOS
+-----
+
+It is required to install Xcode command line tools, `homebrew <http://brew.sh>`_ and the following homebrew packages on your system before installing YDK-Py.
+
+.. code-block:: sh
+
+  # Install Third-party software dependencies
+  xcode-select --install
+  /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  brew install pkg-config libssh xml2 libxml2 curl pcre cmake pybind11
+
+  # Install YDK core library
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk-0.8.5-Darwin.pkg
+  sudo installer -pkg libydk-0.8.5-Darwin.pkg -target /
+
+Libssh Installation
 -------------------
 
-For YDK installation it is recommended to use script `install_ydk.sh` from `ydk-gen` git repository.
-The script detects platform OS, installs all the dependencies and builds complete set of YDK components for specified language.
-The user must have sudo access to these locations.
+The libssh-0.8.0 `does not support <http://api.libssh.org/master/libssh_tutor_threads.html>`_ separate threading library,
+which is required for YDK. If after installation of libssh package the `libssh_threads.a` is missing, please downgrade the installation to libssh-0.7.6,
+or upgrade to libssh-0.8.1 or higher.
 
-If the script installs any YDK component, it also creates an environment activation file '.env' in the 'ydk-gen'
-directory, which can be used to activate YDK runtime environment identical to the installation environment.
-To activate YDK runtime environment simply run this command once in bash shell:
+**Note for MacOS**
+Before installing `libssh` make sure the environment for `openssl` is setup:
 
 .. code-block:: sh
 
-    cd ydk-gen
-    source .env
+  brew reinstall openssl
+  export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 
-The YDK extensively uses Python scripts for building its components and model API packages (bundles).
-In order to isolate YDK Python environment from system installation, the script can build Python3 virtual environment.
-If built, the user must manually activate virtual environment when generating model bundles and/or running YDK based application.
-By default the Python virtual environment is installed under `$HOME/venv` directory.
-If user has different location, the PYTHON_VENV environment variable should be set to that location.
+Download libssh-0.7.6 source code, compile it and install:
+
+.. code-block:: sh
 
-When installing YDK for Python programming language, the third party dependencies and C++ packages must be installed first.
-This step requires sudo/root access to the installation platform.
-Here is simple example of core YDK installation for Python programming language with virtual environment:
+  wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+  tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
+  mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
+  cmake ..
+  sudo make install
+
+gNMI Requirements
+-----------------
+
+In order to enable YDK support for gNMI protocol, which is optional, the following third party software must be installed prior to gNMI YDK component installation.
+
+Install protobuf and protoc
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: sh
 
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
-    export YDKGEN_HOME=`pwd`  # optional
-    export PYTHON_VENV=$HOME/ydk_vne  # optional
-    ./install_ydk.sh --cpp --core --venv
-    ./install_ydk.sh --py --core --venv
-
-
-The script also allows to install individual components like dependencies, core, and service packages
-for specified programming language or for all supported languages.
-Full set of script capabilities could be viewed like this::
-
-    ./install_ydk.sh --help
-    usage: install_ydk [ {--cpp|--py|--go|--all} ] [-c] [-s gnmi] [-h] [-n] [-v]
-    Options and arguments:
-      --cpp                 install YDK for C++ programming language;
-                            requires sudo access for dependencies and libraries installation
-      --go                  install YDK for Go programming language
-      --py|--python         install YDK for Python programming language
-      --all                 install YDK for all available programming languages;
-                            requires sudo access for dependencies and libraries installation
-      -v|--venv             create python virtual environment
-      -c|--core             install YDK core package
-      -s|--service gnmi     install gNMI service package
-      -n|--no-deps          skip installation of dependencies;
-                            applicable only with --cpp and --all options
-      -h|--help             print this help message and exit
-
-    Environment variables:
-    YDKGEN_HOME         specifies location of ydk-gen git repository;
-                        if not set, $HOME/ydk-gen is assumed
-    PYTHON_VENV         specifies location of python virtual environment;
-                        if not set, $HOME/venv is assumed
-    GOROOT              specifies installation directory of go software;
-                        if not set, /usr/local/go is assumed
-    GOPATH              specifies location of go source directory;
-                        if not set, $HOME/go is assumed
-    C_INCLUDE_PATH      location of C include files;
-                        if not set, /usr/local/include is assumed
-    CPLUS_INCLUDE_PATH  location of C++ include files;
-                        if not set, /usr/local/include is assumed
-    CMAKE_LIBRARY_PATH  Location of Python shared libraries;
-                        if not set, default system library location is assumed
-
-If user environment is different from the default one (different Python installation or different
-location of libraries), then building from source method should be used.
-
-Building from source
---------------------
-
-Environment variables
-~~~~~~~~~~~~~~~~~~~~~
+  wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip
+  unzip protobuf-cpp-3.5.0.zip
+  cd protobuf-3.5.0
+  ./configure
+  make
+  sudo make install
+  sudo ldconfig
+
+Install gRPC
+~~~~~~~~~~~~
+
+.. code-block:: sh
+
+  git clone -b v1.9.1 https://github.com/grpc/grpc
+  cd grpc
+  git submodule update --init
+  sudo ldconfig
+  make
+  sudo make install
+
+Instal YDK gNMI library
+~~~~~~~~~~~~~~~~~~~~~~~
+
+**Ubuntu**
+
+For Xenial (Ubuntu 16.04.4)::
+
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/xenial/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+
+For Bionic (Ubuntu 18.04.1)::
+
+  wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.5/bionic/libydk_gnmi-0.4.0-5.amd64.deb
+  sudo gdebi libydk_gnmi-0.4.0-5.amd64.deb
+
+**CentOS**::
+
+  sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.5/libydk_gnmi-0.4.0-5.x86_64.rpm
+
+**MacOS**::
+
+  curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.5/libydk_gnmi-0.4.0-5.Darwin.pkg
+  sudo installer -pkg libydk_gnmi-0.4.0-5.Darwin.pkg -target /
+
+
+Runtime environment
+~~~~~~~~~~~~~~~~~~~
+
+There is an open issue with gRPC on Centos/Fedora, which requires an extra step before running any YDK gNMI application.
+See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
+As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+
+  PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
+
+Python Requirements
+-------------------
+
+YDK supports both Python2 and Python3 versions.  At least Python2.7 or Python3.4 must be installed on your system.
+
+It is also required for Python installation to include corresponding shared library. As example::
+
+  python2.7  - /usr/lib/x86_64-linux-gnu/libpython2.7.so
+  python3.5m - /usr/lib/x86_64-linux-gnu/libpython3.5m.so
+
+Please follow `System Requirements`_ to assure presence of shared Python libraries.
+
+If you choose to install Python from source (need specific version), please include `--enable-shared` flag in `configure`
+command to include build of shared library::
+
+  cd Python3.4.1
+  ./configure --prefix=/opt/python --enable-shared
+  make
+  make install
+
+Here the `/opt/python` is your Python installation directory. If installation directory is different from the system path,
+you need to configure `CMAKE_LIBRARY_PATH` environment variable to assure that `cmake` uses correct Python library::
+
+  export CMAKE_LIBRARY_PATH=/opt/python/lib
+
+Run `pip install ydk` command with `-v` option and in the console output note location of found `PythonLibs`.
+Make sure it matches with your installed Pyton dynamic library location::
+
+  -- Found PythonLibs: /opt/python/lib/libpython3.4m.so
 
-In some OS configurations during YDK package installation the cmake fails to find C/C++ headers for previously installed YDK libraries.
-In this case the headers file location must be specified explicitly (in below commands the default location is shown)::
+In some OS configurations during YDK package installation the `cmake` fails to find C/C++ headers for previously installed YDK libraries.
+In this case the header location must be specified explicitly (in below commands the default location is shown)::
 
   export C_INCLUDE_PATH=/usr/local/include
   export CPLUS_INCLUDE_PATH=/usr/local/include
 
-When non-standard Python installation is used or there are multiple installations of Python on the platform,
-the PATH and CMAKE_LIBRARY_PATH environment variables must be set accordingly in order for the installation scripts
-to pick up correct Python binaries and shared libraries.
+Mac OS
+~~~~~~
 
-Installing third party dependencies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The developers of Python2 on Mac OS might face an `installation issue <https://github.com/CiscoDevNet/ydk-gen/issues/837>`_.
+This is well known and documented issue. Each developer might have different approach for its resolution.
+One of them is to use Python2 virtual environment. See section `Using Python Virtual Environment`_ for details.
 
-If user platform is supported one, it is recommended to use `ydk-gen/install_ydk.sh` script.
-The script will also install Python virtual environment in default or specified location::
+In addition it is required properly set `CMAKE_LIBRARY_PATH` environment variable to assure that `cmake` uses correct Python library.
+Follow these steps to find and set correct library path.
 
-    # Clone ydk-gen from GitHub
-    git clone https://github.com/CiscoDevNet/ydk-gen.git
-    cd ydk-gen
+1. Find installations of `libpython2.7` library:
 
-    # Define optional environment variables and install dependencies
-    export YDKGEN_HOME=`pwd`  # optional
-    export PYTHON_VENV=$HOME/ydk_venv  # optional
-    ./install_ydk.sh -v   # also builds Python virtual environment and .env file
+.. code-block:: sh
 
-For unsupported platforms it is recommended to follow logic of `ydk-gen/test/dependencies-*` scripts.
+  locate libpython2.7.dylib
 
-Installing core components
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Example:
 
-Please follow this procedure to install YDK core components for Python apps development::
+.. code-block:: sh
 
-    # Activate runtime environment
-    source .env
+  $ locate libpython2.7.dylib
+  /System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib
+  /System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config/libpython2.7.dylib
+  /usr/lib/libpython2.7.dylib
+  /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib
+  /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/python2.7/config/libpython2.7.dylib
 
-    # Generate and install YDK core library
-    python3 generate.py -is --core --cpp
+2. Choose non-system Python library installation and set CMAKE_LIBRARY_PATH before any YDK component installation. Example:
 
-    # Generate and install Python core package
-    python3 generate.py -i --core
+.. code-block:: sh
 
+  export CMAKE_LIBRARY_PATH=/usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib
 
-Adding gNMI Service
--------------------
+3. Run YDK core package installation with '-v' flag to check that `PythonLibs` points to correct library path. Example:
 
-In order to enable YDK support for gNMI protocol, which is optional, the user need install third party software
-and YDK gNMI service package.
+.. code-block:: sh
 
-gNMI Service installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
+  ./generate.py --core
+  pip install -v gen-api/python/ydk/dist/ydk*.tar.gz
 
-Here is simple example, how gNMI service package for Python could be added::
+4. In 'cmake' log look for 'PythonLibs' and 'found version' settings line:
 
-    cd ydk-gen
-    ./install_ydk.sh --cpp --service gnmi --venv  # requires sudo access
-    ./install_ydk.sh --py --service gnmi --venv
+.. code-block:: sh
 
+  -- Found PythonLibs: /usr/local/Cellar/python@2/2.7.15_1/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib (found version "2.7.15")
 
-gNMI runtime environment
-~~~~~~~~~~~~~~~~~~~~~~~~
+5. Finally test you YDK core library installation from CLI, making sure there are no errors:
 
-When YDK is installed using 'install_ydk.sh' script, the runtime environment is set by running 'source .env' in bash shell.
-The below information is applicable only when YDK is installed manually, which is not recommended.
+.. code-block:: sh
 
-There is an open issue with gRPC on Centos/RHEL, which requires an extra step before running any YDK gNMI application.
-See this issue on `GRPC GitHub <https://github.com/grpc/grpc/issues/10942#issuecomment-312565041>`_ for details.
-As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable::
+  python -c "import ydk.types"
 
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
 
+.. _howto-install:
 
-Bundle Installation
-===================
+Quick install
+=============
+
+Centos (Fedora-based)
+---------------------
+
+You can install the latest model packages from the DevHub artifactory and Python package index.
+Note that, in some systems, you need to install the new package as root.
+
+To install the core and model bundles on Centos, please follow the below steps.
 
-Quick installation
-------------------
+**Python2.7**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python2.7/site-packages" --no-deps ydk-models-cisco-ios-xe
+
+**Python3.4**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python3.4/site-packages" --no-deps ydk-models-cisco-ios-xe
+
+**Python3.6**::
+
+  pip install ydk
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-ietf
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-openconfig
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-cisco-ios-xr
+  pip install --install-option="--install-purelib=/usr/lib64/python3.6/site-packages" --no-deps ydk-models-cisco-ios-xe
 
-You can install the latest model packages from Python package index.
-Note that Python index does not have this release, therefore make sure the Python core package for this release is already installed prior to bundle installation.
-Make sure to activate Python virtual environment prior to package installation.
-When installing a bundle package from Python index, all dependent packages installed automatically.
-The installation of the `ydk-models-cisco-ios-xr` and/or `ydk-models-cisco-ios-xe` bundle(s)
-(depending on whether you're developing application for IOS XR or IOS XE platform) automatically installs all other
-related packages (`ydk`, `openconfig` and `ietf` packages)::
+
+Other platforms
+---------------
+
+You can install the latest model packages from the DevHub artifactory and Python package index.
+Note that, in some systems, you need to install the new package as root.
+You get fully operational YDK environment by installing the ``ydk-models-cisco-ios-xr`` and/or ``ydk-models-cisco-ios-xe`` bundle(s)
+(depending on whether you're developing application for IOS XR or IOS XE platform), which automatically installs all other
+YDK-related packages (``YDK``, ``openconfig`` and ``ietf`` packages)::
 
   pip install ydk-models-cisco-ios-xr
   pip install ydk-models-cisco-ios-xe
 
 Alternatively, you can perform a partial installation.
-If you prefer to install only the `openconfig` bundle and its dependencies (`ydk` and `ietf` packages), execute::
+If you prefer to install only the ``openconfig`` bundle and its dependencies (``YDK`` and ``ietf`` packages), execute::
 
   pip install ydk
   pip install ydk-models-openconfig
 
-If you want install only the `ietf` bundle and its dependencies (`ydk` package), execute::
+If you only want to install the ``ietf`` bundle and its dependencies (``YDK`` package), execute::
 
   pip install ydk
   pip install ydk-models-ietf
@@ -277,220 +376,139 @@ To enable gNMI Service support in Python based application, install package::
   pip install ydk-service-gnmi
 
 
-Installing from source
-----------------------
+Installing from Source
+======================
+
+Installing core package
+-----------------------
+
+If you prefer not to use the YDK packages in the DevHub artifactory or Python package index, you need to install manually the ``YDK`` core package and then the model bundles that you plan to use.
+The Python core package is dependent on C++ core library `libydk`, which must be installed prior to Python package installation:
+
+.. code-block:: sh
+
+  $ git clone https://github.com/CiscoDevNet/ydk-gen.git
+  $ cd ydk-gen/sdk/cpp/core
+  core$ mkdir -p build
+  core$ cd build
+  build$ cmake ..
+  build$ make
+  build$ sudo make install
 
-Once you have installed the `ydk` core package, you can install one or more model bundles.  Note that some bundles have dependencies on other bundles.
-Those dependencies are already captured in the bundle package.  Make sure you install the desired bundles in the order below.
-To install the `ietf` bundle from `ydk-gen` execute::
+To install the ``YDK`` Python core package, execute:
+
+.. code-block:: sh
 
-  # Navigate to ydk-gen directory and activate runtime environment
-  cd ydk-gen
-  source .env  # if not ran previously
+  $ cd ydk-gen/sdk/python/core
+  core$ python setup.py sdist
+  core$ pip install dist/ydk*.gz
 
-  # Generate and install the bundle
-  python3 generate.py --bundle profiles/bundles/ietf_0_1_6.json -i
+Installing model bundles
+------------------------
 
-To install the `openconfig` bundle, execute::
+Once you have installed the ``YDK`` core package, you can install one or more model bundles. The source code for the model bundles can be generated by running:
 
-  # Navigate to ydk-gen directory and activate runtime environment
-  cd ydk-gen
-  source .env  # if not ran previously
+.. code-block:: sh
 
-  # Generate and install the bundle
-  python3 generate.py --bundle profiles/bundles/openconfig_0_1_9.json -i
+  git clone https://github.com/CiscoDevNet/ydk-py.git -b 0.8.5
 
+Note that some bundles have dependencies on other bundles.  Those dependencies are already captured in the bundle package.  Make sure you install the desired bundles in the order below.  To install the ``ietf`` bundle, execute:
 
-To install the `cisco-ios-xr` bundle, execute::
+.. code-block:: sh
 
-  # Navigate to ydk-gen directory and activate runtime environment
-  cd ydk-gen
-  source .env  # if not ran previously
+  core$ cd ../ietf
+  ietf$ python setup.py sdist
+  ietf$ pip install dist/ydk*.gz
 
-  # Generate and install the bundle
-  python3 generate.py --bundle profiles/bundles/cisco-ios-xr-6_7_4_post1.json -i
+To install the ``openconfig`` bundle, execute:
 
+.. code-block:: sh
 
-Generate YDK components
-=======================
+  ietf$ cd ../openconfig
+  openconfig$ python setup.py sdist
+  openconfig$ pip install dist/ydk*.gz
 
-Generation script
------------------
+To install the ``cisco-ios-xr`` bundle, execute:
 
-All the YDK components/packages can be generated by using Python script `generate.py`. To get all of its options run::
-
-    cd ydk-gen
-    python3 generate.py --help
-    usage: generate.py [-h] [-l] [--core] [--service SERVICE] [--bundle BUNDLE]
-                       [--adhoc-bundle-name ADHOC_BUNDLE_NAME]
-                       [--adhoc-bundle ADHOC_BUNDLE [ADHOC_BUNDLE ...]]
-                       [--generate-meta] [--generate-doc] [--generate-tests]
-                       [--output-directory OUTPUT_DIRECTORY] [--cached-output-dir]
-                       [-p] [-c] [-g] [-v] [-o]
-
-    Generate YDK artifacts:
-
-    optional arguments:
-      -h, --help            show this help message and exit
-      -l, --libydk          Generate libydk core package
-      --core                Generate and/or install core library
-      --service SERVICE     Location of service profile JSON file
-      --bundle BUNDLE       Location of bundle profile JSON file
-      --adhoc-bundle-name ADHOC_BUNDLE_NAME
-                            Name of the adhoc bundle
-      --adhoc-bundle ADHOC_BUNDLE [ADHOC_BUNDLE ...]
-                            Generate an SDK from a specified list of files
-      --generate-meta       Generate meta-data for Python bundle
-      --generate-doc        Generate documentation
-      --generate-tests      Generate tests
-      --output-directory OUTPUT_DIRECTORY
-                            The output directory where the sdk will get created.
-      --cached-output-dir   The output directory specified with --output-directory
-                            includes a cache of previously generated gen-
-                            api/<language> files under a directory called 'cache'.
-                            To be used to generate docs for --core
-      -p, --python          Generate Python SDK
-      -c, --cpp             Generate C++ SDK
-      -g, --go              Generate Go SDK
-      -v, --verbose         Verbose mode
-      -o, --one-class-per-module
-                            Generate separate modules for each python class
-                            corresponding to YANG containers or lists.
-
-Build model bundle profile
---------------------------
-
-The first step in using ydk-gen is either using one of the already built `bundle profiles <https://github.com/CiscoDevNet/ydk-gen/tree/master/profiles/bundles>`_
-or constructing your own bundle profile, consisting of the YANG models you are interested to include into the bundle.
-
-Construct a bundle profile file, such as `cisco-ios-xr_6_5_3 <https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_5_3.json>`_
-and specify its dependencies.
-
-A sample bundle profile file is described below. The file is in a JSON format. The profile must define the "name",
-"version" and "description" of the bundle, and then the "core_version", which refers to
-`the version <https://github.com/CiscoDevNet/ydk-gen/releases>`_ of the YDK core package that you want to use with this bundle.
-The "name" of the bundle will form part of the installation path of the bundle.
-All other attributes, like "author" and "copyright", are optional and will not affect the bundle generation::
-
-    "name":"cisco-ios-xr",
-    "version": "6.5.3",
-    "core_version": "0.8.6",
-    "author": "Cisco",
-    "copyright": "Cisco",
-    "description": "Cisco IOS-XR Native Models From Git",
-
-The `models` section of the profile describes sources of YANG models. It could contain combination of elements:
-
-- `dir` - list of **relative** directory paths containing YANG files
-- `file` - list of **relative** YANG file paths
-- `git` - git repository, where YANG files are located
-
-The sample below shows the use of git sources only.
-Each `git` source must specify `url` - git repository URL, and `commits` list.
-The specified URL must allow the repository to be cloned without user intervention.
-Each element in `commits` list can specify:
-
-- `commitid` - optional specification of a commit ID in string format. If not specified the HEAD revision is assumed.
-- `dir` - optional list of **relative** directory paths within the git repository.
-- `file` - optional list of **relative** `*.yang` file paths within the git repository.
-
-Only directory examples are shown in this example::
-
-
-    "models": {
-        "git": [
-            {
-                "url": "https://github.com/YangModels/yang.git",
-                "commits": [
-                  {
-                    "dir": [
-                        "vendor/cisco/xr/653"
-                    ]
-                  }
-                ]
-            },
-            {
-                "url": "https://github.com/YangModels/yang.git",
-                "commits": [
-                  {
-                    "commitid": "f6b4e2d59d4eedf31ae8b2fa3119468e4c38259c",
-                    "dir": [
-                        "experimental/openconfig/bgp",
-                        "experimental/openconfig/policy"
-                    ]
-                  }
-                ]
-            }
-        ]
-    },
-
-Generate and install model bundle
----------------------------------
-
-Generate model bundle using a bundle profile and install it.
-YDK Runtime environment must be activated prior to these procedures::
-
-    python3 generate.py -i --bundle profiles/bundles/<name-of-profile>.json
-
-Check Python packages installed::
-
-    pip list | grep ydk
-    ydk (0.8.6.4)
-    ydk-models-<name-of-bundle> (0.1.1)
-    ...
-
-Generate "adhoc" bundle
+.. code-block:: sh
+
+  openconfig$ cd ../cisco-ios-xr
+  cisco-ios-xr$ python setup.py sdist
+  cisco-ios-xr$ pip install dist/ydk*.gz
+  cisco-ios-xr$ cd ..
+
+Installing gNMI package
 -----------------------
 
-When YANG models available on the hard drive, there is capability to generate small model bundles, which include
-just few models. It is called an "adhoc" bundle. Such a bundle generated without profile directly from command line.
-Here is simple example::
+Optionaly the gNMI package for Python can be installed. The Python gNMI package is dependent on C++ core library `libydk`
+(see installation of Python core package above) and C++ gNMI library `libydk_gnmi`, which must be installed prior to Python package installation:
 
-    python3 generate.py -i --adhoc-bundle-name test --adhoc-bundle \
-        /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-ipv4-bgp-oper*.yang \
-        /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-types.yang
-        /opt/git-repos/clean-yang/vendor/cisco/xr/621/Cisco-IOS-XR-ipv4-bgp-datatypes.yang
+.. code-block:: sh
 
-This will generate a bundle that contains files specified in the `--adhoc-bundle` option and
-create Python package `ydk-models-test-0.1.0.tar.gz`, which has dependency on the base IETF bundle.
-Note that **all** dependencies for the bundle must be listed. It is expected that this option will be typically used
-for generating point model bundles for specific testing. The `--verbose` option is automatically enabled to quickly
-and easily let the user see if dependencies have been satisfied.
+  $ cd ydk-gen/sdk/cpp/gnmi
+  gnmi$ mkdir -p build
+  gnmi$ cd build
+  build$ cmake ..
+  build$ make
+  build$ sudo make install
 
-Generate bundle documentation
------------------------------
+To install the ``YDK`` Python gNMI package, execute:
 
-In order to generate YDK core and bundles documentation, the `--generate-doc` option is used when generating core package.
-Therefore the user should generate all the bundles without the `--generate-doc` option prior to the documentation generation.
-For example, the below sequence of commands will generate the documentation for the three python bundles and the python core::
+.. code-block:: sh
 
-    python3 generate.py --bundle profiles/bundles/ietf_0_1_6.json
-    python3 generate.py --bundle profiles/bundles/openconfig_0_1_9.json
-    python3 generate.py --bundle profiles/bundles/cisco_ios_xr_6_3_1.json
-    python3 generate.py --core --generate-doc
+  $ cd ydk-gen/sdk/python/gnmi
+  gnmi$ python setup.py sdist
+  gnmi$ pip install dist/ydk*.gz
 
-**NOTE.** The documentation generation for bundles can take few hours due to their sizes.
-If you have previously generated documentation using the `--cached-output-dir --output-directory <dir>` option,
-the add-on documentation generation time can be reduced. Adding cisco-ios-xr documentation as an example::
+.. _Virtual:
 
-    mkdir gen-api/cache
-    mv gen-api/python gen-api/cache
+Using Python Virtual Environment
+================================
 
-    python3 generate.py --bundle profiles/bundles/cisco_ios_xr_6_6_3.json
-    python3 generate.py --core --generate-doc --output-directory gen-api --cached-output-dir
+You may want to perform the installation under Python virtual environment (`virtualenv <https://pypi.python.org/pypi/virtualenv/>`_/`virtualenvwrapper  <https://pypi.python.org/pypi/virtualenvwrapper>`_).  A virtual environment allows you to install multiple versions of YDK if needed.  In addition, it prevents any potential conflicts between package dependencies in your system.
 
+To install virtual environment on your system, execute:
 
-Documentation and Support
-=========================
+.. code-block:: sh
 
-- Pre-generated documentation for YDK-0.8.6 core and model API for IETF and OpenConfig can be found `here <https://ciscodevnet.github.io/ydk-gen/>`_
-- Application samples can be found under the `samples <https://github.com/CiscoDevNet/ydk-gen/tree/master/sdk/python/core/samples>`_ directory
-- Hundreds of Python application samples can be found in the `samples <https://github.com/CiscoDevNet/ydk-py-samples>`_ repository
-- Join the `YDK community <https://community.cisco.com/t5/yang-tools/bd-p/5475j-disc-dev-net-ydk>`_ to connect with YDK users and developers
+  pip install virtualenv virtualenvwrapper
+  source /usr/local/bin/virtualenvwrapper.sh
 
-Release Notes
-=============
+Create new virtual environment:
+
+.. code-block:: sh
+
+  mkvirtualenv -p python2.7 ydk-py
+
+At this point, you can perform the quick install or the installation from source described above.  Take into account that you must not attempt to install YDK as root under virtual environment.
+
+Samples
+=======
+
+To get started using the YDK API, there are sample applications available in the `YDK-Py repository <https://github.com/CiscoDevNet/ydk-py/tree/master/core/samples>`_. For example, to run the ``bgp.py`` sample, execute:
 
-The current YDK release version is 0.8.6.4.
+.. code-block:: sh
+
+  ydk-py$ cd core/samples
+  samples$ ./bgp.py -h
+  Usage: bgp.py [-h | --help] [options]
+
+  Options:
+    -h, --help            show this help message and exit
+    -v VERSION, --version=VERSION
+                          force NETCONF version 1.0 or 1.1
+    -u USERNAME, --user=USERNAME
+                          login user name
+    -p PASSWORD, --password=PASSWORD
+                          login user password
+    --proto=PROTOCOL      Which transport protocol to use, one of ssh or tcp
+    --host=HOST           NETCONF agent hostname or IP address
+    --port=PORT           NETCONF agent SSH port
+
+    (ydk-py)samples$ ./bgp.py --host <ip-address-of-netconf-server> -u <username> -p <password> --port <port-number>
+
+Documentation and Support
+=========================
 
-YDK is licensed under the Apache 2.0 License.
+- Hundreds of samples can be found in the `YDK-Py samples repository <https://github.com/CiscoDevNet/ydk-py-samples>`_
+- Join the `YDK community <https://communities.cisco.com/community/developer/ydk>`_ to connect with other users and with the makers of YDK
diff --git a/sdk/python/core/docsgen/guides/backward_compatibility.rst b/sdk/python/core/docsgen/guides/backward_compatibility.rst
index b93a4e6c0..f292431fc 100644
--- a/sdk/python/core/docsgen/guides/backward_compatibility.rst
+++ b/sdk/python/core/docsgen/guides/backward_compatibility.rst
@@ -10,9 +10,7 @@ When installing and using the ``0.6.0`` and newer releases of ``YDK-Py``, please
 Installation
 ------------
 
-When installing ``YDK-Py``, there is a new system requirement which needs to be installed.
-This is the ``libydk`` library, which is available on the DevHub website for various OS platforms.
-Please refer to the `system requirements <https://github.com/CiscoDevNet/ydk-gen#system-requirements>`_ for details.
+When installing ``YDK-Py``, there is a new system requirement which needs to be installed. This is the ``libydk`` library, which is available on the DevHub website for various OS platforms. Please refer to the `system requirements <http://ydk.cisco.com/py/docs/getting_started.html#system-requirements>`_ for details.
 
 Windows Support
 ---------------
diff --git a/sdk/python/core/docsgen/guides/restconf_https.rst b/sdk/python/core/docsgen/guides/restconf_https.rst
index dd9bd965a..0c0d60834 100644
--- a/sdk/python/core/docsgen/guides/restconf_https.rst
+++ b/sdk/python/core/docsgen/guides/restconf_https.rst
@@ -52,7 +52,7 @@ The installation procedure on CentOS-7:
     sudo cp ~/myrestconf.crt /etc/pki/ca-trust/source/anchors/
     sudo update-ca-trust
 
-Getting MacOS to trust self-signed SSL Certificates:
+Getting Mac-OSX to trust self-signed SSL Certificates:
 
  1. Locate your CA certificate file.
  2. Open up Keychain Access.
diff --git a/sdk/python/core/python.cpp b/sdk/python/core/python.cpp
index 135fe85ba..3e0530b30 100644
--- a/sdk/python/core/python.cpp
+++ b/sdk/python/core/python.cpp
@@ -1,5 +1,5 @@
 /*  ----------------------------------------------------------------
- Copyright 2016-2019 Cisco Systems
+ Copyright 2016 Cisco Systems
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -12,13 +12,7 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- ------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
  ------------------------------------------------------------------*/
-
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/functional.h>
@@ -67,7 +61,14 @@ static bool enabled_logging = false;
 
 void add_null_handler(object logger)
 {
-    if (!added_nullhandler)
+    if (added_nullhandler) { return; }
+    object version = module::import("sys").attr("version_info");
+    object ge = version.attr("__ge__");
+    // NullHandler is introduced after Python 2.7
+    // Add Nullhandler to avoid `handler not found for logger` error for Python > 2.7
+    object version_27 = pybind11::make_tuple(2,7);
+    bool result = ge(version_27).cast<bool>();
+    if (result)
     {
         object null_handler = module::import("logging").attr("NullHandler");
         null_handler = null_handler();
@@ -294,8 +295,7 @@ PYBIND11_MODULE(ydk_, ydk)
     class_<ydk::path::Session>(path, "Session", module_local())
         .def("get_root_schema", &ydk::path::Session::get_root_schema, return_value_policy::reference)
         .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::Rpc& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference)
-        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::DataNode& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference)
-        .def("get_capabilities", (std::vector<std::string> (ydk::path::Session::*)() const) &ydk::path::Session::get_capabilities, return_value_policy::reference);
+        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::DataNode& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference);
 
     class_<ydk::path::NetconfSession, ydk::path::Session>(path, "NetconfSession")
         .def(init([](ydk::path::Repository & repo,
@@ -386,7 +386,7 @@ PYBIND11_MODULE(ydk_, ydk)
         .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::NetconfSession::*)(ydk::path::Rpc& rpc) const) &ydk::path::NetconfSession::invoke, return_value_policy::reference)
         .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::NetconfSession::*)(ydk::path::DataNode& rpc) const) &ydk::path::NetconfSession::invoke, return_value_policy::reference)
         .def("execute_netconf_operation", (std::string (ydk::path::NetconfSession::*)(ydk::path::Rpc& rpc) const) &ydk::path::NetconfSession::execute_netconf_operation)
-        .def("get_capabilities", (std::vector<std::string> (ydk::path::NetconfSession::*)() const) &ydk::path::NetconfSession::get_capabilities, return_value_policy::reference);
+        .def("get_capabilities", &ydk::path::NetconfSession::get_capabilities, return_value_policy::reference);
 
     class_<ydk::path::RestconfSession, ydk::path::Session>(path, "RestconfSession")
         .def(init([](ydk::path::Repository& repo,
@@ -411,8 +411,7 @@ PYBIND11_MODULE(ydk_, ydk)
              arg("state_url_root"))
         .def("get_root_schema", &ydk::path::RestconfSession::get_root_schema, return_value_policy::reference)
         .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::RestconfSession::*)(ydk::path::Rpc& rpc) const) &ydk::path::RestconfSession::invoke, return_value_policy::reference)
-        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::RestconfSession::*)(ydk::path::DataNode& rpc) const) &ydk::path::RestconfSession::invoke, return_value_policy::reference)
-        .def("get_capabilities", (std::vector<std::string> (ydk::path::RestconfSession::*)() const) &ydk::path::RestconfSession::get_capabilities, return_value_policy::reference);
+        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::RestconfSession::*)(ydk::path::DataNode& rpc) const) &ydk::path::RestconfSession::invoke, return_value_policy::reference);
 
     class_<ydk::path::Statement>(path, "Statement")
         .def(init<const string &, const string &>(), arg("keyword"), arg("arg"))
@@ -486,9 +485,9 @@ PYBIND11_MODULE(ydk_, ydk)
     codec
         .def(init<>())
         .def("encode", (std::string (ydk::path::Codec::*)(const ydk::path::DataNode&, ydk::EncodingFormat, bool))
-                &ydk::path::Codec::encode, arg("data_node"), arg("encoding"), arg("pretty")=true)
+                &ydk::path::Codec::encode, arg("data_node"), arg("encoding"), arg("pretty"))
         .def("encode", (std::string (ydk::path::Codec::*)(std::vector<ydk::path::DataNode*>&, ydk::EncodingFormat, bool))
-                &ydk::path::Codec::encode, arg("data_node"), arg("encoding"), arg("pretty")=true)
+                &ydk::path::Codec::encode, arg("data_node"), arg("encoding"), arg("pretty"))
         .def("decode", &ydk::path::Codec::decode, arg("root_schema_node"), arg("payload"), arg("encoding"))
         .def("decode_rpc_output", &ydk::path::Codec::decode_rpc_output, arg("root_schema_node"), arg("payload"), arg("rpc_path"), arg("encoding"))
         .def("decode_json_output", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Codec::*)(ydk::path::RootSchemaNode&, const std::vector<std::string>&))
diff --git a/sdk/python/core/samples/bgp_xr_opendaylight.py b/sdk/python/core/samples/bgp_xr_opendaylight.py
index 7e32e30d8..f0932401f 100755
--- a/sdk/python/core/samples/bgp_xr_opendaylight.py
+++ b/sdk/python/core/samples/bgp_xr_opendaylight.py
@@ -19,15 +19,19 @@
 Sample app for odl.
 """
 import os
+import sys
 from argparse import ArgumentParser
-from urllib.parse import urlparse
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 from ydk.types import Empty
 from ydk.services import CRUDService
 from ydk.providers import OpenDaylightServiceProvider
+from ydk.errors import YError
 from ydk.types import EncodingFormat
 from ydk.path import Repository
-
 from ydk.models.cisco_ios_xr import Cisco_IOS_XR_ipv4_bgp_cfg as xr_bgp
 from ydk.models.cisco_ios_xr import Cisco_IOS_XR_ipv4_bgp_datatypes as xr_bgp_types
 
diff --git a/sdk/python/core/samples/hello_xr.py b/sdk/python/core/samples/hello_xr.py
index 89a109167..64bf0e775 100755
--- a/sdk/python/core/samples/hello_xr.py
+++ b/sdk/python/core/samples/hello_xr.py
@@ -32,7 +32,11 @@
 import logging
 from datetime import timedelta
 from argparse import ArgumentParser
-from urllib.parse import urlparse
+import sys
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 from ydk.services import CRUDService
 from ydk.providers import NetconfServiceProvider
diff --git a/sdk/python/core/samples/path_restconf.py b/sdk/python/core/samples/path_restconf.py
index d28587c2d..71e719e17 100755
--- a/sdk/python/core/samples/path_restconf.py
+++ b/sdk/python/core/samples/path_restconf.py
@@ -31,12 +31,12 @@ def execute_path(session):
     payload = codec.encode(runner, EncodingFormat.JSON, True)
 
     create_rpc = schema.create_rpc("ydk:create")
-    create_rpc.get_input_node().create_datanode("entity", payload)
+    create_rpc.get_input_node().create_datanode("entity", xml)
     create_rpc(session)
 
 
 if __name__ == "__main__":
     init_logging()
-    repo = Repository("/usr/local/share/ydktest@0.1.1")
+    repo = Repository("/usr/local/share/ydktest@0.1.0")
     session = RestconfSession(repo, '127.0.0.1', 'admin', 'admin', 12306, EncodingFormat.JSON)
     execute_path(session)
diff --git a/sdk/python/core/setup.py b/sdk/python/core/setup.py
index 8547e8656..6f41ebbb0 100644
--- a/sdk/python/core/setup.py
+++ b/sdk/python/core/setup.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,14 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
-Setup for YDK core package for Python
+Setup for YDK core package
 """
 
 from __future__ import print_function
@@ -35,9 +30,9 @@
 
 NAME = 'ydk'
 
-VERSION = '0.8.6.4'
+VERSION = '0.8.5'
 
-INSTALL_REQUIREMENTS = ['pybind11==2.6.2']
+INSTALL_REQUIREMENTS = ['pybind11>=2.1.1']
 
 LONG_DESCRIPTION = '''
                    The YANG Development Kit (YDK) is a Software Development Kit
@@ -52,10 +47,9 @@
 YDK_PACKAGES = find_packages(exclude=['contrib', 'docs*', 'tests*',
                                       'ncclient', 'samples'])
 
-
 class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
-        super().__init__(name, sources=[])
+        Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
 
 
@@ -63,7 +57,7 @@ class YdkBuildExtension(build_ext):
     def run(self):
         try:
             cmake3_installed = (
-                0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
+            0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
             if not cmake3_installed:
                 subprocess.check_output(['cmake', '--version'])
         except OSError:
@@ -78,7 +72,7 @@ def build_extension(self, ext):
             import pybind11
         except ImportError:
             import pip
-            pip.main(['install', 'pybind11==2.6.2'])
+            pip.main(['install', 'pybind11>=2.1.1'])
             import pybind11
 
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
@@ -86,8 +80,9 @@ def build_extension(self, ext):
         if 'YDK_COVERAGE' in os.environ:
             coverage_compiler_flag = '-DCOVERAGE=True'
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={0}'.format(extdir),
-                      '-DPYBIND11_INCLUDE={0}'.format(
-                                      pybind11.get_include()),
+                      '-DPYBIND11_INCLUDE={0};{1}'.format(
+                                      pybind11.get_include(),
+                                      pybind11.get_include(user=True)),
                       '-DPYTHON_VERSION={0}'.format(
                                       get_python_version()),
                       '-DCMAKE_BUILD_TYPE=Release',
@@ -97,7 +92,7 @@ def build_extension(self, ext):
             os.makedirs(self.build_temp)
 
         cmake3_installed = (0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
-        if cmake3_installed:
+        if(cmake3_installed):
             cmake_executable = 'cmake3'
         else:
             cmake_executable = 'cmake'
@@ -132,11 +127,12 @@ def get_python_version():
         'Topic :: Software Development :: Build Tools',
         'Topic :: Software Development :: Libraries',
         'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: C++'
     ],
     keywords='yang, C++11, python bindings ',
@@ -144,7 +140,7 @@ def get_python_version():
     install_requires=INSTALL_REQUIREMENTS,
     ext_modules=[CMakeExtension('ydk_')],
     cmdclass={
-             'build_ext': YdkBuildExtension
+             'build_ext' :YdkBuildExtension
              },
     zip_safe=False,
 )
diff --git a/sdk/python/core/tests/test_non_top_operations.py b/sdk/python/core/tests/test_non_top_operations.py
index c33376297..9dfa7d5ca 100644
--- a/sdk/python/core/tests/test_non_top_operations.py
+++ b/sdk/python/core/tests/test_non_top_operations.py
@@ -13,15 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-test_non_top_operations.py
-Sanity test for ydktest-sanity.yang targeted specifically
+"""test_non_top_operations.py
+Sanity test for ydktest-sanity.yang targetted specifically
 to test support for non-top level objects in CRUD operations
 """
 
@@ -46,14 +40,14 @@
 class SanityTest(unittest.TestCase):
 
     @classmethod
-    def setUpClass(cls):
-        cls.ncc = NetconfServiceProvider(
+    def setUpClass(self):
+        self.ncc = NetconfServiceProvider(
             "127.0.0.1",
             "admin",
             "admin",
             12022,
             )
-        cls.crud = CRUDService()
+        self.crud = CRUDService()
 
     def setUp(self):
         runner = Runner()
@@ -165,98 +159,6 @@ def test_netconf_delete_container(self):
         result = ns.discard_changes(self.ncc)
         self.assertEqual(result, True)
 
-    def test_twolist_non_top(self):
-        # CREATE
-        r_1, r_2 = Runner(), Runner()
-        e_1, e_2 = Runner.TwoList.Ldata(), Runner.TwoList.Ldata()
-        e_11, e_12 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
-        e_1.number = 21
-        e_1.name = 'runner:twolist:ldata['+str(e_1.number)+']:name'
-        e_11.number = 211
-        e_11.name = 'runner:twolist:ldata['+str(e_1.number)+']:subl1['+str(e_11.number)+']:name'
-        e_12.number = 212
-        e_12.name = 'runner:twolist:ldata['+str(e_1.number)+']:subl1['+str(e_12.number)+']:name'
-        e_1.subl1.append(e_11)
-        e_1.subl1.append(e_12)
-        e_21, e_22 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
-        e_2.number = 22
-        e_2.name = 'runner:twolist:ldata['+str(e_2.number)+']:name'
-        e_21.number = 221
-        e_21.name = 'runner:twolist:ldata['+str(e_2.number)+']:subl1['+str(e_21.number)+']:name'
-        e_22.number = 222
-        e_22.name = 'runner:twolist:ldata['+str(e_2.number)+']:subl1['+str(e_22.number)+']:name'
-        e_2.subl1.append(e_21)
-        e_2.subl1.append(e_22)
-        r_1.two_list.ldata.append(e_1)
-        r_1.two_list.ldata.append(e_2)
-
-        self.crud.create(self.ncc, r_1)
-
-        # Get non-top level node - second level list element
-        rf = Runner()
-        ef1 = Runner.TwoList.Ldata()
-        ef1.number = 21  # 'runner:twolist:ldata['+str(e_1.number)+']:name'
-        ef11 = Runner.TwoList.Ldata.Subl1()
-        ef11.number = 211  # 'runner:twolist:ldata['+str(e_1.number)+']:subl1['+str(e_11.number)+']:name'
-        ef1.subl1.append(ef11)
-        rf.two_list.ldata.append(ef1)
-
-        ef11_read = self.crud.read(self.ncc, ef11)
-        self.assertIsNotNone(ef11_read)
-        self.assertEqual(ef11_read.name, 'runner:twolist:ldata['+str(e_1.number)+']:subl1['+str(e_11.number)+']:name')
-
-        # DELETE
-        r_1 = Runner()
-        self.crud.delete(self.ncc, r_1)
-
-    def test_inbtw_list_node(self):
-        # CREATE
-        r_1 = Runner()
-        e_1 = Runner.InbtwList.Ldata()
-        e_2 = Runner.InbtwList.Ldata()
-        e_1.number = 11
-        e_1.name = 'runner:inbtwlist:['+str(e_1.number)+']:name'
-        e_1.subc.number = 111
-        e_1.subc.name = 'runner:inbtwlist:['+str(e_1.number)+']:subc:name'
-        e_2.number = 12
-        e_2.name = 'runner:inbtwlist:['+str(e_2.number)+']:name'
-        e_2.subc.number = 121
-        e_2.subc.name = 'runner:inbtwlist:['+str(e_2.number)+']:name'
-        e_11 = Runner.InbtwList.Ldata.Subc.SubcSubl1()
-        e_11.number = 111
-        e_11.name = 'runner:inbtwlist:['+str(e_1.number)+']:subc:subcsubl1['+str(e_11.number)+']:name'
-        e_12 = Runner.InbtwList.Ldata.Subc.SubcSubl1()
-        e_12.number = 112
-        e_12.name = 'runner:inbtwlist:['+str(e_1.number)+']:subc:subcsubl1['+str(e_12.number)+']:name'
-        e_1.subc.subc_subl1.extend([e_11, e_12])
-        e_21 = Runner.InbtwList.Ldata.Subc.SubcSubl1()
-        e_21.number = 121
-        e_21.name = 'runner:inbtwlist:['+str(e_2.number)+']:subc:subcsubl1['+str(e_21.number)+']:name'
-        e_22 = Runner.InbtwList.Ldata.Subc.SubcSubl1()
-        e_22.number = 122
-        e_22.name = 'runner:inbtwlist:['+str(e_2.number)+']:subc:subcsubl1['+str(e_22.number)+']:name'
-        e_2.subc.subc_subl1.extend([e_21, e_22])
-        r_1.inbtw_list.ldata.extend([e_1, e_2])
-        self.crud.create(self.ncc, r_1)
-
-        # READ second level list element
-        rf = Runner()
-        ef2 = Runner.InbtwList.Ldata()
-        ef2.number = 12
-        ef22 = Runner.InbtwList.Ldata.Subc.SubcSubl1()
-        ef22.number = 122
-        ef2.subc.subc_subl1.append(ef22)
-        rf.inbtw_list.ldata.append(ef2)
-
-        ef22_read = self.crud.read(self.ncc, ef22)
-        self.assertIsNotNone(ef22_read)
-        self.assertEqual(ef22_read.name,
-                         'runner:inbtwlist:['+str(e_2.number)+']:subc:subcsubl1['+str(e_22.number)+']:name')
-
-        # DELETE
-        r_1 = Runner()
-        self.crud.delete(self.ncc, r_1)
-
 
 if __name__ == '__main__':
     suite = unittest.TestSuite()
diff --git a/sdk/python/core/tests/test_on_demand.py b/sdk/python/core/tests/test_on_demand.py
index b7c2d40e8..ac2eaf12b 100644
--- a/sdk/python/core/tests/test_on_demand.py
+++ b/sdk/python/core/tests/test_on_demand.py
@@ -114,7 +114,6 @@
   }
 }"""
 
-
 class SanityYang(unittest.TestCase):
 
     @classmethod
@@ -171,12 +170,14 @@ def test_on_demand_loading_xml(self):
         entity1 = self.codec.decode(self.codec_provider, AUGMENTED_XML_PAYLOAD)
         self.assertEqual(entity1.lib.ydktest_aug_4.ydktest_aug_nested_4.aug_four, "aug four")
 
+
     def test_on_demand_loading_json(self):
         self.codec_provider.encoding = EncodingFormat.JSON
         entity1 = self.codec.decode(self.codec_provider, AUGMENTED_JSON_PAYLOAD)
         self.assertEqual(entity1.doc.aug_5_identityref, ydktest_aug_ietf_5.DerivedAugIdentity())
 
 
+
 if __name__ == '__main__':
     device, non_demand, common_cache, timeout = get_device_info()
 
diff --git a/sdk/python/core/tests/test_restconf_session.py b/sdk/python/core/tests/test_restconf_session.py
index d19996be1..9ca75ab13 100644
--- a/sdk/python/core/tests/test_restconf_session.py
+++ b/sdk/python/core/tests/test_restconf_session.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,15 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-test_restconf_session.py
-RestconfSession tests
+"""test_restconf_session.py
+RestconfSession test
 """
 from __future__ import absolute_import
 
@@ -115,10 +109,6 @@ def test_json_payload_list(self):
         json_str = codec.encode(rdn, EncodingFormat.JSON, True)
         self.assertEqual(json_str, json_int_payload + json_bgp_payload)
 
-    def test_get_capabilities(self):
-        capabilities = self.restconf_session.get_capabilities()
-        self.assertTrue(len(capabilities) > 0)
-
 
 if __name__ == '__main__':
     import sys
diff --git a/sdk/python/core/tests/test_sanity_codec.py b/sdk/python/core/tests/test_sanity_codec.py
index 85f7e5c64..1aaa152aa 100644
--- a/sdk/python/core/tests/test_sanity_codec.py
+++ b/sdk/python/core/tests/test_sanity_codec.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,17 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
+"""test_sanity_codec.py
+sanity test for CodecService
 """
-test_sanity_codec.py
-sanity test for CodecService and CodecServiceProvider
-"""
-
+from __future__ import absolute_import
 import unittest
 
 try:
@@ -31,7 +25,7 @@
     from ydk.models.ydktest.openconfig_routing_policy import RoutingPolicy
     from ydk.models.ydktest.oc_pattern import OcA
     from ydk.models.ydktest.ydktest_sanity_typedefs import System, TopMode
-except ImportError:
+except:
     from ydk.models.ydktest.ydktest_sanity.runner.runner import Runner
     from ydk.models.ydktest.ydktest_sanity.native.native import Native
     from ydk.models.ydktest.ydktest_sanity.ydktest_sanity import YdkEnumTest
@@ -48,19 +42,27 @@
 
 from test_utils import assert_with_error
 
-_xml_enum_payload_1 = '''<built-in-t xmlns="http://cisco.com/ns/yang/ydktest-sanity">
+
+class SanityYang(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(self):
+        self.maxDiff = None
+        self.codec = CodecService()
+        self.provider = CodecServiceProvider(type='xml')
+
+        self._xml_enum_payload_1 = '''<built-in-t xmlns="http://cisco.com/ns/yang/ydktest-sanity">
   <enum-value>local</enum-value>
 </built-in-t>
 '''
-
-_json_enum_payload_1 = """{
+        self._json_enum_payload_1 = """{
   "ydktest-sanity:built-in-t": {
     "enum-value": "local"
   }
 }
 """
 
-_xml_enum_payload_2 = '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
+        self._xml_enum_payload_2 = '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
   <ytypes>
     <built-in-t>
       <enum-value>local</enum-value>
@@ -69,7 +71,7 @@
 </runner>
 '''
 
-_xml_runner_payload = '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
+        self._xml_runner_payload = '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
   <two-list>
     <ldata>
       <number>21</number>
@@ -99,7 +101,7 @@
 </runner>
 '''
 
-_json_runner_payload = """{
+        self._json_runner_payload = """{
   "ydktest-sanity:runner": {
     "two-list": {
       "ldata": [
@@ -136,13 +138,11 @@
   }
 }
 """
-
-_xml_oc_pattern_payload = '''<oc-A xmlns="http://cisco.com/ns/yang/oc-pattern">
+        self._xml_oc_pattern_payload = '''<oc-A xmlns="http://cisco.com/ns/yang/oc-pattern">
   <a>Hello</a>
 </oc-A>
 '''
-
-_json_oc_pattern_payload = """{
+        self._json_oc_pattern_payload = """{
   "oc-pattern:oc-A": [
     {
       "a": "Hello",
@@ -153,43 +153,33 @@
   ]
 }"""
 
-
-def _get_runner_entity():
-    r_1 = Runner()
-    e_1, e_2 = Runner.TwoList.Ldata(), Runner.TwoList.Ldata()
-    e_11, e_12 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
-    e_1.number = 21
-    e_1.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:name'
-    e_11.number = 211
-    e_11.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:subl1[' + str(e_11.number) + ']:name'
-    e_12.number = 212
-    e_12.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:subl1[' + str(e_12.number) + ']:name'
-    e_1.subl1.extend([e_11, e_12])
-    e_21, e_22 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
-    e_2.number = 22
-    e_2.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:name'
-    e_21.number = 221
-    e_21.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:subl1[' + str(e_21.number) + ']:name'
-    e_22.number = 222
-    e_22.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:subl1[' + str(e_22.number) + ']:name'
-    e_2.subl1.extend([e_21, e_22])
-    r_1.two_list.ldata.extend([e_1, e_2])
-    return r_1
-
-
-class SanityYang(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(self):
-        self.maxDiff = None
-        self.codec = CodecService()
-        self.provider = CodecServiceProvider(type='xml')
-        self.json_provider = CodecServiceProvider(type='json')
+    def _get_runner_entity(self):
+        r_1 = Runner()
+        e_1, e_2 = Runner.TwoList.Ldata(), Runner.TwoList.Ldata()
+        e_11, e_12 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
+        e_1.number = 21
+        e_1.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:name'
+        e_11.number = 211
+        e_11.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:subl1[' + str(e_11.number) + ']:name'
+        e_12.number = 212
+        e_12.name = 'runner:twolist:ldata[' + str(e_1.number) + ']:subl1[' + str(e_12.number) + ']:name'
+        e_1.subl1.extend([e_11, e_12])
+        e_21, e_22 = Runner.TwoList.Ldata.Subl1(), Runner.TwoList.Ldata.Subl1()
+        e_2.number = 22
+        e_2.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:name'
+        e_21.number = 221
+        e_21.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:subl1[' + str(e_21.number) + ']:name'
+        e_22.number = 222
+        e_22.name = 'runner:twolist:ldata[' + str(e_2.number) + ']:subl1[' + str(e_22.number) + ']:name'
+        e_2.subl1.extend([e_21, e_22])
+        r_1.two_list.ldata.extend([e_1, e_2])
+        return r_1
 
     def test_xml_encode_1(self):
-        r_1 = _get_runner_entity()
+        self.provider.encoding = EncodingFormat.XML
+        r_1 = self._get_runner_entity()
         payload = self.codec.encode(self.provider, r_1)
-        self.assertEqual(_xml_runner_payload, payload)
+        self.assertEqual(self._xml_runner_payload, payload)
 
         ldata_list = r_1.two_list.ldata
         ldata_keys = ldata_list.keys()
@@ -210,11 +200,12 @@ def test_xml_encode_1(self):
         self.assertEqual(subl_21_212.name, 'runner:twolist:ldata[21]:subl1[212]:name')
 
     def test_xml_encode_2(self):
+        self.provider.encoding = EncodingFormat.XML
         r_1 = Runner.Ytypes.BuiltInT()
         r_1.enum_value = YdkEnumTest.local
 
         payload = self.codec.encode(self.provider, r_1)
-        self.assertEqual(_xml_enum_payload_1, payload)
+        self.assertEqual(self._xml_enum_payload_1, payload)
 
     @assert_with_error("'provider' and 'entity_holder' cannot be None", YServiceError)
     def test_encode_invalid_1(self):
@@ -222,20 +213,21 @@ def test_encode_invalid_1(self):
 
     @assert_with_error("'provider' and 'entity_holder' cannot be None", YServiceError)
     def test_encode_invalid_2(self):
-        self.codec.encode(None, _get_runner_entity())
+            self.codec.encode(None, self._get_runner_entity())
 
     @assert_with_error("'provider' and 'entity_holder' cannot be None", YServiceError)
     def test_encode_invalid_3(self):
-        self.codec.encode(None, None)
+            self.codec.encode(None, None)
 
     def test_xml_decode_1(self):
-        entity = self.codec.decode(self.provider, _xml_enum_payload_2)
+        self.provider.encoding = EncodingFormat.XML
+        entity = self.codec.decode(self.provider, self._xml_enum_payload_2)
         self.assertEqual(
-            _xml_enum_payload_2, self.codec.encode(self.provider, entity))
+            self._xml_enum_payload_2, self.codec.encode(self.provider, entity))
 
     @assert_with_error("'provider' and 'payload_holder' cannot be None", YServiceError)
     def test_decode_invalid_1(self):
-        self.codec.decode(None, _xml_enum_payload_2)
+            self.codec.decode(None, self._xml_enum_payload_2)
 
     @assert_with_error("'provider' and 'payload_holder' cannot be None", YServiceError)
     def test_decode_invalid_2(self):
@@ -246,7 +238,8 @@ def test_decode_invalid_3(self):
         self.codec.decode(None, None)
 
     def test_xml_encode_decode(self):
-        r_1 = _get_runner_entity()
+        self.provider.encoding = EncodingFormat.XML
+        r_1 = self._get_runner_entity()
         payload = self.codec.encode(self.provider, r_1)
         entity = self.codec.decode(self.provider, payload)
 
@@ -254,8 +247,9 @@ def test_xml_encode_decode(self):
         self.assertEqual(payload, self.codec.encode(self.provider, entity))
 
     def test_xml_encode_decode_dict(self):
-        r_1 = _get_runner_entity()
-        r_entity = {'ydktest-sanity': r_1}
+        self.provider.encoding = EncodingFormat.XML
+        r_1 = self._get_runner_entity()
+        r_entity = {'ydktest-sanity':r_1}
         payload = self.codec.encode(self.provider, r_entity)
         entity = self.codec.decode(self.provider, payload)
         for module in entity:
@@ -263,75 +257,84 @@ def test_xml_encode_decode_dict(self):
         self.assertEqual(payload, self.codec.encode(self.provider, entity))
 
     def test_xml_decode_oc_pattern(self):
-        obj_a = OcA()
-        obj_a.a = 'Hello'
+        self.provider.encoding = EncodingFormat.XML
+        obj_A = OcA()
+        obj_A.a = 'Hello'
 
-        entity = self.codec.decode(self.provider, _xml_oc_pattern_payload)
+        entity = self.codec.decode(self.provider, self._xml_oc_pattern_payload)
 
-        self.assertEqual(obj_a.a, entity.a)
+        self.assertEqual(obj_A.a, entity.a)
 
     # JSON
 
     def test_json_encode_1(self):
-        json_provider = CodecServiceProvider(type='json')
-        entity = _get_runner_entity()
-        payload = self.codec.encode(json_provider, entity)
-        self.assertEqual(_json_runner_payload, payload)
+        self.provider.encoding = EncodingFormat.JSON
+        entity = self._get_runner_entity()
+        payload = self.codec.encode(self.provider, entity)
+        self.assertEqual(self._json_runner_payload, payload)
 
     def test_json_encode_2(self):
+        self.provider.encoding = EncodingFormat.JSON
         r_1 = Runner.Ytypes.BuiltInT()
         r_1.enum_value = YdkEnumTest.local
 
-        payload = self.codec.encode(self.json_provider, r_1)
-        self.assertEqual(_json_enum_payload_1, payload)
+        payload = self.codec.encode(self.provider, r_1)
+        self.assertEqual(self._json_enum_payload_1, payload)
 
     def test_json_decode_1(self):
-        entity = self.codec.decode(self.json_provider, _json_runner_payload)
-        payload = self.codec.encode(self.json_provider, entity)
-        self.assertEqual(_json_runner_payload, payload)
+        self.provider.encoding = EncodingFormat.JSON
+        entity = self.codec.decode(self.provider, self._json_runner_payload)
+        payload = self.codec.encode(self.provider, entity)
+        self.assertEqual(self._json_runner_payload, payload)
 
     def test_json_encode_decode(self):
-        runner = _get_runner_entity()
-        payload = self.codec.encode(self.json_provider, runner)
-        entity = self.codec.decode(self.json_provider, payload)
+        self.provider.encoding = EncodingFormat.JSON
+        runner = self._get_runner_entity()
+        payload = self.codec.encode(self.provider, runner)
+        entity = self.codec.decode(self.provider, payload)
         self.assertEqual(runner, entity)
-        self.assertEqual(payload, self.codec.encode(self.json_provider, entity))
+        self.assertEqual(payload, self.codec.encode(self.provider, entity))
 
     def test_json_encode_decode_dict(self):
-        entity = _get_runner_entity()
+        self.provider.encoding = EncodingFormat.JSON
+        entity = self._get_runner_entity()
         entity_holder = {'ydktest-sanity': entity}
-        payload_holder = self.codec.encode(self.json_provider, entity_holder)
-        entities = self.codec.decode(self.json_provider, payload_holder)
+        payload_holder = self.codec.encode(self.provider, entity_holder)
+        entities = self.codec.decode(self.provider, payload_holder)
         for module in entities:
             self.assertEqual(entities[module], entities[module])
             self.assertEqual(payload_holder[module],
-                             self.codec.encode(self.json_provider, entities[module]))
+                             self.codec.encode(self.provider, entities[module]))
 
     @unittest.skip('encodes to "oc-pattern:a": "(!error!)"')
     def test_json_encode_oc_pattern(self):
-        obj_a = OcA()
-        obj_a.a = 'Hello'
-        obj_a.b.b = 'Hello'
-        self.assertEqual(self.codec.encode(self.json_provider, obj_a),
-                         _json_oc_pattern_payload)
+        self.provider.encoding = EncodingFormat.JSON
+        obj_A = ocA()
+        obj_A.a = 'Hello'
+        obj_A.b.b = 'Hello'
+
+        self.assertEqual(self.codec.encode(self.provider, obj_A),
+                         self._json_oc_pattern_payload)
 
     @unittest.skip('YCoreError: YCodecError:Unknown element "oc-A".. Path:')
     def test_json_decode_oc_pattern(self):
-        entity = self.codec.decode(self.json_provider, _json_oc_pattern_payload)
+        self.provider.encoding = EncodingFormat.JSON
+        entity = self.codec.decode(self.provider, self._json_oc_pattern_payload)
 
         self.assertEqual(entity.a.get(), 'Hello')
         self.assertEqual(entity.b.b.get(), 'Hello')
 
     def test_xml_subtree(self):
-        r_1 = _get_runner_entity()
+        self.provider.encoding = EncodingFormat.XML
+        r_1 = self._get_runner_entity()
         payload = self.codec.encode(self.provider, r_1, subtree=True)
-        self.assertEqual(_xml_runner_payload[:-1], payload)
+        self.assertEqual(self._xml_runner_payload[:-1], payload)
 
         r_2 = self.codec.decode(self.provider, payload, subtree=True)
         self.assertEqual(r_1, r_2)
 
     def test_embedded_quote_leaflist_value(self):
-        """<routing-policy xmlns="http://openconfig.net/yang/routing-policy">
+        xml = '''<routing-policy xmlns="http://openconfig.net/yang/routing-policy">
   <defined-sets>
     <bgp-defined-sets xmlns="http://openconfig.net/yang/bgp-policy">
       <community-sets>
@@ -352,7 +355,7 @@ def test_embedded_quote_leaflist_value(self):
     </bgp-defined-sets>
   </defined-sets>
 </routing-policy>
-"""
+'''
         routing_policy = RoutingPolicy()
 
         com = RoutingPolicy.DefinedSets.BgpDefinedSets.CommunitySets.CommunitySet()
@@ -370,7 +373,7 @@ def test_embedded_quote_leaflist_value(self):
         payload = self.codec.encode(xml_provider, routing_policy)
 
         routing_policy_decode = self.codec.decode(xml_provider, payload)
-        if routing_policy == routing_policy_decode:  # TODO failing on travis for --one-module-per-class option
+        if routing_policy == routing_policy_decode: # TODO failing on travis for --one-module-per-class option
             self.assertEqual(routing_policy, routing_policy_decode)
 
     def test_list_no_keys(self):
@@ -388,29 +391,32 @@ def test_list_no_keys(self):
         self.assertEqual(payload, no_key_payload)
 
     def test_anyxml(self):
+        provider = CodecServiceProvider(type='xml')
         payload = '<?xml version="1.0"?><runner xmlns="http://cisco.com/ns/yang/ydktest-sanity"/>'
-        result = self.codec.decode(self.provider, payload)
+        result = self.codec.decode(provider, payload)
         self.assertIsNotNone(result)
 
         payload = '''<?xml version="1.0"?>
         <runner xmlns="http://cisco.com/ns/yang/ydktest-sanity"/>'''
-        result = self.codec.decode(self.provider, payload)
+        result = self.codec.decode(provider, payload)
         self.assertIsNotNone(result)
 
-    def test_decode_json_subtree(self):
-        entity = self.codec.decode(self.json_provider, '{"ydktest-sanity:runner": null}', subtree=True)
-        self.assertEqual(Runner(), entity)
+    @assert_with_error("Subtree option can only be used with XML encoding", YServiceError)
+    def test_decode_invalid_subtree_1(self):
+        self.provider.encoding = EncodingFormat.JSON
+        self.codec.decode(self.provider, '{"ydktest-sanity:runner": {}}', subtree=True)
 
-    def test_encode_json_subtree_(self):
-        json = self.codec.encode(self.json_provider, Runner(), pretty=False, subtree=True)
-        expected = '''{"ydktest-sanity:runner":null}'''
-        self.assertEqual(expected, json)
+    @assert_with_error("Subtree option can only be used with XML encoding", YServiceError)
+    def test_decode_invalid_subtree_2(self):
+        self.provider.encoding = EncodingFormat.JSON
+        self.codec.encode(self.provider, Runner(), subtree=True)
 
     def test_encode_decode_typedefs(self):
         system_encode = System()
         system_encode.mode = TopMode.stand_alone
-        system_encode.id = 22
+        system_encode.id = 22;
 
+        self.provider.encoding = EncodingFormat.XML
         payload = self.codec.encode(self.provider, system_encode)
 
         system_decode = self.codec.decode(self.provider, payload)
@@ -423,6 +429,7 @@ def test_encode_decode_list(self):
         native = Native()
         native.version = '0.1.0'
 
+        self.provider.encoding = EncodingFormat.XML
         xml_encode = self.codec.encode(self.provider, [runner, native])
 
         entity_list = self.codec.decode(self.provider, xml_encode)
@@ -435,11 +442,14 @@ def test_codec_json(self):
         native = Native()
         native.version = '0.1.0'
 
-        json_encode = self.codec.encode(self.json_provider, [runner, native])
+        self.provider.encoding = EncodingFormat.JSON
+        json_encode = self.codec.encode(self.provider, [runner, native])
 
-        entity_list = self.codec.decode(self.json_provider, json_encode)
+        entity_list = self.codec.decode(self.provider, json_encode)
         self.assertEqual(entity_list, [runner, native])
 
+        self.provider.encoding = EncodingFormat.XML
+
     def test_passive_codec(self):
         e='''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity"><passive><name>xyz</name><interfac><test>abc</test></interfac><testc xmlns="http://cisco.com/ns/yang/ydktest-sanity-augm"><xyz><xyz>25</xyz></xyz></testc></passive></runner>'''
         runner = Runner()
@@ -452,106 +462,9 @@ def test_passive_codec(self):
         p.testc.xyz.xyz = 25
         runner.passive.append(p)
 
+        self.provider.encoding = EncodingFormat.XML
         x = self.codec.encode(self.provider, runner, False)
-        self.assertEqual(x, e)
-
-    def test_augment_subtree(self):
-        passive = Runner.Passive()
-        passive.name = "xyz"
-
-        ifc = Runner.Passive.Interfac()
-        ifc.test = "abc"
-        passive.interfac.append(ifc)
-
-        passive.testc.xyz = Runner.Passive.Testc.Xyz()
-        passive.testc.xyz.parent = passive;
-        passive.testc.xyz.xyz = 25
-
-        xml = self.codec.encode(self.provider, passive, subtree=True);
-        expected = '''<passive xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <name>xyz</name>
-  <interfac>
-    <test>abc</test>
-  </interfac>
-  <testc xmlns="http://cisco.com/ns/yang/ydktest-sanity-augm">
-    <xyz>
-      <xyz>25</xyz>
-    </xyz>
-  </testc>
-</passive>'''
-        self.assertEqual(expected, xml)
-
-    def test_bool_lists(self):
-        r = Runner()
-        r.ytypes.built_in_t.bool_leaf_list.append(True)
-        r.ytypes.built_in_t.bool_leaf_list.append(False)
-
-        bool_list_elem = Runner.Ytypes.BuiltInT.BoolList()
-        bool_list_elem.bool_leaf = True
-        r.ytypes.built_in_t.bool_list.append(bool_list_elem)
-
-        xml = self.codec.encode(self.provider, r)
-        expected = '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
-  <ytypes>
-    <built-in-t>
-      <bool-leaf-list>true</bool-leaf-list>
-      <bool-leaf-list>false</bool-leaf-list>
-      <bool-list>
-        <bool-leaf>true</bool-leaf>
-      </bool-list>
-    </built-in-t>
-  </ytypes>
-</runner>
-'''
-        self.assertEqual(expected, xml)
-
-        entity = self.codec.decode(self.provider, xml)
-        self.assertEqual(entity, r)
-
-    def test_bool_lists_json(self):
-        r = Runner()
-        r.ytypes.built_in_t.bool_leaf_list.append(True)
-        r.ytypes.built_in_t.bool_leaf_list.append(False)
-
-        bool_list_elem = Runner.Ytypes.BuiltInT.BoolList()
-        bool_list_elem.bool_leaf = True
-        r.ytypes.built_in_t.bool_list.append(bool_list_elem)
-
-        json = self.codec.encode(self.json_provider, r)
-        expected = '''{
-  "ydktest-sanity:runner": {
-    "ytypes": {
-      "built-in-t": {
-        "bool-leaf-list": [
-          true,
-          false
-        ],
-        "bool-list": [
-          {
-            "bool-leaf": true
-          }
-        ]
-      }
-    }
-  }
-}
-'''
-        self.assertEqual(expected, json)
-
-        entity = self.codec.decode(self.json_provider, json)
-        self.assertEqual(entity, r)
-
-    def test_json_string_empty_value(self):
-        r = Runner()
-        r.ytypes.built_in_t.name = ""
-
-        json = self.codec.encode(self.json_provider, r, pretty=False)
-        expected = '''{"ydktest-sanity:runner":{"ytypes":{"built-in-t":{"name":""}}}}'''
-        self.assertEqual(expected, json)
-
-        entity = self.codec.decode(self.json_provider, json)
-        self.assertEqual(entity, r)
-
+        self.assertEqual(x,e)
 
 if __name__ == '__main__':
     import sys
diff --git a/sdk/python/core/tests/test_sanity_deviation_bgp.py b/sdk/python/core/tests/test_sanity_deviation_bgp.py
index 7cb53bc3b..3d9383812 100644
--- a/sdk/python/core/tests/test_sanity_deviation_bgp.py
+++ b/sdk/python/core/tests/test_sanity_deviation_bgp.py
@@ -52,7 +52,7 @@ def test_bgp(self):
         ipv4_afsf.apply_policy.config.default_export_policy = DefaultPolicyType.ACCEPT_ROUTE
         bgp_cfg.global_.afi_safis.afi_safi.append(ipv4_afsf)
 
-        self.assertRaises(YError, self.crud.create, self.ncc, bgp_cfg)
+        self.assertRaises(YModelError, self.crud.create, self.ncc, bgp_cfg)
 
 
 if __name__ == '__main__':
diff --git a/sdk/python/core/tests/test_sanity_executor_rpc.py b/sdk/python/core/tests/test_sanity_executor_rpc.py
index ec25c58cf..d328bb6f5 100644
--- a/sdk/python/core/tests/test_sanity_executor_rpc.py
+++ b/sdk/python/core/tests/test_sanity_executor_rpc.py
@@ -13,30 +13,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-test_sanity_rpc.py
-sanity test for Executor Service on netconf
+"""test_sanity_rpc.py
+sanity test for netconf
 """
 from __future__ import absolute_import
 
 import sys
 import unittest
 
-from ydk.errors import YError
+from ydk.errors import YError, YServiceError
+from ydk.models.ydktest import ydktest_sanity as ysanity
+from ydk.models.ydktest import ietf_netconf, openconfig_bgp
 from ydk.providers import NetconfServiceProvider, CodecServiceProvider
-from ydk.services import ExecutorService, CodecService, CRUDService
+from ydk.services import ExecutorService, CodecService
 from ydk.types import Empty, EncodingFormat
 
-from ydk.models.ydktest import ydktest_sanity as ysanity
-from ydk.models.ydktest import ietf_netconf, ietf_netconf_monitoring, openconfig_bgp
-
-from test_utils import ParametrizedTestCase, get_device_info
+from test_utils import ParametrizedTestCase
+from test_utils import get_device_info
 
 
 class SanityTest(unittest.TestCase):
@@ -60,6 +54,7 @@ def setUp(self):
             self.on_demand,
             self.common_cache,
             self.timeout)
+        from ydk.services import CRUDService
         crud = CRUDService()
         runner = ysanity.Runner()
         crud.delete(self.ncc, runner)
@@ -73,6 +68,7 @@ def tearDown(self):
             pass
         del self.ncc
 
+    @unittest.skip('Issues in confd')
     def test_close_session_rpc(self):
         rpc = ietf_netconf.CloseSession()
 
@@ -172,7 +168,7 @@ def test_unlock_rpc_fail(self):
         unlock_rpc = ietf_netconf.Unlock()
         unlock_rpc.input.target.running = Empty()
         try:
-            self.es.execute_rpc(self.ncc, unlock_rpc)
+            reply = self.es.execute_rpc(self.ncc, unlock_rpc)
         except Exception as e:
             self.assertIsInstance(e, YError)
 
@@ -202,22 +198,10 @@ def test_non_rpc_fail(self):
             self.assertIsInstance(e, YError)
             # self.assertEqual(e.code, YErrorCode.INVALID_RPC)
 
-    def test_execute_get_config(self):
+    def test_execute_get_schema(self):
         get_rpc = ietf_netconf.Get()
         get_rpc.input.filter = '<bgp xmlns="http://openconfig.net/yang/bgp"/>'
-        reply = self.es.execute_rpc(self.ncc, get_rpc, openconfig_bgp.Bgp())
-        self.assertIsNotNone(reply)
-
-    def test_execute_get_schema(self):
-        rpc_entity = ietf_netconf_monitoring.GetSchema()
-        rpc_entity.input.identifier = "main"
-        return_output_entity = ietf_netconf_monitoring.GetSchema.Output()
-        reply = self.es.execute_rpc(self.ncc, rpc_entity, return_output_entity)
-        self.assertIsNotNone(reply)
-
-        module = reply.data
-        self.assertTrue("module main {" == module[0:13])
-
+        self.es.execute_rpc(self.ncc, get_rpc, openconfig_bgp.Bgp())
 
 if __name__ == '__main__':
     device, non_demand, common_cache, timeout = get_device_info()
@@ -231,3 +215,4 @@ def test_execute_get_schema(self):
         timeout=timeout))
     ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
     sys.exit(ret)
+
diff --git a/sdk/python/core/tests/test_sanity_filters.py b/sdk/python/core/tests/test_sanity_filters.py
index f157811b5..e55d98881 100644
--- a/sdk/python/core/tests/test_sanity_filters.py
+++ b/sdk/python/core/tests/test_sanity_filters.py
@@ -120,24 +120,14 @@ def test_read_on_ref_list(self):
         r_1 = ysanity.Runner()
         l_1, l_2 = ysanity.Runner.OneList.Ldata(), ysanity.Runner.OneList.Ldata()
         l_1.number, l_2.number = 1, 2
-        l_1.name, l_2.name = 'a', 'b'
         r_1.one_list.ldata.extend([l_1, l_2])
         self.crud.create(self.ncc, r_1)
 
-        # Read container
         r_2 = ysanity.Runner()
-        r_2.one_list.yfilter = YFilter.read
+        r_2.one_list.ldata.yfilter = YFilter.read
         runner_read = self.crud.read(self.ncc, r_2)
-        self.assertEqual(runner_read, r_1)
 
-        # Read just the list ldata
-        r_3 = ysanity.Runner()
-        data = ysanity.Runner.OneList.Ldata()
-        data.number = YFilter.read
-        r_3.one_list.ldata.append(data)
-        runner_read = self.crud.read(self.ncc, r_3)
-        self.assertEqual(len(runner_read.one_list.ldata), 2)
-        self.assertIsNone(runner_read.one_list.ldata['1'].name)
+        self.assertEqual(runner_read, r_1)
 
     def test_read_on_list_with_key(self):
         r_1 = ysanity.Runner.OneList()
@@ -258,17 +248,6 @@ def test_bgp_read_container(self):
         self.assertTrue(len(bgp_read.neighbors.neighbor) == 2)
         self.assertFalse(bgp_read.global_.has_data())
 
-        # Read only 'neighbor' list
-        bgp_filter = openconfig_bgp.Bgp()
-        nr = openconfig_bgp.Bgp.Neighbors.Neighbor()
-        nr.neighbor_address = YFilter.read
-        bgp_filter.neighbors.neighbor.append(nr)
-        bgp_read = self.crud.read_config(self.ncc, bgp_filter)
-        self.assertIsNotNone(bgp_read)
-        self.assertTrue(len(bgp_read.neighbors.neighbor) == 2)
-        self.assertFalse(bgp_read.neighbors.neighbor["1.2.3.5"].config.has_data())
-        self.assertFalse(bgp_read.global_.has_data())
-
         # Delete BGP config
         bgp_set = openconfig_bgp.Bgp()
         reply = self.crud.delete(self.ncc, bgp_set)
diff --git a/sdk/python/core/tests/test_sanity_levels.py b/sdk/python/core/tests/test_sanity_levels.py
index 047986e32..1f0631a47 100644
--- a/sdk/python/core/tests/test_sanity_levels.py
+++ b/sdk/python/core/tests/test_sanity_levels.py
@@ -92,6 +92,7 @@ def test_one_level_pos(self):
 
         self.assertEqual(r_2, None)
 
+
     def test_one_aug_level_pos(self):
         # READ
         r_1 = Runner()
diff --git a/sdk/python/core/tests/test_sanity_netconf.py b/sdk/python/core/tests/test_sanity_netconf.py
index 369b89fc6..2d9445500 100644
--- a/sdk/python/core/tests/test_sanity_netconf.py
+++ b/sdk/python/core/tests/test_sanity_netconf.py
@@ -14,8 +14,7 @@
 # limitations under the License.
 # ------------------------------------------------------------------
 
-"""
-test_sanity_netconf.py
+"""test_sanity_netconf.py
 sanity tests for netconf
 """
 from __future__ import absolute_import
@@ -34,12 +33,12 @@
 from ydk.services  import CRUDService
 from ydk.services  import CodecService
 from ydk.providers import CodecServiceProvider
-from ydk.types import EncodingFormat
-from ydk.types import Filter, Config
+from ydk.ext.types import EncodingFormat
 
 from test_utils import ParametrizedTestCase
 from test_utils import get_device_info
 
+from ydk.types  import Filter, Config
 
 class SanityNetconf(ParametrizedTestCase):
 
@@ -291,7 +290,7 @@ def test_unlock_fail(self):
                           "invalid-input")
 
     def test_sanity_crud_read_interface(self):
-        address = ysanity.Native.Interface.Loopback.Ipv4.Address()
+        address = ysanity.Native.Interface.Loopback.Ipv4.Address();
         address.ip = "2.2.2.2"
         address.netmask = "255.255.255.255"
 
@@ -333,7 +332,7 @@ def test_crud_read_list(self):
         bgp.global_.config.as_ = 65001
         bgp.global_.config.router_id = "1.2.3.4"
 
-        create_list = [native, bgp]
+        create_list = [native, bgp];
 
         # Configure device
         result = crud.create(self.ncc, create_list)
@@ -342,7 +341,7 @@ def test_crud_read_list(self):
         # Read configuration
         native_filter = ysanity.Native()
         bgp_filter = openconfig.Bgp()
-        filter_list = [native_filter, bgp_filter]
+        filter_list = [native_filter, bgp_filter];
 
         read_list = crud.read(self.ncc, filter_list)
         self.assertEqual(isinstance(read_list, list), True)
@@ -356,7 +355,7 @@ def test_crud_read_collection(self):
         crud = CRUDService()
 
         # Build configuration of multiple objects
-        create_list = Config()
+        create_list = Config();
 
         native = ysanity.Native()
         native.hostname = 'NativeHost'
@@ -375,7 +374,7 @@ def test_crud_read_collection(self):
         self.assertEqual(result, True)
 
         # Read configuration
-        read_filter = Filter([ysanity.Native(), openconfig.Bgp()])
+        read_filter = Filter([ysanity.Native(), openconfig.Bgp()]);
         read_config = crud.read(self.ncc, read_filter)
         self.assertEqual(isinstance(read_config, Config), True)
         self.assertEqual(len(read_config), 2)
@@ -452,7 +451,6 @@ def test_passive_interface(self):
         op = self.netconf_service.discard_changes(self.ncc)
         self.assertEqual(True, op)
 
-
 if __name__ == '__main__':
     device, non_demand, common_cache, timeout = get_device_info()
 
diff --git a/sdk/python/core/tests/test_sanity_path.py b/sdk/python/core/tests/test_sanity_path.py
index 004587ed1..e2108e2bb 100644
--- a/sdk/python/core/tests/test_sanity_path.py
+++ b/sdk/python/core/tests/test_sanity_path.py
@@ -30,7 +30,7 @@
 from ydk.types import EncodingFormat
 
 from test_utils import ParametrizedTestCase
-from test_utils import get_device_info, assert_with_error
+from test_utils import get_device_info
 
 
 class SanityTest(unittest.TestCase):
@@ -51,7 +51,7 @@ def setUpClass(cls):
 
     def _delete_runner(self):
         runner = self.root_schema.create_datanode("ydktest-sanity:runner")
-        xml = self.codec.encode(runner, EncodingFormat.XML)
+        xml = self.codec.encode(runner, EncodingFormat.XML, True)
         create_rpc = self.root_schema.create_rpc("ydk:delete")
         create_rpc.get_input_node().create_datanode("entity", xml)
         # RuntimeError: YCoreError: YCodecError:Schema node not found.. Path: input/config if invoked
@@ -76,7 +76,7 @@ def test_leafs(self):
         for (leaf_path, leaf_value) in leaf_path_values:
             runner.create_datanode(leaf_path, leaf_value)
 
-        xml = self.codec.encode(runner, EncodingFormat.XML)
+        xml = self.codec.encode(runner, EncodingFormat.XML, True)
         create_rpc = self.root_schema.create_rpc("ydk:create")
         create_rpc.get_input_node().create_datanode("entity", xml)
         create_rpc(self.nc_session)
@@ -92,39 +92,38 @@ def test_leafs(self):
 
     def test_rpcs(self):
         getc = self.root_schema.create_rpc("ietf-netconf:get-config")
-        self.assertTrue(getc.has_output_node())
+        self.assertEqual(getc.has_output_node() , True)
         get = self.root_schema.create_rpc("ietf-netconf:get")
-        self.assertTrue(get.has_output_node())
+        self.assertEqual(get.has_output_node() , True)
         editc = self.root_schema.create_rpc("ietf-netconf:edit-config")
-        self.assertFalse(editc.has_output_node())
+        self.assertEqual(editc.has_output_node() , False)
         val = self.root_schema.create_rpc("ietf-netconf:validate")
-        self.assertFalse(val.has_output_node())
+        self.assertEqual(val.has_output_node() , False)
         com = self.root_schema.create_rpc("ietf-netconf:commit")
-        self.assertFalse(com.has_output_node())
+        self.assertEqual(com.has_output_node() , False)
         lo = self.root_schema.create_rpc("ietf-netconf:lock")
-        self.assertFalse(lo.has_output_node())
+        self.assertEqual(lo.has_output_node() , False)
 
     def test_codec(self):
         self.root_schema.create_datanode('ydktest-sanity:runner')
         self.root_schema.create_rpc('ietf-netconf-monitoring:get-schema')
         a = self.codec.decode(self.root_schema,
-                              '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
+                         '''<runner xmlns="http://cisco.com/ns/yang/ydktest-sanity">
                      <ytypes>
                      <built-in-t>
                      <bits-value>disable-nagle auto-sense-speed</bits-value>
                      </built-in-t>
                      </ytypes>
                      </runner>''',
-                              EncodingFormat.XML)
-        self.assertIsNotNone(a)
+                     EncodingFormat.XML)
+        self.assertNotEqual(a, None)
 
         pl2 = ''' <data xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring">module xyz { } </data>'''
-        d2 = self.codec.decode_rpc_output(self.root_schema, pl2,
-                                          "/ietf-netconf-monitoring:get-schema", EncodingFormat.XML)
-        self.assertIsNotNone(d2)
+        d2 = self.codec.decode_rpc_output(self.root_schema, pl2, "/ietf-netconf-monitoring:get-schema", EncodingFormat.XML)
+        self.assertNotEqual(d2 , None)
         x2 = self.codec.encode(d2, EncodingFormat.XML, False)
-        self.assertEqual(x2,
-                         "<get-schema xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\"><data>module xyz { } </data></get-schema>")
+        self.assertEqual(
+            x2, "<get-schema xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring\"><data>module xyz { } </data></get-schema>")
 
     def test_get_schema(self):
         get_schema_rpc = self.root_schema.create_rpc("ietf-netconf-monitoring:get-schema")
@@ -133,7 +132,7 @@ def test_get_schema(self):
         res = get_schema_rpc(self.nc_session)
 
         xml = self.codec.encode(res, EncodingFormat.XML, False)
-        self.assertNotEqual(len(xml), 0)
+        self.assertNotEqual( len(xml), 0 )
 
     def test_get_running_config(self):
         get_config_rpc = self.root_schema.create_rpc("ietf-netconf:get-config")
@@ -142,10 +141,10 @@ def test_get_running_config(self):
         response = get_config_rpc(self.nc_session)
 
         all_nodes = response.get_children()
-        self.assertTrue(len(all_nodes) >= 2)
+        self.assertEqual( len(all_nodes)>=2, True )
 
-        xml = self.codec.encode(response, EncodingFormat.XML)
-        self.assertNotEqual(len(xml), 0)
+        xml = self.codec.encode(response, EncodingFormat.XML, True)
+        self.assertNotEqual( len(xml), 0 )
 
     def test_anyxml(self):
         get_rpc = self.root_schema.create_rpc('ietf-netconf:get')
@@ -164,7 +163,7 @@ def test_anyxml(self):
         self.assertIsNotNone(datanode)
 
     def test_anyxml_action(self):
-        expected = '''<data xmlns="http://cisco.com/ns/yang/ydktest-action">
+        expected='''<data xmlns="http://cisco.com/ns/yang/ydktest-action">
   <action-node>
     <test>xyz</test>
   </action-node>
@@ -174,13 +173,13 @@ def test_anyxml_action(self):
         a = native.create_action("action-node")
         a.create_datanode("test", "xyz")
 
-        xml = self.codec.encode(native, EncodingFormat.XML)
+        xml = self.codec.encode(native, EncodingFormat.XML, True)
         self.assertEqual(xml, expected)
 
         try:
             native(self.nc_session)
         except Exception as e:
-            self.assertTrue(isinstance(e, RuntimeError))
+            self.assertEqual(isinstance(e, RuntimeError), True)
 
     def test_path_codec_list(self):
         root_shema = self.nc_session.get_root_schema()
@@ -205,7 +204,8 @@ def test_rpc_get_schema_no_decode(self):
         rpc.get_input_node().create_datanode("identifier", "ydktest-sanity-action")
 
         reply = self.nc_session.execute_netconf_operation(rpc)
-        self.assertTrue(len(reply) > 0)
+        self.assertTrue(len(reply)>0)
+        #print(reply)
 
     def test_create_datanode(self):
         datanode_path = "/ydktest-sanity:runner/two-key-list[first='first-key'][second='2']/property"
@@ -215,16 +215,6 @@ def test_create_datanode(self):
         self.assertEqual(datanode_path, datanode.get_path())
         self.assertEqual(datanode_value, datanode.get_value())
 
-    @assert_with_error("YCodecError:Unknown element", RuntimeError)
-    def test_codec_decode_exception(self):
-        incorrect_payload = '''
-<oc-A xmlns="http://cisco.com/ns/yang/oc-pattern">
-    <A>Hello</A>
-</oc-A>
-'''
-        codec = Codec()
-        codec.decode(self.root_schema, incorrect_payload, EncodingFormat.XML)
-
 
 if __name__ == '__main__':
     device, non_demand, common_cache, timeout = get_device_info()
@@ -232,9 +222,9 @@ def test_codec_decode_exception(self):
     suite = unittest.TestSuite()
     suite.addTest(ParametrizedTestCase.parametrize(
         SanityTest,
-        device=device,
-        non_demand=non_demand,
-        common_cache=common_cache,
-        timeout=timeout))
+        device = device,
+        non_demand = non_demand,
+        common_cache = common_cache,
+        timeout = timeout))
     ret = not unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
     sys.exit(ret)
diff --git a/sdk/python/core/tests/test_sanity_types.py b/sdk/python/core/tests/test_sanity_types.py
index 367f41538..5483bb49a 100644
--- a/sdk/python/core/tests/test_sanity_types.py
+++ b/sdk/python/core/tests/test_sanity_types.py
@@ -30,7 +30,7 @@
 try:
     from ydk.models.ydktest.ydktest_sanity import Runner, CascadingTypes, SubTest, ChildIdentity, ChildChildIdentity, Native
     from ydk.models.ydktest.ydktest_sanity_types import YdktestType
-    from ydk.models.ydktest.ydktest_sanity import YdkEnumTest, YdkEnumIntTest, CompInstType, CompNicInstType
+    from ydk.models.ydktest.ydktest_sanity import YdkEnumTest, YdkEnumIntTest, CompInstType, CompInstType_
 except ImportError:
     from ydk.models.ydktest.ydktest_sanity.runner.runner import Runner
     from ydk.models.ydktest.ydktest_sanity.native.native import Native
@@ -38,7 +38,7 @@
     from ydk.models.ydktest.ydktest_sanity.sub_test.sub_test import SubTest
     from ydk.models.ydktest.ydktest_sanity.ydktest_sanity import ChildIdentity, ChildChildIdentity
     from ydk.models.ydktest.ydktest_sanity_types.ydktest_sanity_types import YdktestType
-    from ydk.models.ydktest.ydktest_sanity.ydktest_sanity import YdkEnumTest, YdkEnumIntTest, CompInstType, CompNicInstType
+    from ydk.models.ydktest.ydktest_sanity.ydktest_sanity import YdkEnumTest, YdkEnumIntTest, CompInstType, CompInstType_
 
 from test_utils import ParametrizedTestCase
 from test_utils import get_device_info
@@ -67,6 +67,9 @@ def tearDown(self):
         runner = Runner()
         self.crud.delete(self.ncc, runner)
 
+        ctypes = CascadingTypes()
+        self.crud.delete(self.ncc, ctypes)
+
     def test_int8(self):
         # Create Runner
         runner = Runner()
@@ -527,11 +530,17 @@ def test_boolean_update_read(self):
         self.assertEqual(runner2, runner1)
         self.assertEqual(runner.ytypes.built_in_t.bool_value, runner1.ytypes.built_in_t.bool_value)
 
+    # def test_binary(self):
+    #     pass
+
+    # def test_binary_invalid(self):
+    #     pass
+
     def test_cascading_types(self):
-        self._cascading_types_helper(CompInstType.unknown, CompNicInstType.unknown)
-        self._cascading_types_helper(CompInstType.phys, CompNicInstType.phys)
-        self._cascading_types_helper(CompInstType.virt, CompNicInstType.virt)
-        self._cascading_types_helper(CompInstType.hv, CompNicInstType.hv)
+        self._cascading_types_helper(CompInstType.unknown, CompInstType_.unknown)
+        self._cascading_types_helper(CompInstType.phys, CompInstType_.phys)
+        self._cascading_types_helper(CompInstType.virt, CompInstType_.virt)
+        self._cascading_types_helper(CompInstType.hv, CompInstType_.hv)
 
     def _cascading_types_helper(self, enum1, enum2):
         ctypes = CascadingTypes()
@@ -546,9 +555,6 @@ def _cascading_types_helper(self, enum1, enum2):
         # Compare runners
         self.assertEqual(ctypes, ctypesRead)
 
-        ctypes = CascadingTypes()
-        self.crud.delete(self.ncc, ctypes)
-
     def test_capital_letters(self):
         native = Native()
         gigabit_eth = Native.Interface.GigabitEthernet()
diff --git a/sdk/python/core/tests/test_utils.py b/sdk/python/core/tests/test_utils.py
index 5a809a07a..1da686346 100644
--- a/sdk/python/core/tests/test_utils.py
+++ b/sdk/python/core/tests/test_utils.py
@@ -23,7 +23,12 @@
 import logging
 
 from argparse import ArgumentParser
-from urllib.parse import urlparse
+
+import sys
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 from ydk.entity_utils import get_data_node_from_entity
 from ydk.errors       import YCoreError
@@ -35,11 +40,8 @@ def helper(self, *args, **kwargs):
             try:
                 func(self)
             except ErrorClass as error:
-                if hasattr(error, 'message'):
-                    res = re.match(pattern, error.message.strip())
-                elif hasattr(error, 'args'):
-                    res = pattern in error.args[0]
-                self.assertTrue(res)
+                res = re.match(pattern, error.message.strip())
+                self.assertEqual(res is not None, True)
         return helper
     return assert_with_pattern
 
@@ -49,7 +51,10 @@ class ParametrizedTestCase(unittest.TestCase):
         inherit from this class.
     """
     def __init__(self, method_name='runTest'):
-        super().__init__(method_name)
+        if sys.version_info > (3,):
+            super().__init__(method_name)
+        else:
+            super(ParametrizedTestCase, self).__init__(method_name)
 
     @staticmethod
     def parametrize(testcase_klass, device, non_demand, common_cache, timeout):
diff --git a/sdk/python/core/tests/test_ydk_types.py b/sdk/python/core/tests/test_ydk_types.py
index 8e3a36d5c..1d4637787 100644
--- a/sdk/python/core/tests/test_ydk_types.py
+++ b/sdk/python/core/tests/test_ydk_types.py
@@ -143,14 +143,14 @@ def test_ylist_runner_two_key_list(self):
 
         ldata_list = runner.two_key_list
         ldata_keys = ldata_list.keys()
-        self.assertEqual(ldata_keys, [('f1', '11'), ('f2', '22')])
+        self.assertEqual(ldata_keys, [('f1', 11), ('f2', 22)])
 
         for lkey in ldata_keys:
             ldata = ldata_list[lkey]
             self.assertNotEqual(ldata, None)
 
-        self.assertEqual(ldata_list[('f1', '11')], l_1)
-        self.assertEqual(ldata_list[('f2', '22')], l_2)
+        self.assertEqual(ldata_list[('f1', 11)], l_1)
+        self.assertEqual(ldata_list[('f2', 22)], l_2)
 
     def test_ylist_runner_one_key_list(self):
         one_list = ysanity.Runner.OneList()
diff --git a/sdk/python/core/ydk/entity_utils/entity_utils.py b/sdk/python/core/ydk/entity_utils/entity_utils.py
index a98fc3b09..1a6a7e835 100644
--- a/sdk/python/core/ydk/entity_utils/entity_utils.py
+++ b/sdk/python/core/ydk/entity_utils/entity_utils.py
@@ -19,6 +19,7 @@
 # All rights reserved under Apache License, Version 2.0.
 # ------------------------------------------------------------------
 
+import sys
 import json
 import pkgutil
 import importlib
@@ -27,7 +28,9 @@
 
 from ydk.ext.entity_utils import get_entity_from_data_node, get_data_node_from_entity
 from ydk.ext.services import Datastore
+
 from ydk.types import Config, EncodingFormat, YList, Entity
+
 from ydk.errors import YModelError, YServiceError
 
 _ENTITY_ERROR_MSG = "No YDK bundle installed for node path '{}'"
@@ -157,12 +160,22 @@ def _get_ns_ename(payload, encoding):
             log.error("xml.etree.ElementTree.ParseError: {}\n{}".format(err, payload))
     else:
         keys = json.loads(payload).keys()
+        # for Python 3
         keys = list(keys)
         ns, ename = keys[0].split(':')
+        ns = _to_utf8(ns)
+        ename = _to_utf8(ename)
 
     return ns, ename
 
 
+def _to_utf8(string):
+    """Convert unicode to str if running under Python 2 environment."""
+    if sys.version_info < (3, 0):
+        return string.encode('utf-8')
+    return string
+
+
 def _get_bundle_name(entity):
     """Return bundle name for entity.
 
diff --git a/sdk/python/core/ydk/errors/__init__.py b/sdk/python/core/ydk/errors/__init__.py
index 72ade34cd..00e40658f 100644
--- a/sdk/python/core/ydk/errors/__init__.py
+++ b/sdk/python/core/ydk/errors/__init__.py
@@ -13,15 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """ errors
    Contains types representing the Exception hierarchy in YDK
 """
+import sys
 
 
 class YError(Exception):
@@ -43,7 +39,10 @@ class YCoreError(YError):
     Exception for core error
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YCoreError, self).__init__(error_msg)
 
 
 class YCodecError(YError):
@@ -51,7 +50,10 @@ class YCodecError(YError):
     Exception for Codec Error
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YCodecError, self).__init__(error_msg)
 
 
 class YClientError(YError):
@@ -59,7 +61,10 @@ class YClientError(YError):
     Exception for Client Side Validation
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YClientError, self).__init__(error_msg)
 
 
 class YServiceProviderError(YError):
@@ -67,7 +72,10 @@ class YServiceProviderError(YError):
     Exception for Provider Side Validation
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YServiceProviderError, self).__init__(error_msg)
 
 
 class YServiceError(YError):
@@ -75,7 +83,10 @@ class YServiceError(YError):
     Exception for Service Side Validation
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YServiceError, self).__init__(error_msg)
 
 
 class YIllegalStateError(YError):
@@ -84,7 +95,10 @@ class YIllegalStateError(YError):
     in the right state. Use the error_msg for the error.
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YIllegalStateError, self).__init__(error_msg)
 
 
 class YInvalidArgumentError(YError):
@@ -92,7 +106,10 @@ class YInvalidArgumentError(YError):
     Use the error_msg for the error.
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YInvalidArgumentError, self).__init__(error_msg)
 
 
 class YOperationNotSupportedError(YError):
@@ -100,7 +117,10 @@ class YOperationNotSupportedError(YError):
     Thrown when an yfilter is not supported.
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YOperationNotSupportedError, self).__init__(error_msg)
 
 
 class YModelError(YError):
@@ -108,4 +128,7 @@ class YModelError(YError):
     Thrown when a model constraint is violated.
     """
     def __init__(self, error_msg):
-        super().__init__(error_msg)
+        if sys.version_info > (3,):
+            super().__init__(error_msg)
+        else:
+            super(YModelError, self).__init__(error_msg)
diff --git a/sdk/python/core/ydk/errors/error_handler.py b/sdk/python/core/ydk/errors/error_handler.py
index e3f860a4a..a7be3c9b7 100644
--- a/sdk/python/core/ydk/errors/error_handler.py
+++ b/sdk/python/core/ydk/errors/error_handler.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-
+import sys
 import inspect
 import contextlib
 
@@ -29,20 +29,33 @@
 from ydk.errors import YServiceProviderError as _YServiceProviderError
 
 
-_ERRORS = {
-    "YError": _YError,
-    "YCoreError": _YCoreError,
-    "YCodecError": _YCodecError,
-    "YClientError": _YClientError,
-    "YIllegalStateError": _YIllegalStateError,
-    "YInvalidArgumentError": _YInvalidArgumentError,
-    "YModelError": _YModelError,
-    "YOperationNotSupportedError": _YOperationNotSupportedError,
-    "YServiceError": _YServiceError,
-    "YServiceProviderError": _YServiceProviderError,
+if sys.version_info > (3, 0):
+    inspect.getargspec = inspect.getfullargspec
+
+
+_ERRORS = {"YError": _YError,
+           "YCoreError": _YCoreError,
+           "YCodecError": _YCodecError,
+           "YClientError": _YClientError,
+           "YIllegalStateError": _YIllegalStateError,
+           "YInvalidArgumentError": _YInvalidArgumentError,
+           "YModelError": _YModelError,
+           "YOperationNotSupportedError": _YOperationNotSupportedError,
+           "YServiceError": _YServiceError,
+           "YServiceProviderError": _YServiceProviderError,
 }
 
 
+def _raise(exc):
+    """Suppress old exception context for Python > 3.3,
+    Use exec to avoid SyntaxError under Python 2 environment.
+    """
+    if sys.version_info >= (3,3):
+        exec("raise exc from None")
+    else:
+        raise exc
+
+
 @contextlib.contextmanager
 def handle_runtime_error():
     _exc = None
@@ -66,7 +79,7 @@ def handle_runtime_error():
             _exc = _YError(msg)
     finally:
         if _exc:
-            raise _exc
+            _raise(_exc)
 
 
 @contextlib.contextmanager
@@ -79,7 +92,7 @@ def handle_type_error():
         _exc = _YModelError(str(err))
     finally:
         if _exc:
-            raise _exc
+            _raise(_exc)
 
 
 @contextlib.contextmanager
@@ -92,7 +105,7 @@ def handle_import_error(logger, level):
 
 def check_argument(func):
     def helper(self, provider, entity, *args, **kwargs):
-        _, pname, ename = inspect.getfullargspec(func).args[:3]
+        _, pname, ename = inspect.getargspec(func).args[:3]
         if provider is None or entity is None:
             err_msg = "'{0}' and '{1}' cannot be None".format(pname, ename)
             raise _YServiceError(error_msg=err_msg)
diff --git a/sdk/python/core/ydk/exthook.py b/sdk/python/core/ydk/exthook.py
index ad86314f4..72e9aa792 100644
--- a/sdk/python/core/ydk/exthook.py
+++ b/sdk/python/core/ydk/exthook.py
@@ -19,6 +19,7 @@
 import sys
 import os
 
+PY3 = sys.version_info[0] == 3
 
 class ExtensionImporter(object):
     """This importer redirects imports from this submodule to other locations.
diff --git a/sdk/python/core/ydk/filters/__init__.py b/sdk/python/core/ydk/filters/__init__.py
index 9fcf629c0..4b9b950a5 100644
--- a/sdk/python/core/ydk/filters/__init__.py
+++ b/sdk/python/core/ydk/filters/__init__.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 # ------------------------------------------------------------------
 
-from ydk_.filters import YFilter
+from ydk.ext.filters import YFilter
 
 merge = YFilter.merge
 create = YFilter.create
@@ -24,11 +24,11 @@
 read = YFilter.read
 not_set = YFilter.not_set
 
-__all__ = ["merge",
-           "create",
-           "remove",
-           "delete",
-           "replace",
-           "read",
-           "not_set"]
+__all__ = [ "merge",
+            "create",
+            "remove",
+            "delete",
+            "replace",
+            "read",
+            "not_set" ]
 
diff --git a/sdk/python/core/ydk/path/sessions/netconf_session.py b/sdk/python/core/ydk/path/sessions/netconf_session.py
index 0e9626bea..6c12d65da 100644
--- a/sdk/python/core/ydk/path/sessions/netconf_session.py
+++ b/sdk/python/core/ydk/path/sessions/netconf_session.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2017-2019 Cisco Systems
+# Copyright 2017 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,23 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-netconf_session.py
+"""netconf_session.py
 NetconfSession Python wrapper.
 """
 
-from ydk_.path import NetconfSession as _NetconfSession
+from ydk.ext.path import NetconfSession as _NetconfSession
+import sys
 
 
 class NetconfSession(_NetconfSession):
-    """
-     Python wrapper for NetconfSession
+    """ Python wrapper for NetconfSession
     """
 
     def __init__(self,
@@ -46,36 +40,39 @@ def __init__(self,
         if public_key_path is None:
             public_key_path = ""
 
-        self.ns = super()
+        if sys.version_info > (3,):
+            self._super = super()
+        else:
+            self._super = super(NetconfSession, self)
         if repo is None:
             if len(public_key_path) == 0:
-                self.ns.__init__(address, username, password,
-                                 port, protocol, on_demand,
-                                 common_cache, timeout)
+                self._super.__init__(address, username, password,
+                                     port, protocol, on_demand,
+                                     common_cache, timeout)
             else:
-                self.ns.__init__(address, username,
-                                 private_key_path, public_key_path,
-                                 port, protocol, on_demand,
-                                 common_cache, timeout)
+                self._super.__init__(address, username,
+                                     private_key_path, public_key_path,
+                                     port, protocol, on_demand,
+                                     common_cache, timeout)
         else:
             if len(public_key_path) == 0:
-                self.ns.__init__(repo, address, username, password,
-                                 port, protocol,
-                                 on_demand, timeout)
+                self._super.__init__(repo, address, username, password,
+                                     port, protocol,
+                                     on_demand, timeout)
             else:
-                self.ns.__init__(repo, address, username,
-                                 private_key_path, public_key_path,
-                                 port, protocol, on_demand,
-                                 common_cache, timeout)
+                self._super.__init__(repo, address, username,
+                                     private_key_path, public_key_path,
+                                     port, protocol, on_demand,
+                                     common_cache, timeout)
 
     def get_root_schema(self):
-        return self.ns.get_root_schema()
+        return self._super.get_root_schema()
 
     def invoke(self, rpc):
-        return self.ns.invoke(rpc)
+        return self._super.invoke(rpc)
 
     def execute_netconf_operation(self, rpc):
-        return self.ns.execute_netconf_operation(rpc)
+        return self._super.execute_netconf_operation(rpc)
 
     def get_capabilities(self):
-        return self.ns.get_capabilities()
+        return self._super.get_capabilities()
diff --git a/sdk/python/core/ydk/path/sessions/restconf_session.py b/sdk/python/core/ydk/path/sessions/restconf_session.py
index 43861b5cb..0cd9bb017 100644
--- a/sdk/python/core/ydk/path/sessions/restconf_session.py
+++ b/sdk/python/core/ydk/path/sessions/restconf_session.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2017-2019 Cisco Systems
+# Copyright 2017 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,39 +13,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-restconf_session.py
+"""restconf_session.py
 RestconfSession Python wrapper.
 """
 
-from ydk.types import EncodingFormat as _EncodingFormat
-from ydk_.path import RestconfSession as _RestconfSession
+from ydk.ext.types import EncodingFormat as _EncodingFormat
+from ydk.ext.path import RestconfSession as _RestconfSession
+import sys
 
 
 class RestconfSession(_RestconfSession):
-    """
-     Python wrapper for RestconfSession.
+    """ Python wrapper for RestconfSession.
     """
 
     def __init__(self, repo, address, username, password,
                  port=80, encoding=_EncodingFormat.JSON,
                  config_url_root="/data", state_url_root="/data"):
-
-        self.rs = super()
-        self.rs.__init__(repo, address, username, password,
-                         port, encoding, config_url_root, state_url_root)
+        if sys.version_info > (3,):
+            self._super = super()
+        else:
+            self._super = super(RestconfSession, self)
+        self._super.__init__(repo, address, username, password,
+                             port, encoding, config_url_root, state_url_root)
 
     def get_root_schema(self):
-        return self.rs.get_root_schema()
+        return self._super.get_root_schema()
 
     def invoke(self, rpc):
-        return self.rs.invoke(rpc)
-
-    def get_capabilities(self):
-        return self.rs.get_capabilities()
+        return self._super.invoke(rpc)
diff --git a/sdk/python/core/ydk/providers/netconf_provider.py b/sdk/python/core/ydk/providers/netconf_provider.py
index bda7c1a29..c8f485c34 100644
--- a/sdk/python/core/ydk/providers/netconf_provider.py
+++ b/sdk/python/core/ydk/providers/netconf_provider.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2018 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,30 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
-
-"""
-netconf_provider.py
 
+"""netconf_provider.py
 NetconfServiceProvider Python wrapper.
 """
 
-from ydk_.providers import NetconfServiceProvider as _NetconfServiceProvider
+from ydk.ext.providers import NetconfServiceProvider as _NetconfServiceProvider
+import sys
 
 
 class NetconfServiceProvider(_NetconfServiceProvider):
-    """
-     Python wrapper for NetconfServiceProvider
+    """ Python wrapper for NetconfServiceProvider
     """
 
-    def __init__(self,
-                 address, username, password=None, port=830, protocol="ssh",
-                 on_demand=True, common_cache=False, timeout=None, repo=None,
-                 private_key_path=None, public_key_path=None):
+    def __init__(self, address, username, password=None, port=830, protocol="ssh",
+                       on_demand=True, common_cache=False, timeout=None, repo=None, private_key_path=None, public_key_path=None):
 
         if timeout is None:
             timeout = -1
@@ -47,29 +38,32 @@ def __init__(self,
         if public_key_path is None:
             public_key_path = ""
 
-        self.nsp = super()
+        if sys.version_info > (3,):
+            self._super = super()
+        else:
+            self._super = super(NetconfServiceProvider, self)
         if repo is None:
             if len(public_key_path) == 0:
-                self.nsp.__init__(address, username, password, port,
-                                  protocol, on_demand, common_cache, timeout)
+                self._super.__init__(address, username, password, port,
+                                     protocol, on_demand, common_cache, timeout)
             else:
-                self.nsp.__init__(address, username,
-                                  private_key_path, public_key_path,
-                                  port, on_demand, common_cache, timeout)
+                self._super.__init__(address, username,
+                                     private_key_path, public_key_path,
+                                     port, on_demand, common_cache, timeout)
         else:
             if len(public_key_path) == 0:
-                self.nsp.__init__(repo, address, username, password,
-                                  port, protocol, on_demand, timeout)
+                self._super.__init__(repo, address, username, password,
+                                     port, protocol, on_demand, timeout)
             else:
-                self.nsp.__init__(repo, address, username,
-                                  private_key_path, public_key_path,
-                                  port, on_demand, timeout)
+                self._super.__init__(repo, address, username,
+                                     private_key_path, public_key_path,
+                                     port, on_demand, timeout)
 
     def get_encoding(self):
-        return self.nsp.get_encoding()
+        return self._super.get_encoding()
 
     def get_session(self):
-        return self.nsp.get_session()
+        return self._super.get_session()
 
     def get_capabilities(self):
-        return self.nsp.get_capabilities()
+        return self._super.get_capabilities()
diff --git a/sdk/python/core/ydk/services/codec_service.py b/sdk/python/core/ydk/services/codec_service.py
index d3f75df83..3688f9cbd 100644
--- a/sdk/python/core/ydk/services/codec_service.py
+++ b/sdk/python/core/ydk/services/codec_service.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 from ydk.entity_utils import get_data_node_from_entity as _get_data_node_from_entity
 from ydk.entity_utils import get_entity_from_data_node as _get_entity_from_data_node
-from ydk.entity_utils import XmlSubtreeCodec, JsonSubtreeCodec
+from ydk.entity_utils import XmlSubtreeCodec
 from ydk.entity_utils import _payload_to_top_entity, _get_bundle_name
 
 from ydk.path import Codec as _Codec
@@ -113,10 +113,10 @@ def _encode(self, provider, entity, pretty, subtree):
         root_schema = provider.get_root_schema(bundle_name)
 
         if subtree:
-            if provider.encoding == EncodingFormat.XML:
-                return XmlSubtreeCodec().encode(entity, root_schema)
-            else:
-                return JsonSubtreeCodec().encode(entity, root_schema, pretty)
+            if provider.encoding != EncodingFormat.XML:
+                raise YServiceError('Subtree option can only be used with XML encoding')
+            xml_codec = XmlSubtreeCodec()
+            return xml_codec.encode(entity, root_schema)
 
         with _handle_error():
             data_node = _get_data_node_from_entity(entity, root_schema)
@@ -172,11 +172,10 @@ def _decode(self, provider, payload, subtree):
         entity = _payload_to_top_entity(payload, provider.encoding)
 
         if subtree:
-            if provider.encoding == EncodingFormat.XML:
-                codec = XmlSubtreeCodec()
-            else:
-                codec = JsonSubtreeCodec()
-            return codec.decode(payload, entity)
+            if provider.encoding != EncodingFormat.XML:
+                raise YServiceError('Subtree option can only be used with XML encoding')
+            xml_codec = XmlSubtreeCodec()
+            return xml_codec.decode(payload, entity)
 
         bundle_name = _get_bundle_name(entity)
         provider.initialize(bundle_name, _get_yang_path(entity))
diff --git a/sdk/python/core/ydk/services/crud_service.py b/sdk/python/core/ydk/services/crud_service.py
index 212d344aa..19570cfbb 100644
--- a/sdk/python/core/ydk/services/crud_service.py
+++ b/sdk/python/core/ydk/services/crud_service.py
@@ -23,7 +23,7 @@
 from ydk.filters import YFilter
 
 
-class CRUDService(object):
+class CRUDService(_CrudService):
     """
     Python wrapper for CrudService
 
diff --git a/sdk/python/core/ydk/services/executor_service.py b/sdk/python/core/ydk/services/executor_service.py
index 68da5ee56..7ee440256 100644
--- a/sdk/python/core/ydk/services/executor_service.py
+++ b/sdk/python/core/ydk/services/executor_service.py
@@ -18,7 +18,7 @@
 from ydk.errors.error_handler import handle_runtime_error as _handle_error
 
 
-class ExecutorService(object):
+class ExecutorService(_ExecutorService):
     """ Python wrapper for ExecutorService
     """
     def __init__(self):
diff --git a/sdk/python/core/ydk/services/netconf_service.py b/sdk/python/core/ydk/services/netconf_service.py
index c95ef95de..b6adf4582 100644
--- a/sdk/python/core/ydk/services/netconf_service.py
+++ b/sdk/python/core/ydk/services/netconf_service.py
@@ -23,7 +23,7 @@
 from ydk.entity_utils import _set_nontop_entity_filter
 
 
-class NetconfService(object):
+class NetconfService(_NetconfService):
     """ Python wrapper for NetconfService
     """
     def __init__(self):
diff --git a/sdk/python/core/ydk/types/py_types.py b/sdk/python/core/ydk/types/py_types.py
index da261b14a..fe66545e5 100644
--- a/sdk/python/core/ydk/types/py_types.py
+++ b/sdk/python/core/ydk/types/py_types.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2022 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,6 +32,11 @@
 
 import importlib
 import logging
+import sys
+
+if sys.version_info > (3,):
+    long = int
+    unicode = str
 
 from ydk_ import is_set
 from ydk.ext.types import Bits
@@ -53,18 +57,24 @@
 
 
 class YLeafList(_YLeafList):
-    """
-     Wrapper class for YLeafList, add __repr__ and get list slice functionalities.
+    """ Wrapper class for YLeafList, add __repr__ and get list slice
+    functionalities.
     """
     def __init__(self, ytype, leaf_name):
-        super().__init__(ytype, leaf_name)
+        if sys.version_info > (3,):
+            super().__init__(ytype, leaf_name)
+        else:
+            super(YLeafList, self).__init__(ytype, leaf_name)
         self.ytype = ytype
         self.leaf_name = leaf_name
 
     def append(self, item):
         if isinstance(item, _YLeaf):
             item = item.get()
-        super().append(item)
+        if sys.version_info > (3,):
+            super().append(item)
+        else:
+            super(YLeafList, self).append(item)
 
     def extend(self, items):
         for item in items:
@@ -74,7 +84,10 @@ def set(self, other):
         if not isinstance(other, YLeafList):
             raise YModelError("Invalid value '{}' assigned to YLeafList '{}'".format(other, self.leaf_name))
         else:
-            super().clear()
+            if sys.version_info > (3,):
+                super().clear()
+            else:
+                super(YLeafList, self).clear()
             for item in other:
                 self.append(item)
 
@@ -86,7 +99,10 @@ def __getitem__(self, arg):
             ret.extend(values)
         else:
             arg = len(self) + arg if arg < 0 else arg
-            ret = super().__getitem__(arg)
+            if sys.version_info > (3,):
+                ret = super().__getitem__(arg)
+            else:
+                ret = super(YLeafList, self).__getitem__(arg)
         return ret
 
     def __str__(self):
@@ -98,7 +114,10 @@ class Entity(_Entity):
     """ Entity wrapper class overrides some of the ydk::Entity methods.
     """
     def __init__(self):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Entity, self).__init__()
         self._is_frozen = False
         self.parent = None
         self.ylist_key = None
@@ -115,12 +134,20 @@ def __init__(self):
     def __eq__(self, other):
         if not isinstance(other, Entity):
             return False
-        return super().__eq__(other)
+        if sys.version_info > (3,):
+            ret = super().__eq__(other)
+        else:
+            ret = super(Entity, self).__eq__(other)
+        return ret
 
     def __ne__(self, other):
         if not isinstance(other, Entity):
             return True
-        return super().__ne__(other)
+        if sys.version_info > (3,):
+            ret = super().__ne__(other)
+        else:
+            ret = super(Entity, self).__ne__(other)
+        return ret
 
     def children(self):
         return self.get_children()
@@ -277,10 +304,14 @@ def get_name_leaf_data(self):
                 leaf_name_data.append(leaf.get_name_leafdata())
             elif isinstance(value, list) and len(value) > 0:
                 leaf_list = _YLeafList(YType.str, leaf.name)
+                # leaf_list = self._leafs[name]
+                # Above results in YModelError:
+                #     Duplicate leaf-list item detected:
+                #     /ydktest-sanity:runner/ytypes/built-in-t/enum-llist[.='local'] :
+                #     No resolvents found for leafref "../config/id"..
+                #     Path: /ydktest-sanity:runner/one-list/identity-list/id-ref
                 for item in value:
                     _validate_value(self._leafs[name], name, item, self._logger)
-                    if isinstance(item, bool):
-                        item = 'true' if item is True else 'false'
                     leaf_list.append(item)
                 leaf_name_data.extend(leaf_list.get_name_leafdata())
         self._logger.debug('Get name leaf data for "%s". Count: %s' % (self.yang_name, len(leaf_name_data)))
@@ -292,19 +323,6 @@ def get_name_leaf_data(self):
                                (leaf[0], leaf_value, leaf[1].yfilter, leaf[1].is_set))
         return leaf_name_data
 
-    def check_leaf_type(self, leaf_name, leaf_type):
-        for name in self._leafs:
-            leaf_tuple = self._leafs[name]
-            leaf = leaf_tuple[0]
-            if leaf.name == leaf_name:
-                break
-        if leaf.type == leaf_type:
-            return True
-        elif leaf.type == YType.union:
-            if str(leaf_type).split('.')[1].capitalize() in leaf_tuple[1]:
-                return True
-        return False
-
     def get_segment_path(self):
         path = self._segment_path()
         if ("[" in path) and hasattr(self, 'ylist_key_names') and len(self.ylist_key_names) > 0:
@@ -312,10 +330,7 @@ def get_segment_path(self):
             for attr_name in self.ylist_key_names:
                 leaf = _get_leaf_object(self._leafs[attr_name])
                 if leaf is not None:
-                    key = self.__dict__[attr_name]
-                    attr_str = '' if isinstance(key, Empty) else format(key)
-                    if isinstance(self.__dict__[attr_name], bool):
-                        attr_str = 'true' if attr_str == 'True' else 'false'
+                    attr_str = format(self.__dict__[attr_name])
                     if "'" in attr_str:
                         path += '[{}="{}"]'.format(leaf.name, attr_str)
                     else:
@@ -399,7 +414,10 @@ def _perform_setattr(self, clazz, leaf_names, name, value):
                     if hasattr(value, "parent") and name != "parent":
                         if not value.is_top_level_class:
                             value.parent = self
-                super().__setattr__(name, value)
+                if sys.version_info > (3,):
+                    super().__setattr__(name, value)
+                else:
+                    super(Entity, self).__setattr__(name, value)
 
     def _assign_yleaf(self, name, value, v):
         if isinstance(self.__dict__[name], Bits):
@@ -714,7 +732,10 @@ class YList(EntityCollection):
         The keys then could be used to get entities from the YList.
     """
     def __init__(self, parent):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(YList, self).__init__()
         self.parent = parent
         self.counter = 1000000
         self._cache_dict = OrderedDict()
@@ -723,7 +744,10 @@ def __setattr__(self, name, value):
         if name == 'yfilter' and isinstance(value, YFilter):
             for e in self:
                 e.yfilter = value
-        super().__setattr__(name, value)
+        if sys.version_info > (3,):
+            super().__setattr__(name, value)
+        else:
+            super(YList, self).__setattr__(name, value)
 
     def _key(self, entity):
         key_list = []
@@ -734,16 +758,14 @@ def _key(self, entity):
                     if attr is None:
                         key_list = []
                         break
-                    if isinstance(attr, Empty) or not str(attr):
-                        continue  # Skip empty key
-                    if not isinstance(attr, str):
-                        attr = format(attr)
                     key_list.append(attr)
         if len(key_list) == 0:
             self.counter += 1
             key = format(self.counter)
         elif len(key_list) == 1:
             key = key_list[0]
+            if not isinstance(key, str):
+                key = format(key)
         else:
             key = tuple(key_list)
         return key
@@ -751,9 +773,7 @@ def _key(self, entity):
     def _flush_cache(self):
         for _ in range(len(self._cache_dict)):
             _, entity = self._cache_dict.popitem(False)
-            key = self._key(entity)
-            self._entity_map[key] = entity
-            entity.ylist_key = key
+            self._entity_map[self._key(entity)] = entity
 
     def append(self, entities):
         entities.parent = self.parent
@@ -786,7 +806,11 @@ def entities(self):
 
     def pop(self, item=None):
         self._flush_cache()
-        return super().pop(item)
+        if sys.version_info > (3,):
+            ret = super().pop(item)
+        else:
+            ret = super(YList, self).pop(item)
+        return ret
 
     def __getitem__(self, item):
         entity = None
@@ -840,8 +864,6 @@ def _get_decoded_value_object(leaf_tuple, entity, value):
             value_object = _decode_identity_value_object(entity, value)
         elif _is_enum(typ):
             value_object = _decode_enum_value_object(typ, value)
-        elif _is_bits(typ, value):
-            value_object = _decode_bits_value_object(typ, value)
         else:
             value_object = _decode_other_type_value_object(typ, value)
         if value_object is not None:
@@ -862,8 +884,6 @@ def _validate_value(leaf_tuple, name, value, logger):
         elif _is_enum(typ):
             if _validate_enum_value_object(typ, value):
                 return
-        elif _is_bits(typ, value):
-            return
         else:
             if _validate_other_type_value_object(typ, value):
                 return
@@ -895,12 +915,6 @@ def _is_enum(typ):
     return isinstance(typ, tuple) and len(typ) == 3
 
 
-def _is_bits(typ, value):
-    return typ == 'Bits'\
-           and ((isinstance(value, Bits) and len(value.get_bitmap()) > 0)
-                or isinstance(value, str))
-
-
 def _validate_identity_value_object(typ, value):
     if not _is_identity(typ):
         return False
@@ -953,23 +967,12 @@ def _decode_enum_value_object(typ, value):
     return None
 
 
-def _decode_bits_value_object(typ, value):
-    if not _is_bits(typ, value):
-        return None
-    if isinstance(value, Bits):
-        v = value
-    else:
-        v = Bits()
-        v[value] = True
-    return v
-
-
 def _validate_other_type_value_object(typ, value):
     if typ == 'Empty':
         return isinstance(value, Empty)
-    if typ == 'str' and (isinstance(value, bytes) or isinstance(value, str)):
+    if typ == 'str' and (isinstance(value, bytes) or isinstance(value, unicode)):
         return True
-    if typ == 'int' and isinstance(value, int):
+    if typ == 'int' and (isinstance(value, int) or isinstance(value, long)):
         return True
     typ = eval(typ)
     return isinstance(value, typ)
diff --git a/sdk/python/gnmi/README.md b/sdk/python/gnmi/README.md
index 7ad3a36ec..fc6f709fa 100644
--- a/sdk/python/gnmi/README.md
+++ b/sdk/python/gnmi/README.md
@@ -50,5 +50,6 @@ There is an open issue with gRPC on Centos/Fedora, which requires an extra step
 for details. As a workaround, the YDK based application runtime environment must include setting of `LD_LIBRARY_PATH` variable:
 
 ```
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64
+    PROTO="/Your-Protobuf-and-Grpc-installation-directory"
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PROTO/grpc/libs/opt:$PROTO/protobuf-3.5.0/src/.libs:/usr/local/lib64
 ```
diff --git a/sdk/python/gnmi/python_gnmi.cpp b/sdk/python/gnmi/python_gnmi.cpp
index 7569e3745..bc4f9bcf9 100644
--- a/sdk/python/gnmi/python_gnmi.cpp
+++ b/sdk/python/gnmi/python_gnmi.cpp
@@ -1,5 +1,5 @@
 /*  ----------------------------------------------------------------
- Copyright 2018-2019 Cisco Systems
+ Copyright 2016 Cisco Systems
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -12,13 +12,7 @@
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
- -------------------------------------------------------------------
- This file has been modified by Yan Gorelik, YDK Solutions.
- All modifications in original under CiscoDevNet domain
- introduced since October 2019 are copyrighted.
- All rights reserved under Apache License, Version 2.0.
  ------------------------------------------------------------------*/
-
 #include <pybind11/operators.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/functional.h>
@@ -57,7 +51,14 @@ static bool enabled_logging = false;
 
 static void add_null_handler(object logger)
 {
-    if (!added_nullhandler)
+    if (added_nullhandler) { return; }
+    object version = module::import("sys").attr("version_info");
+    object ge = version.attr("__ge__");
+    // NullHandler is introduced after Python 2.7
+    // Add Nullhandler to avoid `handler not found for logger` error for Python > 2.7
+    object version_27 = pybind11::make_tuple(2,7);
+    bool result = ge(version_27).cast<bool>();
+    if (result)
     {
         object null_handler = module::import("logging").attr("NullHandler");
         null_handler = null_handler();
@@ -107,8 +108,7 @@ PYBIND11_MODULE(ydk_gnmi_, ydk_gnmi)
     class_<ydk::path::Session>(path, "Session", module_local())
         .def("get_root_schema", &ydk::path::Session::get_root_schema, return_value_policy::reference)
         .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::Rpc& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference)
-        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::DataNode& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference)
-        .def("get_capabilities", (std::vector<std::string> (ydk::path::Session::*)() const) &ydk::path::Session::get_capabilities, return_value_policy::reference);
+        .def("invoke", (std::shared_ptr<ydk::path::DataNode> (ydk::path::Session::*)(ydk::path::DataNode& rpc) const) &ydk::path::Session::invoke, return_value_policy::reference);
 
     class_<ydk::path::gNMISession, ydk::path::Session>(path, "gNMISession")
         .def(init<ydk::path::Repository&, const std::string&, int, const std::string&, const std::string&, const std::string&, const std::string&>(),
@@ -129,8 +129,7 @@ PYBIND11_MODULE(ydk_gnmi_, ydk_gnmi)
              &ydk::path::gNMISession::invoke_subscribe,
                                   arg("rpc"),
                                   arg("output_callback_function")=nullptr,
-                                  arg("poll_callback_function")=nullptr)
-        .def("get_capabilities", &ydk::path::gNMISession::get_capabilities, return_value_policy::reference);
+                                  arg("poll_callback_function")=nullptr);
 
     class_<ydk::ServiceProvider>(providers, "ServiceProvider", module_local())
         .def("get_encoding", &ydk::ServiceProvider::get_encoding, return_value_policy::reference)
diff --git a/sdk/python/gnmi/samples/hello_ydk_gnmi.py b/sdk/python/gnmi/samples/hello_ydk_gnmi.py
index f78ae7b20..482d2b4d8 100755
--- a/sdk/python/gnmi/samples/hello_ydk_gnmi.py
+++ b/sdk/python/gnmi/samples/hello_ydk_gnmi.py
@@ -31,7 +31,11 @@
 import logging
 from datetime import timedelta
 from argparse import ArgumentParser
-from urllib.parse import urlparse
+import sys
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 from test_utils import enable_logging
 
diff --git a/sdk/python/gnmi/samples/interface_gnmi_subscribe.py b/sdk/python/gnmi/samples/interface_gnmi_subscribe.py
index f7545e61b..36fe2ca64 100755
--- a/sdk/python/gnmi/samples/interface_gnmi_subscribe.py
+++ b/sdk/python/gnmi/samples/interface_gnmi_subscribe.py
@@ -16,7 +16,12 @@
 #
 
 from argparse import ArgumentParser
-from urllib.parse import urlparse
+import sys
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+
 from multiprocessing import Pool
 import logging
 
diff --git a/sdk/python/gnmi/samples/test_utils.py b/sdk/python/gnmi/samples/test_utils.py
index 6ef4354c5..4354008f0 100644
--- a/sdk/python/gnmi/samples/test_utils.py
+++ b/sdk/python/gnmi/samples/test_utils.py
@@ -14,12 +14,11 @@
 # limitations under the License.
 # ------------------------------------------------------------------
 
-"""
- test_utils.py
+"""test_utils.py
 
- Utility function for test cases.
+Utility function for test cases.
 """
-
+import sys
 import re
 import logging
 
diff --git a/sdk/python/gnmi/samples/xr-ifmgr-int-oper-subscribe.py b/sdk/python/gnmi/samples/xr-ifmgr-int-oper-subscribe.py
index bf0f49389..1f8658f73 100755
--- a/sdk/python/gnmi/samples/xr-ifmgr-int-oper-subscribe.py
+++ b/sdk/python/gnmi/samples/xr-ifmgr-int-oper-subscribe.py
@@ -35,7 +35,10 @@
 import sys
 import signal
 
-from urllib.parse import urlparse
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 from test_utils import enable_logging, print_entity
 
diff --git a/sdk/python/gnmi/setup.py b/sdk/python/gnmi/setup.py
index 28391741f..3b3a3d288 100644
--- a/sdk/python/gnmi/setup.py
+++ b/sdk/python/gnmi/setup.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,14 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
-Setup for YDK gNMI Service package for Python
+Setup for YDK gNMI Service package
 """
 
 from __future__ import print_function
@@ -29,15 +24,15 @@
 import sysconfig
 
 from setuptools.command.build_ext import build_ext
-from setuptools import setup, Extension
+from setuptools import setup, Extension, find_packages
 
 # Define and modify version number and package name here
 
 NAME = 'ydk-service-gnmi'
 
-VERSION = '0.4.0.5'
+VERSION = '0.4.0'
 
-INSTALL_REQUIREMENTS = ['ydk>=0.8.6', 'pybind11==2.6.2']
+INSTALL_REQUIREMENTS = ['ydk>=0.8.5', 'pybind11>=2.1.1']
 
 LONG_DESCRIPTION = '''
                     This package provides extension for YDK core - gNMI services.
@@ -45,10 +40,9 @@
 
 YDK_PACKAGES = ['ydk.gnmi', 'ydk.gnmi.services', 'ydk.gnmi.providers', 'ydk.gnmi.path']
 
-
 class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
-        super().__init__(name, sources=[])
+        Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
 
 
@@ -56,7 +50,7 @@ class YdkBuildExtension(build_ext):
     def run(self):
         try:
             cmake3_installed = (
-                0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
+            0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
             if not cmake3_installed:
                 subprocess.check_output(['cmake', '--version'])
         except OSError:
@@ -71,7 +65,7 @@ def build_extension(self, ext):
             import pybind11
         except ImportError:
             import pip
-            pip.main(['install', 'pybind11==2.6.2'])
+            pip.main(['install', 'pybind11>=2.1.1'])
             import pybind11
 
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
@@ -79,8 +73,9 @@ def build_extension(self, ext):
         if 'YDK_COVERAGE' in os.environ:
             coverage_compiler_flag = '-DCOVERAGE=True'
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={0}'.format(extdir),
-                      '-DPYBIND11_INCLUDE={0}'.format(
-                                      pybind11.get_include()),
+                      '-DPYBIND11_INCLUDE={0};{1}'.format(
+                                      pybind11.get_include(),
+                                      pybind11.get_include(user=True)),
                       '-DPYTHON_VERSION={0}'.format(
                                       get_python_version()),
                       '-DCMAKE_BUILD_TYPE=Release',
@@ -90,7 +85,7 @@ def build_extension(self, ext):
             os.makedirs(self.build_temp)
 
         cmake3_installed = (0 == subprocess.call(['which', 'cmake3'], stdout=subprocess.PIPE, stderr=subprocess.PIPE))
-        if cmake3_installed:
+        if(cmake3_installed):
             cmake_executable = 'cmake3'
         else:
             cmake_executable = 'cmake'
@@ -125,10 +120,12 @@ def get_python_version():
         'Topic :: Software Development :: Build Tools',
         'Topic :: Software Development :: Libraries',
         'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: C++'
     ],
     keywords='yang, C++11, python bindings ',
@@ -136,7 +133,7 @@ def get_python_version():
     install_requires=INSTALL_REQUIREMENTS,
     ext_modules=[CMakeExtension('ydk_gnmi_')],
     cmdclass={
-             'build_ext': YdkBuildExtension
+             'build_ext' :YdkBuildExtension
              },
     zip_safe=False,
 )
diff --git a/sdk/python/gnmi/tests/test_utils.py b/sdk/python/gnmi/tests/test_utils.py
index 0dc15af2a..45b26498c 100644
--- a/sdk/python/gnmi/tests/test_utils.py
+++ b/sdk/python/gnmi/tests/test_utils.py
@@ -14,12 +14,12 @@
 # limitations under the License.
 # ------------------------------------------------------------------
 
-"""
- test_utils.py
+"""test_utils.py
 
- Utility functions for test cases.
+Utility functions for test cases.
 """
 
+import sys
 import re
 import unittest
 import logging
@@ -28,7 +28,10 @@
 from ydk.entity_utils import get_data_node_from_entity
 from ydk.errors import YCoreError
 
-from urllib.parse import urlparse
+if sys.version_info > (3,):
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 
 class EmptyTest(unittest.TestCase):
@@ -100,7 +103,10 @@ class ParametrizedTestCase(unittest.TestCase):
         inherit from this class.
     """
     def __init__(self, method_name='runTest'):
-        super().__init__(method_name)
+        if sys.version_info > (3,):
+            super().__init__(method_name)
+        else:
+            super(ParametrizedTestCase, self).__init__(method_name)
 
     @staticmethod
     def parametrize(testcase_klass, device):
diff --git a/sdk/python/gnmi/ydk/gnmi/path/gnmi_session.py b/sdk/python/gnmi/ydk/gnmi/path/gnmi_session.py
index 79cd75a71..41f2202d8 100644
--- a/sdk/python/gnmi/ydk/gnmi/path/gnmi_session.py
+++ b/sdk/python/gnmi/ydk/gnmi/path/gnmi_session.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2018 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,23 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-gnmi_session.py
+"""gnmi_session.py
 gNMISession Python wrapper.
 """
 
 from ydk_gnmi_.path import gNMISession as _gNMISession
+import sys
 
 
-class gNMISession(object):
-    """
-     Python wrapper for gNMISession
+class gNMISession(_gNMISession):
+    """ Python wrapper for gNMISession
     """
 
     def __init__(self,
@@ -43,17 +37,18 @@ def __init__(self,
         if private_key is None:
             private_key = ""
 
-        self.gs = _gNMISession(repo, address, port, username, password,
-                               server_certificate, private_key)
+        if sys.version_info > (3,):
+            self._super = super()
+        else:
+            self._super = super(gNMISession, self)
+        self._super.__init__(repo, address, port, username, password,
+                             server_certificate, private_key)
 
     def get_root_schema(self):
-        return self.gs.get_root_schema()
+        return self._super.get_root_schema()
 
     def invoke(self, rpc):
-        return self.gs.invoke(rpc)
+        return self._super.invoke(rpc)
 
     def subscribe(self, rpc, out_func=None, poll_func=None):
-        return self.gs.subscribe(rpc, out_func, poll_func)
-
-    def get_capabilities(self):
-        return self.gs.get_capabilities()
+        return self._super.subscribe(rpc, out_func, poll_func)
diff --git a/sdk/python/gnmi/ydk/gnmi/providers/gnmi_provider.py b/sdk/python/gnmi/ydk/gnmi/providers/gnmi_provider.py
index 3d3ad1e92..11f887888 100644
--- a/sdk/python/gnmi/ydk/gnmi/providers/gnmi_provider.py
+++ b/sdk/python/gnmi/ydk/gnmi/providers/gnmi_provider.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2018 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,23 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
-gnmi_provider.py
+"""gnmi_provider.py
 gNMIServiceProvider Python wrapper.
 """
 
 from ydk_gnmi_.providers import gNMIServiceProvider as _gNMIServiceProvider
+import sys
 
 
 class gNMIServiceProvider(_gNMIServiceProvider):
-    """
-     Python wrapper for gNMIServiceProvider
+    """ Python wrapper for gNMIServiceProvider
     """
 
     def __init__(self,
@@ -43,16 +37,19 @@ def __init__(self,
         if private_key is None:
             private_key = ""
 
-        self.gsp = super()
-        self.gsp.__init__(repo, address, port,
-                          username, password,
-                          server_certificate, private_key)
+        if sys.version_info > (3,):
+            self._super = super()
+        else:
+            self._super = super(gNMIServiceProvider, self)
+        self._super.__init__(repo, address, port,
+                             username, password,
+                             server_certificate, private_key)
 
     def get_encoding(self):
-        return self.gsp.get_encoding()
+        return self._super.get_encoding()
 
     def get_session(self):
-        return self.gsp.get_session()
+        return self._super.get_session()
 
     def get_capabilities(self):
-        return self.gsp.get_capabilities()
+        return self._super.get_capabilities()
diff --git a/sdk/python/gnmi/ydk/gnmi/services/gnmi_service.py b/sdk/python/gnmi/ydk/gnmi/services/gnmi_service.py
index a10740ec9..6d6ba99b4 100644
--- a/sdk/python/gnmi/ydk/gnmi/services/gnmi_service.py
+++ b/sdk/python/gnmi/ydk/gnmi/services/gnmi_service.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,12 +22,11 @@
 from ydk.entity_utils import _set_nontop_entity_filter
 
 from ydk_gnmi_.services import gNMIService as _gNMIService
-# from ydk_gnmi_.services import gNMISubscription
+from ydk_gnmi_.services import gNMISubscription
 
 
-class gNMIService(object):
-    """
-     Python wrapper for gNMIService
+class gNMIService(_gNMIService):
+    """ Python wrapper for gNMIService
     """
     def __init__(self):
         self._gs = _gNMIService()
@@ -82,3 +81,4 @@ def subscribe(self, provider, subscription, qos=0, mode='ONCE', encoding='PROTO'
 #             raise _YServiceError("Subscription is not properly defined")
 
         self._gs.subscribe(provider, subscription, qos, mode, encoding, gnmi_subscribe_callback)
+        
diff --git a/sdk/version.json b/sdk/version.json
index bc7173a37..e16827bfb 100644
--- a/sdk/version.json
+++ b/sdk/version.json
@@ -1,10 +1,9 @@
 {
-    "core": "0.8.6.4",
-    "version": "0.8.6.4",
-    "gnmi-service": "0.4.0.5",
-    "ietf": "0.1.6",
-    "openconfig": "0.1.9",
-    "cisco_ios_xr": "7.0.2",
+    "core": "0.8.5",
+    "version": "0.8.5",
+    "ietf": "0.1.5-post2",
+    "openconfig": "0.1.8",
+    "cisco_ios_xr": "6.6.2",
     "cisco_ios_xe": "16.9.3",
     "cisco_nx_os": "9.3.1"
 }
diff --git a/test/clean_builds.sh b/test/clean_builds.sh
deleted file mode 100755
index ed41fc49c..000000000
--- a/test/clean_builds.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-#
-# Bash script to delete all YDK built and installed components
-#
-# ------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "\n${MSG_COLOR}*** $(date): clean_builds.sh: $*${NOCOLOR}"
-}
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) > /dev/null && pwd)
-
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-  YDKGEN_HOME=$(cd "$script_dir/../" > /dev/null && pwd)
-  print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-$script_dir/clean_test_env.sh
-
-print_msg "Deleting all './build/*' content"
-rm -rf $YDKGEN_HOME/sdk/cpp/tests/build/*
-rm -rf $YDKGEN_HOME/sdk/cpp/core/build/*
-rm -rf $YDKGEN_HOME/sdk/cpp/gnmi/tests/build/*
-rm -rf $YDKGEN_HOME/sdk/cpp/gnmi/samples/build/*
-rm -rf $YDKGEN_HOME/sdk/cpp/gnmi/build/*
-rm -rf $YDKGEN_HOME/gen-api/cpp/ydk/build/*
-rm -rf $YDKGEN_HOME/gen-api/cpp/ydktest-bundle/build/*
-rm -rf $YDKGEN_HOME/scripts/community/cpp/build/*
-rm -rf $YDKGEN_HOME/scripts/community/Debug/cpp/build/*
-rm -rf $YDKGEN_HOME/test/gnmi_server/build/*
-
-rm -f coverage.txt coverage.info
-
-rm -rf $YDKGEN_HOME/gen-api/* $YDKGEN_HOME/gen-api/.cache
-
-rm -rf $YDKGEN_HOME/sdk/python/core/dist
-
-print_msg "Deleting go packages..."
-if [ -z $GOPATH ]; then
-    GOPATH="${HOME}/go"
-fi
-rm -rf $GOPATH/src/github.com/CiscoDevNet/ydk-go
-
-print_msg "Deleting python packages..."
-if [[ -z ${PYTHON_VENV} ]]; then
-    export PYTHON_VENV=${HOME}/venv
-    print_msg "Python virtual environment location is set to ${PYTHON_VENV}"
-fi
-source $PYTHON_VENV/bin/activate
-pip uninstall -y ydk
-pip uninstall -y ydk-models-ydktest
-pip uninstall -y ydk-models-augmentation
-pip uninstall -y ydk-models-deviation
-pip uninstall -y ydk-service-gnmi
-
-print_msg "Deleting C++ packages..."
-sudo rm -rf /usr/local/lib/libydk* /usr/local/lib/libyang*
-sudo rm -rf /usr/local/include/ydk /usr/local/include/libyang /usr/local/include/libnetconf
diff --git a/test/clean_test_env.sh b/test/clean_test_env.sh
deleted file mode 100755
index 0915c8413..000000000
--- a/test/clean_test_env.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-#
-# Bash script to stop all dumb servers and clean test environment
-#
-# ------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "\n${MSG_COLOR}*** $(date): clean_test_env.sh: $*${NOCOLOR}"
-}
-
-function run_cmd {
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command '$*' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function init_confd_rc {
-    confd_rc=$(find $HOME/confd -name confdrc)
-    if [[ -z $confd_rc ]]; then
-        MSG_COLOR=$RED
-        print_msg "Cannot find confdrc resource file in user file system. Exiting"
-        exit 1
-    fi
-    print_msg "Found confd resource file: $confd_rc"
-    run_cmd source $confd_rc
-}
-
-function stop_confd {
-  init_confd_rc
-  stop_confd_server $YDKGEN_HOME/sdk/cpp/core/tests/confd/ydktest
-  stop_confd_server $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
-  stop_confd_server $YDKGEN_HOME/sdk/cpp/core/tests/confd/augmentation
-}
-
-function stop_confd_server {
-    cd $1
-    print_msg "Stopping confd from $(pwd)"
-    run_cmd make stop > /dev/null
-    sleep 3
-    run_cmd make clean
-    cd - > /dev/null
-}
-
-function stop_tcp_server {
-    if [[ ! -z $TCP_SERVER_PID ]]; then
-        print_msg "Stopping TCP server PID $TCP_SERVER_PID"
-        kill $TCP_SERVER_PID
-        unset TCP_SERVER_PID
-    else
-        print_msg "Stopping all TCP servers"
-        pkill -f tcp_proxy_server
-    fi
-}
-
-function stop_rest_server {
-    if [[ ! -z $REST_SERVER_PID ]]; then
-        print_msg "Stopping REST server PID $REST_SERVER_PID"
-        kill $REST_SERVER_PID
-        unset REST_SERVER_PID
-    else
-        print_msg "Stopping all REST servers"
-        pkill -f moco-runner
-    fi
-}
-
-function stop_gnmi_server {
-        print_msg "Stopping gNMI server"
-        pkill -f gnmi_server
-}
-
-########################## EXECUTION STARTS HERE #############################
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-os_type=$(uname)
-print_msg "Running OS type: $os_type"
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) > /dev/null && pwd)
-
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-  YDKGEN_HOME=$(cd "$script_dir/../" > /dev/null && pwd)
-  print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-curr_dir="$(pwd)"
-cd $YDKGEN_HOME
-
-stop_gnmi_server
-stop_tcp_server
-stop_rest_server
-stop_confd
-
-if [ -d ${HOME}/.ydk ]; then
-    print_msg "Deleting YDK cache in ${HOME}/.ydk"
-    rm -rf ${HOME}/.ydk/127.0.0.1/*
-    rm -rf ${HOME}/.ydk/localhost/*
-    rm -rf ${HOME}/.ydk/common_cache
-fi
-
-cd $curr_dir
diff --git a/test/dependencies_centos.sh b/test/dependencies_centos.sh
index e2b50878f..cfbdb8b70 100755
--- a/test/dependencies_centos.sh
+++ b/test/dependencies_centos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,23 +21,21 @@
 # ------------------------------------------------------------------
 #
 # Script for running ydk CI on docker via travis-ci.org
-# and installing YDK from install_ydk.sh script
 #
-# dependencies_centos (Centos/RHEL 7 and 8)
 # ------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** dependencies_centos.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_centos.sh | $@ ${NOCOLOR}"
 }
 
 function run_cmd {
-    local cmd=$*
+    local cmd=$@
     print_msg "Running: $cmd"
-    $*
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
@@ -54,25 +52,27 @@ function check_install_gcc {
     print_msg "The gcc/g++ not installed"
     gcc_version="4.0.0"
   fi
-  major=$(echo $gcc_version | cut -d '.' -f 1)
-  if [[ $major -le 4 && $gcc_version < "4.8.1" ]]
+  if [[ $gcc_version < "4.8.1" ]]
   then
     print_msg "Upgrading gcc/g++ to version 7"
-    $sudo_cmd yum install centos-release-scl -y > /dev/null
-    $sudo_cmd yum install devtoolset-7-gcc* -y > /dev/null
+    sudo yum install centos-release-scl -y > /dev/null
+    sudo yum install devtoolset-7-gcc* -y > /dev/null
     local status2=$?
     if [[ $status2 != 0 ]]; then
       MSG_COLOR=$RED
       print_msg "Failed to install gcc; exiting"
       exit 1
     else
-      $sudo_cmd ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/cc
-      $sudo_cmd ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/c++
+      sudo ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/cc
+      sudo ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/c++
 
-      $sudo_cmd ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/gcc
-      $sudo_cmd ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++
+      sudo ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/gcc
+      sudo ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++
 
-      $sudo_cmd ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcov /usr/bin/gcov
+#      sudo rm -rf /usr/lib64/libstdc++.so.6
+#      sudo ln -sf /opt/rh/devtoolset-7/root/usr/lib/gcc/x86_64-redhat-linux/7/libstdc++.so /usr/lib64/libstdc++.so.6
+
+      sudo ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcov /usr/bin/gcov
       gcc_version=$(echo $(gcc --version) | awk '{ print $3 }')
       print_msg "Installed gcc/g++ version is $gcc_version"
     fi
@@ -81,29 +81,16 @@ function check_install_gcc {
 
 function install_dependencies {
     print_msg "Installing dependencies"
-    centos_version=$(echo `lsb_release -r` | awk '{ print $2 }' | cut -d '.' -f 1)
-    print_msg "Running Centos/RHEL version $centos_version"
-    if [[ $centos_version == 8 ]]; then
-        run_cmd $sudo_cmd yum update --nobest -y > /dev/null
-    else
-        run_cmd $sudo_cmd yum update -y > /dev/null
-    fi
-    run_cmd $sudo_cmd yum install epel-release -y > /dev/null
-#    run_cmd $sudo_cmd yum install https://centos7.iuscommunity.org/ius-release.rpm -y > /dev/null
-    run_cmd $sudo_cmd yum install which libxml2-devel libxslt-devel libssh-devel libtool gcc-c++ -y > /dev/null
-    run_cmd $sudo_cmd yum install pcre-devel -y > /dev/null
-#    run_cmd $sudo_cmd yum install pcre-static.x86_64 glibc-static libstdc++-static -y > /dev/null
-    run_cmd $sudo_cmd yum install cmake3 wget curl-devel unzip make java mlocate flex bison -y > /dev/null
-    run_cmd $sudo_cmd yum install python3-devel -y > /dev/null
-    $sudo_cmd yum install valgrind -y > /dev/null
-    $sudo_cmd yum install rpm-build redhat-lsb redhat-lsb-core -y > /dev/null
-#    sudo yum install python3-venv -y
-    if [[ $centos_version == 8 ]]; then
-      $sudo_cmd yum install dnf-plugins-core -y
-      $sudo_cmd yum config-manager --set-enabled powertools
-    fi
-    $sudo_cmd yum install doxygen -y
-    $sudo_cmd yum install lcov -y
+    yum install sudo -y
+    run_cmd sudo yum update -y > /dev/null
+    run_cmd sudo yum install epel-release -y > /dev/null
+#    run_cmd sudo yum install https://centos7.iuscommunity.org/ius-release.rpm -y > /dev/null
+    run_cmd sudo yum install git which libxml2-devel libxslt-devel libssh-devel libtool gcc-c++ pcre-devel -y > /dev/null
+    run_cmd sudo yum install cmake3 wget curl-devel unzip make java doxygen mlocate -y > /dev/null
+#     sudo yum install python-devel python-pip -y
+    run_cmd sudo yum install python3-devel python3-venv -y
+    run_cmd sudo yum install rpm-build redhat-lsb lcov -y > /dev/null
+    run_cmd sudo yum install valgrind -y
 }
 
 function check_install_go {
@@ -120,50 +107,24 @@ function check_install_go {
     print_msg "The Go is not installed"
     minor=0
   fi
-  if [ $minor -lt 9 ]; then
-    print_msg "Installing Golang version 1.13.1"
-    $curr_dir/3d_party/go/goinstall.sh --version 1.13.1 > /dev/null
-    $sudo_cmd ln -sf $HOME/.go /usr/local/go
-    $sudo_cmd ln -sf /usr/local/go/bin/go /usr/local/bin/go
-  fi
-}
-
-function check_install_libssh {
-  locate libssh_threads.so
-  local status=$?
-  if [ $status -ne 0 ]; then
-    print_msg "Installing libssh-0.7.6"
-    run_cmd wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
-    tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
-    mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
-    run_cmd cmake3 ..
-    run_cmd $sudo_cmd make install
-    cd -
-  else
-    cd /usr/lib64
-    if [[ ! -L libssh_threads.so && -L libssh_threads.so.4 ]]; then
-      print_msg "Adding symbolic link /usr/lib64/libssh_threads.so"
-      $sudo_cmd ln -s libssh_threads.so.4 libssh_threads.so
-    fi
+  if (( $minor < 9 )); then
+    print_msg "Installing Golang version 1.9.2"
+    run_cmd sudo wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz &> /dev/null
+    sudo tar -zxf  go1.9.2.linux-amd64.tar.gz -C /usr/local/
+    rm -f go1.9.2.linux-amd64.tar.gz
+    cd /usr/local/bin
+    sudo ln -sf /usr/local/go/bin/go
     cd -
   fi
 }
 
 function install_confd {
   if [[ ! -s $HOME/confd/bin/confd ]]; then
-    if [[ $centos_version -gt 7 ]]; then
-      print_msg "Installing confd basic 7.3"
-      unzip $curr_dir/3d_party/linux/confd-basic-7.3.linux.x86_64.zip
-      cd confd-basic-7.3.linux.x86_64
-      run_cmd ./confd-basic-7.3.linux.x86_64.installer.bin $HOME/confd
-      cd -
-    else
-      print_msg "Installing confd basic 6.2"
-      run_cmd wget https://github.com/CiscoDevNet/ydk-gen/files/562538/confd-basic-6.2.linux.x86_64.zip &> /dev/null
-      unzip confd-basic-6.2.linux.x86_64.zip
-      run_cmd ./confd-basic-6.2.linux.x86_64.installer.bin $HOME/confd
-    fi
-    rm -rf confd-basic* ConfD*
+    print_msg "Installing confd"
+    run_cmd wget https://github.com/CiscoDevNet/ydk-gen/files/562538/confd-basic-6.2.linux.x86_64.zip &> /dev/null
+    unzip confd-basic-6.2.linux.x86_64.zip
+    run_cmd ./confd-basic-6.2.linux.x86_64.installer.bin $HOME/confd
+    rm -f confd-basic-6.2.* ConfD*
   fi
 }
 
@@ -188,23 +149,11 @@ NOCOLOR="\033[0m"
 YELLOW='\033[1;33m'
 MSG_COLOR=$YELLOW
 
-sudo_cmd=
-if [ $(id -u -n) != "root" ]; then
-  sudo_cmd="sudo"
-fi
-
-curr_dir=$(pwd)
-
 install_dependencies
 check_install_gcc
 check_install_go
 
-$sudo_cmd updatedb
-check_install_libssh
-
-# These components needed only for YDK unit testing
-# Confd Netconf server and dependent OpenSSL library
-#
 install_confd
 install_openssl
 
+updatedb
diff --git a/test/dependencies_linux_gnmi.sh b/test/dependencies_linux_gnmi.sh
index 8a13e8d38..cdf013bc5 100755
--- a/test/dependencies_linux_gnmi.sh
+++ b/test/dependencies_linux_gnmi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2018 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,58 +23,46 @@
 # dependencies_linux_gnmi.sh
 # Script to install protobuf, protoc and grpc on Ubuntu and CentOS
 # for running YDK gNMI tests on docker
-# and installing YDK from install_ydk.sh script
+#
 # ------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** dependencies_linux_gnmi.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_linux_gnmi.sh | $@ ${NOCOLOR}"
 }
 
 function install_protobuf {
-  if [[ ! -d $HOME/protobuf-3.5.0 ]]; then
-    cd $HOME
+  if [[ ! -d protobuf-3.5.0 ]]; then
     print_msg "Downloading protobuf and protoc"
     wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip > /dev/null
     unzip protobuf-cpp-3.5.0.zip > /dev/null
     rm -f protobuf-cpp-3.5.0.zip
-    cd -
   fi
   if [[ ! -x /usr/local/lib/libprotoc.so.15.0.0 ]]; then
-    cd $HOME/protobuf-3.5.0
+    cd protobuf-3.5.0
     print_msg "Configuring protobuf and protoc"
     ./configure > /dev/null
     print_msg "Compiling protobuf and protoc"
     make > /dev/null
     print_msg "Installing protobuf and protoc"
-    $sudo_cmd make install
-    $sudo_cmd ldconfig
+    sudo make install
+    sudo ldconfig
     cd -
   fi
 }
 
 function install_grpc {
-  if [[ ! -d $HOME/grpc ]]; then
-    cd $HOME
-    print_msg "Downloading grpc"
+  if [[ ! -d grpc ]]; then
+    print_msg "Installing grpc"
     git clone -b v1.9.1 https://github.com/grpc/grpc
     cd grpc
     git submodule update --init
-    # Correcting source code, which fails in focal with gcc-7.5.0
-    cp $curr_dir/3d_party/grpc/log_linux.cc src/core/lib/gpr/
-    cp $curr_dir/3d_party/grpc/Makefile .
-    cd $curr_dir
+    cd -
   fi
   if [[ ! -x /usr/local/lib/libgrpc.a ]]; then
-    print_msg "Compiling grpc"
-    cd $HOME/grpc
+    cd grpc
     make > /dev/null
-    local status=$?
-    if [ $status -ne 0 ]; then
-       print_msg "Failed to compile grpc code; exiting"
-       exit $status
-    fi
-    $sudo_cmd make install
-    $sudo_cmd ldconfig
+    sudo make install
+    sudo ldconfig
     cd -
   fi
 }
@@ -86,15 +74,6 @@ NOCOLOR="\033[0m"
 YELLOW='\033[1;33m'
 MSG_COLOR=$YELLOW
 
-sudo_cmd=
-if [ $(id -u -n) != "root" ]; then
-  sudo_cmd="sudo"
-fi
-
-curr_dir=$(pwd)
-os_info=$(cat /etc/*-release)
-codename=$(lsb_release -c | awk '{ print $2 }')
-
 if [[ -z ${C_INCLUDE_PATH} ]]; then
     export C_INCLUDE_PATH=/usr/local/include
 fi
@@ -102,8 +81,6 @@ if [[ -z ${CPLUS_INCLUDE_PATH} ]]; then
     export CPLUS_INCLUDE_PATH=/usr/local/include
 fi
 
-export CFLAGS="${CFLAGS} -Wno-error"
-export CXXFLAGS="${CXXFLAGS} -Wno-error"
 
 install_protobuf
 install_grpc
diff --git a/test/dependencies_osx.sh b/test/dependencies_osx.sh
index 47f7b420d..ea9c5aafb 100755
--- a/test/dependencies_osx.sh
+++ b/test/dependencies_osx.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,21 +22,21 @@
 #
 # dependencies_osx.sh
 # Script for running ydk CI on docker via travis-ci.org
-# and installing YDK from install_ydk.sh script
+#
 # ------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** dependencies_osx.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_osx.sh | $@ ${NOCOLOR}"
 }
 
 function run_cmd {
     local cmd=$@
     print_msg "Running: $cmd"
-    $*
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
@@ -44,13 +44,15 @@ function run_cmd {
 
 function install_libssh {
     print_msg "Checking installation of libssh"
-    if [[ -x /usr/local/lib/libssh_threads.dylib ]]; then
+    locate libssh_threads.dylib
+    local status=$?
+    if [[ ${status} == 0 ]]; then
         return
     fi
     print_msg "Installing libssh-0.7.6"
     brew reinstall openssl
     export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
-    run_cmd wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
+    wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.6.tar.gz
     tar zxf libssh-0.7.6.tar.gz && rm -f libssh-0.7.6.tar.gz
     mkdir libssh-0.7.6/build && cd libssh-0.7.6/build
     cmake ..
@@ -60,25 +62,16 @@ function install_libssh {
 
 function install_confd {
   if [[ ! -s $HOME/confd/bin/confd ]]; then
-    if [[ $os_version < "10.14." ]]
-    then
-      print_msg "Installing confd-basic-6.2"
-      wget https://github.com/CiscoDevNet/ydk-gen/files/562559/confd-basic-6.2.darwin.x86_64.zip &> /dev/null
-      unzip confd-basic-6.2.darwin.x86_64.zip
-      ./confd-basic-6.2.darwin.x86_64.installer.bin $HOME/confd
-    else
-      print_msg "Installing confd-basic-7.3"
-      unzip $curr_dir/3d_party/darwin/confd-basic-7.3.darwin.x86_64.zip
-      cd confd-basic-7.3.darwin.x86_64
-      run_cmd ./confd-basic-7.3.darwin.x86_64.installer.bin $HOME/confd
-      cd -
-    fi
-    rm -rf confd-basic-* ConfD*
+    print_msg "Installing confd"
+    wget https://github.com/CiscoDevNet/ydk-gen/files/562559/confd-basic-6.2.darwin.x86_64.zip &> /dev/null
+    unzip confd-basic-6.2.darwin.x86_64.zip
+    ./confd-basic-6.2.darwin.x86_64.installer.bin $HOME/confd
+    rm -f confd-basic-6.2.* ConfD*
   fi
 }
 
 function install_golang {
-  go_exec=$(command -v go)
+  go_exec=$(which go)
   if [[ -z ${go_exec} && -d /usr/local/go ]]; then
     go_exec=/usr/local/go/bin/go
   fi
@@ -91,17 +84,16 @@ function install_golang {
     print_msg "The Go is not installed"
     minor=0
   fi
-  if [ $minor -lt 9 ]; then
-    print_msg "Installing Go1.13.x"
-    brew install go@1.13
-    export GOROOT="/usr/local/opt/go@1.13"
-    sudo ln -s $GOROOT /usr/local/go
-    sudo ln -s $GOROOT/bin/go /usr/local/bin/go
-    sudo ln -s $GOROOT/libexec/src $GOROOT/src
-    sudo ln -s $GOROOT/libexec/pkg $GOROOT/pkg
-    if [[ $GOPATH. == "." ]]; then
-      export GOPATH=$HOME/go
-    fi
+  if (( $minor < 9 )); then
+    print_msg "Installing Go1.9.2"
+    bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
+    source /Users/travis/.gvm/scripts/gvm
+    print_msg "GO version before installation: $(go version)"
+    gvm install go1.4 -B
+    gvm use go1.4
+    export GOROOT_BOOTSTRAP=$GOROOT
+    gvm install go1.9.2
+    gvm use go1.9.2
     print_msg "GOROOT: $GOROOT"
     print_msg "GOPATH: $GOPATH"
     print_msg "GO version: $(go version)"
@@ -114,28 +106,13 @@ function check_python_installation {
   python3 -V
   status=$?
   if [ $status -ne 0 ]; then
-    print_msg "Python3 is not installed"
-    need_installation=1
-  else
-    python_version=$(echo `python3 -V` | awk '{ print $2 }')
-    print_msg "Installed Python3 version is $python_version"
-    if [[ $python_version == "3.9."* ]]; then
-      need_installation=1
-    fi
-  fi
-  if [[ -n $need_installation ]]; then
-    print_msg "Installing python3.7"
-    brew install python@3.7
-    export PATH="/usr/local/opt/python@3.7/bin":$PATH
-    echo 'export PATH=/usr/local/opt/python@3.7/bin:$PATH' > ~/.profile.python
-    echo 'if [ -z $CMAKE_LIBRARY_PATH ]; then' >> ~/.profile.python
-    echo '  export CMAKE_LIBRARY_PATH=/usr/local/opt/python@3.7/Frameworks/Python.framework/Versions/3.7/lib' >> ~/.profile.python
-    echo 'fi' >> ~/.profile.python
+    print_msg "Installing python3"
+    brew install python
   fi
   pip3 -V
   status=$?
   if [ $status -ne 0 ]; then
-    print_msg "Installing pip3"
+    print_msg "Installing pip${PYTHON_VERSION}"
     run_cmd curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
     run_cmd sudo -H python3 get-pip.py
   fi
@@ -148,11 +125,8 @@ NOCOLOR='\033[0m'
 YELLOW='\033[1;33m'
 MSG_COLOR=$YELLOW
 
-os_version=$(sw_vers | grep ProductVersion | awk '{print$2}')
-curr_dir=$(pwd)
-
-brew install curl wget xml2 cmake pkgconfig pcre
-brew install pybind11 doxygen
+brew install curl doxygen xml2
+brew install pybind11 valgrind
 
 install_libssh
 install_confd
diff --git a/test/dependencies_osx_gnmi.sh b/test/dependencies_osx_gnmi.sh
index 8c74b75b3..3af02e007 100755
--- a/test/dependencies_osx_gnmi.sh
+++ b/test/dependencies_osx_gnmi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# Copyright 2018-2019 Cisco Systems
+# Copyright 2018 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +26,10 @@
 # ------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** dependencies_osx_gnmi.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_osx_gnmi.sh | $@ ${NOCOLOR}"
 }
 
 function install_protobuf {
-  cd $HOME
   if [[ ! -d protobuf-3.5.0 ]]; then
     print_msg "Downloading protobuf and protoc"
     wget https://github.com/google/protobuf/releases/download/v3.5.0/protobuf-cpp-3.5.0.zip > /dev/null
@@ -45,12 +44,11 @@ function install_protobuf {
     make > /dev/null
     print_msg "Installing protobuf and protoc"
     sudo make install
+    cd $curr_dir
   fi
-  cd $curr_dir
 }
 
 function install_grpc {
-  cd $HOME
   if [[ ! -d grpc ]]; then
     print_msg "Installing grpc"
     #LIBTOOL=glibtool LIBTOOLIZE=glibtoolize make
@@ -63,8 +61,8 @@ function install_grpc {
     cd grpc
     make > /dev/null
     sudo make install
+    cd $curr_dir
   fi
-  cd $curr_dir
 }
 
 ########################## EXECUTION STARTS HERE #############################
diff --git a/test/dependencies_trusty.sh b/test/dependencies_trusty.sh
new file mode 100755
index 000000000..d286ec426
--- /dev/null
+++ b/test/dependencies_trusty.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+#  ----------------------------------------------------------------
+# Copyright 2018 Cisco Systems
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------
+#
+# Script for running ydk CI on docker via travis-ci.org
+# 
+# dependencies_trusty (Ubuntu 14.04)
+# ------------------------------------------------------------------
+
+function print_msg {
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_trusty.sh | $@ ${NOCOLOR}"
+}
+
+function install_dependencies {
+    print_msg "Installing OS dependencies"
+
+    apt update -y > /dev/null
+    apt install sudo -y > /dev/null
+    sudo apt-get update > /dev/null
+    sudo apt-get install libtool -y > /dev/null
+    sudo apt-get install -y bison curl doxygen flex git unzip wget cmake cmake3 lcov > /dev/null
+    sudo apt-get install -y libcmocka0 libcurl4-openssl-dev libpcre3-dev libpcre++-dev libssh-dev libxml2-dev libxslt1-dev > /dev/null
+    sudo apt-get install -y python-dev python-pip python-lxml > /dev/null
+}
+
+function install_gcc5 {
+  which gcc
+  local status=$?
+  if [[ $status == 0 ]]
+  then
+    gcc_version=$(echo $(gcc --version) | awk '{ print $3 }' | cut -d '-' -f 1)
+    print_msg "Current gcc/g++ version is $gcc_version"
+  else
+    print_msg "The gcc/g++ not installed"
+    gcc_version="4.0"
+  fi
+  if [[ $(echo $gcc_version | cut -d '.' -f 1) < 5 ]]
+  then
+    print_msg "Upgrading gcc/g++ to version 5"
+    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+    sudo apt-get update > /dev/null
+    sudo apt-get install gcc-5 g++-5 -y > /dev/null
+    sudo ln -fs /usr/bin/g++-5 /usr/bin/c++
+    sudo ln -fs /usr/bin/gcc-5 /usr/bin/cc
+    gcc_version=$(echo $(gcc --version) | awk '{ print $3 }' | cut -d '-' -f 1)
+    print_msg "Installed gcc/g++ version is $gcc_version"
+  fi
+}
+
+function install_go {
+    print_msg "Removing pre-installed Golang"
+    sudo apt-get remove golang -y
+    print_msg "Installing Golang version 1.9.2"
+    sudo wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz &> /dev/null
+    sudo tar -zxf  go1.9.2.linux-amd64.tar.gz -C /usr/local/
+}
+
+function install_confd {
+    print_msg "Installing confd"
+
+    wget https://github.com/CiscoDevNet/ydk-gen/files/562538/confd-basic-6.2.linux.x86_64.zip &> /dev/null
+    unzip confd-basic-6.2.linux.x86_64.zip
+    ./confd-basic-6.2.linux.x86_64.installer.bin ../confd
+}
+
+########################## EXECUTION STARTS HERE #############################
+
+# Terminal colors
+NOCOLOR="\033[0m"
+YELLOW='\033[1;33m'
+MSG_COLOR=$YELLOW
+
+install_dependencies
+install_gcc5
+install_go
+install_confd
\ No newline at end of file
diff --git a/test/dependencies_ubuntu.sh b/test/dependencies_ubuntu.sh
index 5337c43f2..a28dc2782 100755
--- a/test/dependencies_ubuntu.sh
+++ b/test/dependencies_ubuntu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,23 +21,22 @@
 # ------------------------------------------------------------------
 #
 # Script for running ydk CI on docker via travis-ci.org
-# and installing YDK from install_ydk.sh script
 #
-# dependencies_ubuntu (Ubuntu 16.04, 18.04, 20.04)
+# dependencies_ubuntu (Ubuntu 16.04, 18.04, 20.04 LTS)
 # ------------------------------------------------------------------
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date) *** dependencies_ubuntu.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date) *** dependencies_ubuntu.sh | $@ ${NOCOLOR}"
 }
 
 function run_cmd {
     local cmd=$@
     print_msg "Running: $cmd"
-    $*
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
@@ -48,44 +47,21 @@ function install_dependencies {
 
     apt update -y
     apt install sudo -y
-    $sudo_cmd apt-get install -y lsb-release
-    codename=$(lsb_release -c | awk '{ print $2 }')
-    ubuntu_release=$(lsb_release -r | awk '{ print $2 }' | cut -d '.' -f 1)
-    if [[ $codename == "focal" && ! -h /etc/localtime ]]; then
-      # Fixing timezone setting issue in focal
-      export DEBIAN_FRONTEND=noninteractive
-      $sudo_cmd apt-get install -y tzdata
-      ln -fs /usr/share/zoneinfo/US/Pacific /etc/localtime
-      dpkg-reconfigure --frontend noninteractive tzdata
-      unset DEBIAN_FRONTEND
-    fi
-    run_cmd $sudo_cmd apt-get install -y --no-install-recommends apt-utils
-    run_cmd $sudo_cmd apt-get update -y
-    run_cmd $sudo_cmd apt-get install libtool-bin -y > /dev/null
+    run_cmd sudo apt-get install -y --no-install-recommends apt-utils
+    run_cmd sudo apt-get update -y
+    run_cmd sudo apt-get install libtool-bin -y > /dev/null
     local status=$?
     if [[ ${status} != 0 ]]; then
-        run_cmd $sudo_cmd apt-get install libtool -y > /dev/null
-    fi
-    if [[ $codename == "focal" ]]; then
-        $sudo_cmd apt-get install -y mlocate git > /dev/null
-        if [[ ! -h /usr/local/lib/libnettle.so.6 ]]; then
-          cd /usr/local/lib/
-          $sudo_cmd ln -s $curr_dir/3d_party/linux/ubuntu/lib/libnettle.so.6.4
-          $sudo_cmd ln -s libnettle.so.6.4 libnettle.so.6
-          cd -
-        fi
-    else
-        run_cmd $sudo_cmd apt-get install -y locate git > /dev/null
-        run_cmd $sudo_cmd apt-get install -y curl libcurl4-openssl-dev > /dev/null
+        run_cmd sudo apt-get install libtool -y > /dev/null
     fi
-    run_cmd $sudo_cmd apt-get install -y bison doxygen flex unzip wget cmake gdebi-core lcov > /dev/null
-    run_cmd $sudo_cmd apt-get install -y libcmocka0 libpcre3-dev libpcre++-dev > /dev/null
-    run_cmd $sudo_cmd apt-get install -y libssh-dev libxml2-dev libxslt1-dev > /dev/null
-    run_cmd $sudo_cmd apt-get install -y python3-dev python3-lxml python3-pip python3-venv > /dev/null
-    run_cmd $sudo_cmd apt-get install -y pkg-config software-properties-common zlib1g-dev openjdk-8-jre > /dev/null
-    run_cmd $sudo_cmd apt-get install -y valgrind > /dev/null
-    if [[ $codename == "focal" ]]; then
-        run_cmd $sudo_cmd apt-get install -y python3-pybind11 > /dev/null
+    run_cmd sudo apt-get install -y bison curl doxygen flex git unzip wget cmake gdebi-core lcov vim locate > /dev/null
+    run_cmd sudo apt-get install -y libcmocka0 libcurl4-openssl-dev libpcre3-dev libpcre++-dev > /dev/null
+    run_cmd sudo apt-get install -y libssh-dev libxml2-dev libxslt1-dev > /dev/null
+    run_cmd sudo apt-get install -y python3-dev python3-lxml python3-pip python3-venv > /dev/null
+    run_cmd sudo apt-get install -y pkg-config software-properties-common zlib1g-dev openjdk-8-jre > /dev/null
+    run_cmd sudo apt-get install -y valgrind > /dev/null
+    if [[ $(cat /etc/lsb-release) == *"focal"* ]]; then
+        run_cmd sudo apt-get install -y python3-pybind11 > /dev/null
     fi
 }
 
@@ -101,52 +77,33 @@ function check_install_gcc {
     gcc_version="4.0.0"
   fi
   local major=$(echo $gcc_version | cut -d '.' -f 1)
-  if [[ $gcc_version < "4.8.1" || $major -gt 7 ]]
+  if [[ $gcc_version < "4.8.1" || $major > 7 ]]
   then
     print_msg "Installing gcc/g++ version 7"
-#    $sudo_cmd add-apt-repository ppa:ubuntu-toolchain-r/test -y
-#    $sudo_cmd apt-get update -y > /dev/null
-    $sudo_cmd apt-get install gcc-7 g++-7 -y > /dev/null
-    $sudo_cmd ln -fs /usr/bin/g++-7 /usr/bin/c++
-    $sudo_cmd ln -fs /usr/bin/gcc-7 /usr/bin/cc
-    $sudo_cmd ln -fs /usr/bin/g++-7 /usr/bin/g++
-    $sudo_cmd ln -fs /usr/bin/gcc-7 /usr/bin/gcc
+    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+    sudo apt-get update -y > /dev/null
+    sudo apt-get install gcc-7 g++-7 -y # > /dev/null
+    sudo ln -fs /usr/bin/g++-7 /usr/bin/c++
+    sudo ln -fs /usr/bin/gcc-7 /usr/bin/cc
+    sudo ln -fs /usr/bin/g++-7 /usr/bin/g++
+    sudo ln -fs /usr/bin/gcc-7 /usr/bin/gcc
     gcc_version=$(echo $(gcc --version) | awk '{ print $3 }' | cut -d '-' -f 1)
     print_msg "Installed gcc/g++ version is $gcc_version"
-  else
-    $sudo_cmd ln -fs /usr/bin/g++ /usr/bin/c++
-    $sudo_cmd ln -fs /usr/bin/gcc /usr/bin/cc
-  fi
-}
-
-function check_install_curl {
-  if [[ ! -x /usr/local/bin/curl ]]; then
-    print_msg "Installing curl from source"
-    git clone https://github.com/curl/curl.git -b curl-7_61_1
-    cd curl
-    ./buildconf
-    ./configure --enable-versioned-symbols --with-openssl > /dev/null
-    make > /dev/null
-    $sudo_cmd make install
-    cd -
-    $sudo_cmd rm -f /usr/lib/x86_64-linux-gnu/libcurl.so
-    $sudo_cmd ln -sf /usr/local/lib/libcurl.so.4 /usr/lib/x86_64-linux-gnu/libcurl.so
-    rm -rf curl
-    print_msg "Installed curl version: $(curl --version | sed 1q | awk '{print$2}')"
   fi
 }
 
 function check_install_libssh {
-  if [[ $codename == "focal" && ! -h /usr/local/lib/libssh_threads.so ]]; then
-    print_msg "Copying libssh and libssh_threads to /usr/local/lib"
-    sudo cp $curr_dir/3d_party/linux/ubuntu/lib/libssh.so.4.5.0 /usr/local/lib/
-    sudo cp $curr_dir/3d_party/linux/ubuntu/lib/libssh_threads.so.4.5.0 /usr/local/lib/
-    cd /usr/local/lib/
-    sudo ln -s libssh.so.4.5.0 libssh.so.4
-    sudo ln -s libssh.so.4 libssh.so
-    sudo ln -s libssh_threads.so.4.5.0 libssh_threads.so.4
-    sudo ln -s libssh_threads.so.4 libssh_threads.so
+  sudo updatedb
+  if [[ -z $(locate libssh_threads.so) ]]; then
+    print_msg "Installing libssh-0.7.7"
+    run_cmd wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.7.tar.gz
+    tar zxf libssh-0.7.7.tar.gz
+    mkdir libssh-0.7.7/build && cd libssh-0.7.7/build
+    run_cmd cmake ..
+    run_cmd make
+    sudo make install
     cd -
+    rm -rf libssh-0.7.7*
   fi
 }
 
@@ -164,35 +121,24 @@ function check_install_go {
     print_msg "The Go is not installed"
     minor=0
   fi
-  if [ $minor -lt 9 ]; then
-    print_msg "Installing Golang version 1.13.1 in /usr/local/go"
-    run_cmd wget https://storage.googleapis.com/golang/go1.13.1.linux-amd64.tar.gz
-    $sudo_cmd tar -zxf  go1.13.1.linux-amd64.tar.gz -C /usr/local/
-    rm -f go1.13.1.linux-amd64.tar.gz
+  if (( $minor < 9 )); then
+    print_msg "Installing Golang version 1.9.2 in /usr/local/go"
+    run_cmd sudo wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz &> /dev/null
+    sudo tar -zxf  go1.9.2.linux-amd64.tar.gz -C /usr/local/
+    rm -f go1.9.2.linux-amd64.tar.gz
     cd /usr/local/bin
-    $sudo_cmd ln -sf /usr/local/go/bin/go
+    sudo ln -sf /usr/local/go/bin/go
     cd -
   fi
 }
 
 function check_install_confd {
   if [[ ! -s $HOME/confd/bin/confd ]]; then
-    if [[ $ubuntu_release -lt 20 ]]; then
-      print_msg "Installing confd-basic-6.2"
-      run_cmd wget https://github.com/CiscoDevNet/ydk-gen/files/562538/confd-basic-6.2.linux.x86_64.zip &> /dev/null
-      unzip confd-basic-6.2.linux.x86_64.zip
-      run_cmd ./confd-basic-6.2.linux.x86_64.installer.bin $HOME/confd
-    else
-      print_msg "Installing confd-basic-7.3"
-      unzip $curr_dir/3d_party/linux/confd-basic-7.3.linux.x86_64.zip
-      cd confd-basic-7.3.linux.x86_64
-      run_cmd ./confd-basic-7.3.linux.x86_64.installer.bin $HOME/confd
-      cd -
-      ln -s $curr_dir/3d_party/linux/ubuntu/lib/libcrypto.so.1.0.0 $HOME/confd/lib/libcrypto.so.1.0.0
-      ln -s $curr_dir/3d_party/linux/ubuntu/lib/libncurses.so.5.9 $HOME/confd/lib/libncurses.so.5
-      ln -s $curr_dir/3d_party/linux/ubuntu/lib/libtinfo.so.5.9 $HOME/confd/lib/libtinfo.so.5
-    fi
-    rm -rf confd-basic-* ConfD*
+    print_msg "Installing confd"
+    run_cmd wget https://github.com/CiscoDevNet/ydk-gen/files/562538/confd-basic-6.2.linux.x86_64.zip &> /dev/null
+    unzip confd-basic-6.2.linux.x86_64.zip
+    run_cmd ./confd-basic-6.2.linux.x86_64.installer.bin $HOME/confd
+    rm -f confd-basic-6.2.* ConfD*
   fi
 }
 
@@ -203,22 +149,12 @@ NOCOLOR="\033[0m"
 YELLOW='\033[1;33m'
 MSG_COLOR=$YELLOW
 
-sudo_cmd=
-if [ $(id -u -n) != "root" ]; then
-  sudo_cmd="sudo"
-fi
-
-curr_dir=$(pwd)
+curr_dir="$(pwd)"
 
 install_dependencies
 check_install_gcc
+check_install_libssh
 
 check_install_go
 
-if [[ $ubuntu_release -gt 19 ]]; then
-  check_install_curl
-fi
 check_install_confd
-
-$sudo_cmd updatedb
-check_install_libssh
diff --git a/test/gnmi_server/CMakeLists.txt b/test/gnmi_server/CMakeLists.txt
index 514d8caee..56f6eb3fa 100644
--- a/test/gnmi_server/CMakeLists.txt
+++ b/test/gnmi_server/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.3)
-project(ydk_gnmi_server)
+project(ydk_gnmi)
 
 include(ExternalProject)
 
@@ -47,7 +47,7 @@ add_custom_command(OUTPUT ${libgnmi_sources}
   VERBATIM
 )
 
-# add_custom_target(ydk_gnmi ALL DEPENDS ${libgnmi_sources})
+add_custom_target(ydk_gnmi ALL DEPENDS ${libgnmi_sources})
 
 include_directories(
     ${Protobuf_INCLUDE_DIR}
@@ -56,7 +56,10 @@ include_directories(
 
 add_executable(gnmi_server "gnmi_server.cpp" ${libgnmi_sources})
 
-target_link_libraries(gnmi_server
-            ${GRPC_GRPC++_LIBRARY}
-            ${PROTOBUF_LIBRARY}
-            )
+set(IS_SECURE True)
+if(${IS_SECURE})
+#    target_link_directories(gnmi_server PUBLIC /usr/local/lib)
+    target_link_libraries(gnmi_server ${PROTOBUF_LIBRARY} grpc++)
+else(NOT ${IS_SECURE})
+    target_link_libraries(gnmi_server ${PROTOBUF_LIBRARY} grpc++_unsecure)
+endif()
diff --git a/test/gnmi_tests.sh b/test/gnmi_tests.sh
index f1ff8649c..50eb61fc8 100755
--- a/test/gnmi_tests.sh
+++ b/test/gnmi_tests.sh
@@ -14,11 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 #
 # Script for running YDK gNMI tests on travis-ci.org
 #
@@ -36,27 +31,27 @@ MSG_COLOR=$YELLOW
 ######################################################################
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date): gnmi_tests.sh | $* ${NOCOLOR}"
+    echo -e "${MSG_COLOR}*** $(date): gnmi_tests.sh | $@ ${NOCOLOR}"
 }
 
-function run_cmd {
-    $*
+function run_exec_test {
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
 }
 
 function run_test_no_coverage {
-    print_msg "Executing: ${PYTHON_BIN} $*"
-    ${PYTHON_BIN} $*
+    print_msg "Executing: ${PYTHON_BIN} $@"
+    ${PYTHON_BIN} $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting '${PYTHON_BIN} $*' with status=$status"
+        print_msg "Exiting '${PYTHON_BIN} $@' with status=$status"
         exit $status
     fi
     return $status
@@ -64,28 +59,28 @@ function run_test_no_coverage {
 
 function run_test {
     if [[ $(command -v coverage) && $run_with_coverage ]]; then
-        print_msg "Executing with coverage: $*"
-        coverage run --omit=/usr/* --branch --parallel-mode $* > /dev/null
+        print_msg "Executing with coverage: $@"
+        coverage run --omit=/usr/* --branch --parallel-mode $@ > /dev/null
         local status=$?
         print_msg "Returned status is ${status}"
         if [ $status -ne 0 ]; then
             MSG_COLOR=$RED
-            print_msg "Exiting 'coverage run $*' with status=$status"
+            print_msg "Exiting 'coverage run $@' with status=$status"
             exit $status
         fi
         return $status
     fi
-    run_test_no_coverage $*
+    run_test_no_coverage $@
     local status=$?
     return $status
 }
 
 function pip_check_install {
     if [[ $(uname) == "Linux" ]] && [[ ${os_info} == *"fedora"* && ${PYTHON_VERSION} == "2"* ]] ; then
-        print_msg "Custom pip install of $* for CentOS"
-        ${PIP_BIN} install --install-option="--install-purelib=/usr/lib64/python${PYTHON_VERSION}/site-packages" --no-deps $*
+        print_msg "Custom pip install of $@ for CentOS"
+        ${PIP_BIN} install --install-option="--install-purelib=/usr/lib64/python${PYTHON_VERSION}/site-packages" --no-deps $@
     else
-        ${PIP_BIN} install --no-deps $*
+        ${PIP_BIN} install --no-deps $@
     fi
 }
 
@@ -110,16 +105,10 @@ function check_python_installation {
     fi
   fi
 
-  if [[ ! $run_with_coverage ]]; then
-    if [[ -z ${PYTHON_VENV} ]]; then
-      PYTHON_VENV=${HOME}/venv
-      print_msg "Python virtual environment location is set to ${PYTHON_VENV}"
-    fi
-    if [[ ! -d ${PYTHON_VENV} ]]; then
-      print_msg "Creating Python3 virtual environment in ${PYTHON_VENV}"
-      run_cmd python3 -m venv ${PYTHON_VENV}
-    fi
-    run_cmd source ${PYTHON_VENV}/bin/activate
+  if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* && ${PYTHON_VERSION} == "3"* ]]; then
+    print_msg "Creating Python3 virtual environment in $YDKGEN_HOME/venv"
+    run_exec_test ${PYTHON_BIN} -m venv $YDKGEN_HOME/venv
+    run_exec_test source $YDKGEN_HOME/venv/bin/activate
   fi
 
   print_msg "Checking installation of ${PYTHON_BIN}"
@@ -145,7 +134,7 @@ function check_python_installation {
 function init_py_env {
   check_python_installation
   print_msg "Initializing Python requirements"
-  ${PIP_BIN} install -r requirements.txt
+  ${PIP_BIN} install -r requirements.txt pybind11==2.2.2
   if [[ $run_with_coverage ]] ; then
     ${PIP_BIN} install coverage
   fi
@@ -156,7 +145,7 @@ function init_go_env {
 
     if [[ $(uname) == "Darwin" ]]; then
         if [[ $GOPATH. == "." ]]; then
-            export GOPATH="$HOME/go"
+            export GOPATH="$(pwd)/golang"
         fi
         print_msg "GOROOT: $GOROOT"
         print_msg "GOPATH: $GOPATH"
@@ -170,7 +159,7 @@ function init_go_env {
         export PATH=$GOROOT/bin:$PATH
 
         if [[ $GOPATH. == "." ]]; then
-            export GOPATH="$HOME/go"
+            export GOPATH="$HOME/golang"
             mkdir -p $GOPATH
             print_msg "Setting GOPATH to $GOPATH"
         else
@@ -180,18 +169,13 @@ function init_go_env {
     go_version=$(echo `go version` | awk '{ print $3 }' | cut -d 'o' -f 2)
     print_msg "Current Go version is $go_version"
 
-    if [ ! -d $GOPATH/src/github.com/stretchr/testify ]; then
-        go get github.com/stretchr/testify
-        cd $GOPATH/src/github.com/stretchr/testify
-        git checkout tags/v1.6.1
-        cd -
-    fi
+    go get github.com/stretchr/testify
+    cd $GOPATH/src/github.com/stretchr/testify
+    git checkout tags/v1.6.1
+    cd -
 
     export CGO_ENABLED=1
     export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
-    if [[ $go_version > "1.11." ]]; then
-        go env -w GO111MODULE=off
-    fi
 }
 
 ######################################################################
@@ -207,11 +191,11 @@ function install_cpp_core {
 
     if [[ $run_with_coverage ]] ; then
       print_msg "Compiling with coverage"
-      run_cmd ${CMAKE_BIN} -DCOVERAGE=True ..
+      run_exec_test ${CMAKE_BIN} -DCOVERAGE=True ..
     else
-      run_cmd ${CMAKE_BIN} ..
+      run_exec_test ${CMAKE_BIN} ..
     fi
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
     sudo make install
 }
 
@@ -238,7 +222,7 @@ function install_cpp_ydktest_bundle {
     cd $YDKGEN_HOME
     run_test generate.py --bundle profiles/test/ydktest-cpp.json --cpp
     cd gen-api/cpp/ydktest-bundle/build
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
     sudo make install
     cd -
 }
@@ -249,11 +233,11 @@ function build_gnmi_cpp_core_library {
     mkdir -p build
     cd build
     if [[ $run_with_coverage ]] ; then
-      run_cmd ${CMAKE_BIN} -DCOVERAGE=True ..
+      run_exec_test ${CMAKE_BIN} -DCOVERAGE=True ..
     else
-      run_cmd ${CMAKE_BIN} ..
+      run_exec_test ${CMAKE_BIN} ..
     fi
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
     sudo make install
     cd $YDKGEN_HOME
 }
@@ -264,14 +248,14 @@ function build_and_run_cpp_gnmi_tests {
     mkdir -p build
     cd build
     if [[ $run_with_coverage ]] ; then
-      run_cmd ${CMAKE_BIN} -DCOVERAGE=True ..
+      run_exec_test ${CMAKE_BIN} -DCOVERAGE=True ..
     else
-      run_cmd ${CMAKE_BIN} ..
+      run_exec_test ${CMAKE_BIN} ..
     fi
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
 
     cd $YDKGEN_HOME/sdk/cpp/gnmi/tests/build
-    run_cmd ./ydk_gnmi_test -d yes
+    run_exec_test ./ydk_gnmi_test -d yes
 
     collect_cpp_coverage
 }
@@ -306,8 +290,8 @@ function run_cpp_gnmi_memcheck_tests {
     cd $YDKGEN_HOME/sdk/cpp/gnmi/samples
     mkdir -p build
     cd build
-    run_cmd ${CMAKE_BIN} ..
-    run_cmd make &> /dev/null
+    run_exec_test ${CMAKE_BIN} ..
+    run_exec_test make &> /dev/null
 
     print_msg "Running gnmi sample tests with memcheck"
     valgrind --leak-check=summary ./bgp_gnmi_subscribe ssh://admin:admin@127.0.0.1:50051
@@ -319,8 +303,8 @@ function start_gnmi_server {
     if [ ! -x ./build/gnmi_server ]; then
         print_msg "Building YDK gNMI server"
         mkdir -p build && cd build
-        run_cmd ${CMAKE_BIN} ..
-        run_cmd make &> /dev/null
+        run_exec_test ${CMAKE_BIN} ..
+        run_exec_test make &> /dev/null
     fi
 
     print_msg "Starting YDK gNMI server"
@@ -368,7 +352,7 @@ function run_go_gnmi_tests {
     print_msg "Running Go gNMI tests"
 
     cd $YDKGEN_HOME/sdk/go/gnmi/tests
-    run_cmd go test
+    run_exec_test go test
 
     run_go_gnmi_samples
 
@@ -381,8 +365,8 @@ function run_go_gnmi_samples {
     print_msg "Running Go gNMI samples"
 
     cd $YDKGEN_HOME/sdk/go/gnmi/samples
-    run_cmd go run service_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
-    run_cmd go run session_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
+    run_exec_test go run service_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
+    run_exec_test go run session_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
 }
 
 
@@ -435,7 +419,7 @@ function build_python_gnmi_package {
 
     cd $YDKGEN_HOME
     run_test generate.py --service profiles/services/gnmi-0.4.0.json
-    run_cmd ${PIP_BIN} install --no-deps gen-api/python/ydk-service-gnmi/dist/ydk*.tar.gz
+    run_exec_test ${PIP_BIN} install --no-deps gen-api/python/ydk-service-gnmi/dist/ydk*.tar.gz
 
     print_msg "Verifying Python gNMI package installation"
     ${PYTHON_BIN} -c "from ydk.gnmi.path import gNMISession"
@@ -493,7 +477,7 @@ if [[ ${status} == 0 ]] ; then
 fi
 
 if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]] ; then
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$YDKGEN_HOME/grpc/libs/opt:$YDKGEN_HOME/protobuf-3.5.0/src/.libs:/usr/local/lib:/usr/local/lib64:/usr/lib64
     print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
 fi
 
diff --git a/test/init_test_env.sh b/test/init_test_env.sh
deleted file mode 100755
index c4421b18d..000000000
--- a/test/init_test_env.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-#
-# Bash script to initialize and run dumb services for unit tests
-# ------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "\n${MSG_COLOR}*** $(date): init_test_env.sh: $* ${NOCOLOR}"
-}
-
-function run_cmd {
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command '$*' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function init_confd {
-    cd $1
-    print_msg "Initializing confd in $(pwd)"
-    confd_rc=$(find $HOME/confd -name confdrc)
-    if [[ -z $confd_rc ]]; then
-        MSG_COLOR=$RED
-        print_msg "Cannot find 'confdrc' resource file in user file system. Exiting"
-        exit 1
-    fi
-    print_msg "Found confd resource file: $confd_rc"
-    run_cmd source $confd_rc
-    run_cmd make stop > /dev/null
-    run_cmd make clean > /dev/null
-    run_cmd make all > /dev/null
-    run_cmd make start
-    sleep 2
-    cd - > /dev/null
-}
-
-function init_confd_ydktest {
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/ydktest
-}
-
-function init_rest_server {
-    print_msg "Starting REST server"
-    pkill -f moco-runner
-    export REST_SERVER_PID=$(./test/start_rest_server.sh)
-    print_msg "REST server started with PID $REST_SERVER_PID"
-}
-
-function init_tcp_server {
-    print_msg "Starting TCP server"
-    pkill -f tcp_proxy_server
-    export TCP_SERVER_PID=$(./test/start_tcp_server.sh)
-    print_msg "TCP server started with PID: $TCP_SERVER_PID"
-}
-
-########################## EXECUTION STARTS HERE #############################
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) && pwd)
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-    export YDKGEN_HOME=$(cd $script_dir/.. && pwd)
-    print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-curr_dir="$(pwd)"
-cd $YDKGEN_HOME
-
-init_confd_ydktest
-init_rest_server
-init_tcp_server
-
-cd $curr_dir
-exit
diff --git a/test/python_bundle_tests.sh b/test/python_bundle_tests.sh
deleted file mode 100755
index 48a26a272..000000000
--- a/test/python_bundle_tests.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-#
-# Bash script to run basic YDK tests for Python
-# ------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "\n${MSG_COLOR}*** $(date): python_bundle_tests.sh: $* ${NOCOLOR}"
-}
-
-function run_test {
-    test=$*
-    print_msg "Running test $test"
-    python3 $YDKGEN_HOME/sdk/python/core/tests/$test
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command 'python $YDKGEN_HOME/sdk/python/core/tests/$test' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function reset_yang_repository {
-    if [[ ! -d $HOME/.ydk/127.0.0.1 ]]; then
-      mkdir -p $HOME/.ydk
-      mkdir -p $HOME/.ydk/127.0.0.1
-    fi
-    rm -f $HOME/.ydk/127.0.0.1/*
-
-    # Correct issue with confd 7.3
-    confd_version=$($HOME/confd/bin/confd --version)
-    if [[ $confd_version. > 7.2. ]]; then
-      cp ${YDKGEN_HOME}/sdk/cpp/core/tests/models/ietf-interfaces.yang $HOME/.ydk/127.0.0.1/
-    fi
-}
-
-########################## EXECUTION STARTS HERE #############################
-#
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) > /dev/null && pwd)
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-  YDKGEN_HOME=$(cd "$script_dir/../" > /dev/null && pwd)
-  print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-reset_yang_repository
-
-print_msg "Installing test bundles"
-cd $YDKGEN_HOME
-python3 generate.py --python --bundle profiles/test/ydktest-cpp.json -i
-cd -
-
-$script_dir/init_test_env.sh
-
-run_test test_ydk_types.py
-run_test test_sanity_codec.py
-run_test test_netconf_operations.py
-run_test test_opendaylight.py
-run_test test_restconf_provider.py
-run_test test_sanity_delete.py
-run_test test_sanity_errors.py
-run_test test_sanity_filter_read.py
-run_test test_sanity_filters.py
-run_test test_sanity_levels.py
-run_test test_sanity_netconf.py
-run_test test_sanity_path.py
-run_test test_netconf_provider.py
-run_test test_sanity_service_errors.py
-run_test test_sanity_type_mismatch_errors.py
-run_test test_sanity_types.py
-run_test test_non_top_operations.py
-
-$script_dir/clean_test_env.sh
diff --git a/test/run_cpp_tests.sh b/test/run_cpp_tests.sh
deleted file mode 100755
index 9724a8357..000000000
--- a/test/run_cpp_tests.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------------
-#
-# Bash script to install YDK-CPP and run unit tests
-# ------------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "${MSG_COLOR}*** $(date): run_cpp_test.sh: $* ${NOCOLOR}"
-}
-
-function run_cmd {
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Exiting '$*' with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-# ------------------------------------------------------------------
-# C++ specific functions
-# ------------------------------------------------------------------
-
-function install_test_cpp_core {
-    print_msg "Installing / testing cpp core"
-    install_cpp_core
-    run_cpp_core_test
-}
-
-function install_cpp_core {
-    print_msg "Installing cpp core"
-
-    cd $YDKGEN_HOME
-    rm -rf sdk/cpp/core/build > /dev/null
-    mkdir -p $YDKGEN_HOME/sdk/cpp/core/build
-    cd $YDKGEN_HOME/sdk/cpp/core/build
-    
-    run_cmd ${CMAKE_BIN} ..
-    run_cmd make
-    run_cmd sudo make install
-}
-
-function run_cpp_core_test {
-    print_msg "Running cpp core test"
-
-    make test
-    local status=$?
-    if [ $status -ne 0 ]; then
-        # If the tests fail, repeat them in verbose mode
-        ./tests/ydk_core_test -d yes
-        MSG_COLOR=$RED
-        print_msg "Exiting 'run_cpp_core_test' with status $status"
-        exit $status
-    fi
-    cd $YDKGEN_HOME
-}
-
-function run_cpp_bundle_tests {
-    print_msg "Generating and testing C++ bundle"
-
-    cpp_sanity_ydktest_gen_install
-    cpp_sanity_ydktest_test
-}
-
-function generate_install_specified_cpp_bundle {
-   bundle_profile=$1
-   bundle_name=$2
-   print_msg "Generating and installing C++ ydktest bundle $bundle_name"
-   cd $YDKGEN_HOME
-   sudo rm -rf ./gen-api/cpp/$bundle_name
-   run_cmd python3 generate.py --bundle $bundle_profile --cpp -v
-   cd gen-api/cpp/$2/build
-   run_cmd make
-   run_cmd sudo make install
-   cd - > /dev/null
-}
-
-function cpp_sanity_ydktest_gen_install {
-    sudo rm -rf $YDKGEN_HOME/gen-api/.cache
-
-    generate_install_specified_cpp_bundle profiles/test/ydktest-cpp.json ydktest-bundle
-}
-
-function cpp_sanity_ydktest_test {
-    print_msg "Initializing ssh keys for key-based authentication"
-    sudo mkdir -p /var/confd/homes/admin/.ssh
-    sudo touch /var/confd/homes/admin/.ssh/authorized_keys
-    cd $YDKGEN_HOME
-    sudo sh -c 'cat sdk/cpp/tests/ssh_host_rsa_key.pub >> /var/confd/homes/admin/.ssh/authorized_keys'
-    cd - > /dev/null
-
-    print_msg "Building cpp bundle tests"
-    rm -rf sdk/cpp/tests/build > /dev/null
-    mkdir sdk/cpp/tests/build
-    cd sdk/cpp/tests/build
-
-    run_cmd ${CMAKE_BIN} ..
-    run_cmd make
-
-    run_cmd $script_dir/init_test_env.sh
-
-    print_msg "Running cpp bundle tests"
-    run_cmd ./ydk_bundle_test -d yes
-}
-
-function cpp_test_gen_test {
-    print_msg "Running cpp_test_gen_test"
-
-    cd $YDKGEN_HOME
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/testgen/confd
-    mkdir -p gen-api/cpp/models_test-bundle/ydk/models/models_test/test/build
-    cd gen-api/cpp/models_test-bundle/ydk/models/models_test/test/build
-    run_cmd ${CMAKE_BIN} ..
-    run_cmd make
-    ctest --output-on-failure
-
-    os_type=$(uname)
-    if [[ ${os_type} == "Linux" ]] ; then
-        print_msg "Running tcp tests on linux"
-        run_cmd ./ydk_bundle_test *tcp* -d yes
-    fi
-}
-
-function cpp_test_gen {
-    print_msg "Running cpp_test_gen"
-
-    cd $YDKGEN_HOME
-    run_cmd python3 generate.py --bundle profiles/test/ydk-models-test.json --generate-tests --cpp &> /dev/null
-    cd gen-api/cpp/models_test-bundle/build/
-    run_cmd sudo make install
-
-    # cpp_test_gen_test
-}
-
-function init_gnmi_server {
-    print_msg "Starting YDK gNMI server"
-    mkdir -p $YDKGEN_HOME/test/gnmi_server/build && cd $YDKGEN_HOME/test/gnmi_server/build
-    ${CMAKE_BIN} .. && make clean && make
-    ./gnmi_server &
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Could not start gNMI server"
-        exit $status
-    fi
-    cd -
-}
-
-function stop_gnmi_server {
-    print_msg "Stopping gNMI server"
-    pkill -f gnmi_server
-}
-
-function build_gnmi_core_library {
-    print_msg "Building core gnmi library"
-    cd $YDKGEN_HOME/sdk/cpp/gnmi
-    mkdir -p build
-    cd build
-    ${CMAKE_BIN} .. && make clean && make
-    sudo make install
-    cd $YDKGEN_HOME
-}
-
-function build_and_run_tests {
-    print_msg "Building gnmi tests"
-    cd $YDKGEN_HOME/sdk/cpp/gnmi/tests
-    mkdir -p build
-    cd build
-    ${CMAKE_BIN} .. && make clean && make
-
-    init_gnmi_server
-    ./ydk_gnmi_test -d yes
-    stop_gnmi_server
-}
-
-function run_cpp_gnmi_tests {
-    build_gnmi_core_library
-    build_and_run_tests
-}
-
-function run_cpp_gnmi_memcheck_tests {
-    print_msg "Building gnmi sample tests"
-    cd $YDKGEN_HOME/sdk/cpp/gnmi/samples
-    mkdir -p build
-    cd build
-    ${CMAKE_BIN} .. && make clean && make
-
-    init_gnmi_server
-    print_msg "Running gnmi sample tests with memcheck"
-    valgrind --leak-check=summary ./bgp_gnmi_subscribe ssh://admin:admin@127.0.0.1:50051
-    stop_gnmi_server
-}
-
-########################## EXECUTION STARTS HERE #############################
-# ------------------------------------------------------------------
-# Main part
-# ------------------------------------------------------------------
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-os_type=$(uname)
-if [[ ${os_type} == "Linux" ]] ; then
-    os_info=$(cat /etc/*-release)
-else
-    os_info=$(sw_vers)
-fi
-print_msg "Running OS type: $os_type"
-print_msg "OS info: $os_info"
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) > /dev/null && pwd)
-
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-  YDKGEN_HOME=$(cd "$script_dir/../" > /dev/null && pwd)
-  print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-CMAKE_BIN=cmake
-command -v cmake3
-status=$?
-if [[ ${status} == 0 ]] ; then
-    CMAKE_BIN=cmake3
-fi
-
-if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]]; then
-  if [[ $LD_LIBRARY_PATH != *"protobuf-3.5.0"* ]]; then
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
-    print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
-  fi
-  centos_version=$(echo `lsb_release -r` | awk '{ print $2 }' | cut -d '.' -f 1)
-fi
-
-curr_dir=$(pwd)
-
-cd $YDKGEN_HOME
-
-install_test_cpp_core
-
-run_cpp_bundle_tests
-
-run_cpp_gnmi_tests
-
-command -v valgrind
-status=$?
-if [[ ${status} == 0 ]]; then
-    run_cpp_gnmi_memcheck_tests
-fi
-
-$script_dir/clean_test_env.sh
-
-cd $curr_dir
diff --git a/test/run_go_tests.sh b/test/run_go_tests.sh
deleted file mode 100755
index 5e8eeb20f..000000000
--- a/test/run_go_tests.sh
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------------
-#
-# Bash script to install YDK-GO packages and run unit tests
-# ------------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "${MSG_COLOR}*** $(date): run_go_tests.sh: $* ${NOCOLOR}"
-}
-
-function run_cmd {
-    print_msg "Running: $*"
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command '$*' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function reset_yang_repository {
-    if [[ ! -d $HOME/.ydk/127.0.0.1 ]]; then
-      mkdir -p $HOME/.ydk
-      mkdir -p $HOME/.ydk/127.0.0.1
-    fi
-    rm -f $HOME/.ydk/127.0.0.1/*
-
-    # Correct issue with confd 7.3
-    if [[ $confd_version. > "7.2." ]]; then
-      cp ${YDKGEN_HOME}/sdk/cpp/core/tests/models/ietf-interfaces.yang $HOME/.ydk/127.0.0.1/
-    fi
-}
-
-# ------------------------------------------------------------------
-# Golang specific functions
-#------------------------------------------------------------------
-
-function init_go_env {
-    print_msg "Initializing Go environment"
-
-    if [ -z $GOPATH ]; then
-       export GOPATH="${HOME}/go"
-    fi
-    if [ -z $GOROOT ]; then
-      export GOROOT="/usr/local/go"
-    fi
-
-    print_msg "GOPATH = ${GOPATH}"
-    print_msg "GOROOT = ${GOROOT}"
-
-    export PATH=$PATH:$GOPATH/bin
-    export PATH=$PATH:$GOROOT/bin
-
-    cd $YDKGEN_HOME
-
-    export CXX=/usr/bin/c++
-    export CC=/usr/bin/cc
-
-    print_msg "CC: ${CC}"
-    print_msg "CXX: ${CXX}"
-
-    go_version=$(echo `go version` | awk '{ print $3 }' | cut -d 'o' -f 2)
-    print_msg "Current Go version is $go_version"
-
-    if [ ! -d $GOPATH/src/github.com/stretchr/testify ]; then
-      print_msg "Installing 'testify' package"
-      run_cmd go get github.com/stretchr/testify
-      cd $GOPATH/src/github.com/stretchr/testify
-      git checkout tags/v1.6.1
-      cd -
-    fi
-
-    export CGO_ENABLED=1
-    export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
-    if [[ $go_version > "1.11." ]]; then
-        go env -w GO111MODULE=off
-    fi
-}
-
-function install_go_core {
-    print_msg "Installing Go core"
-    cd $YDKGEN_HOME
-
-    mkdir -p $GOPATH/src/github.com/CiscoDevNet/ydk-go/ydk
-    cp -r sdk/go/core/ydk/* $GOPATH/src/github.com/CiscoDevNet/ydk-go/ydk/
-}
-
-function install_go_bundle {
-    print_msg "Generating/installing go bundles ydktest"
-    cd $YDKGEN_HOME
-    run_cmd python3 generate.py --bundle profiles/test/ydktest-cpp.json --go -i
-}
-
-function run_go_bundle_tests {
-    run_cmd $script_dir/init_test_env.sh
-    confd_version=$($HOME/confd/bin/confd --version)
-
-    reset_yang_repository
-
-    run_go_samples
-    run_go_sanity_tests
-}
-
-function run_go_sanity_tests {
-    print_msg "Running go sanity tests"
-    cd $YDKGEN_HOME/sdk/go/core/tests
-    run_cmd go test
-    cd - > /dev/null
-}
-
-function run_go_samples {
-    print_msg "Running Go samples"
-
-    cd $YDKGEN_HOME/sdk/go/core/samples
-    run_cmd go run cgo_path/cgo_path.go
-    run_cmd go run bgp_create/bgp_create.go -device ssh://admin:admin@localhost:12022
-    run_cmd go run bgp_read/bgp_read.go -device ssh://admin:admin@localhost:12022
-    run_cmd go run bgp_delete/bgp_delete.go -device ssh://admin:admin@localhost:12022 -v
-    cd -
-}
-
-#-----------------------------------------------------------------------------
-#  gNMI Tests
-#-----------------------------------------------------------------------------
-
-function init_gnmi_server {
-    print_msg "Starting YDK gNMI server"
-    mkdir -p $YDKGEN_HOME/test/gnmi_server/build && cd $YDKGEN_HOME/test/gnmi_server/build
-    $CMAKE_BIN .. && make clean && make
-    ./gnmi_server &
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Could not start gNMI server"
-        exit $status
-    fi
-    cd -
-}
-
-function stop_gnmi_server {
-    print_msg "Stopping gNMI server"
-    pkill -f gnmi_server
-}
-
-function install_go_gnmi {
-    print_msg "Installing Go gNMI package"
-    cd $YDKGEN_HOME
-
-    run_cmd python3 generate.py --service profiles/services/gnmi-0.4.0.json --go -i
-}
-
-function run_go_gnmi_tests {
-    init_gnmi_server
-
-    print_msg "Running Go gNMI tests"
-
-    cd $YDKGEN_HOME/sdk/go/gnmi/tests
-    #run_cmd go test
-    run_cmd go test -run GnmiServiceProviderTestSuite
-    run_cmd go test -run TestGnmiServiceTestSuite
-    run_cmd go test -run TestGnmiSessionTestSuite
-
-    run_go_gnmi_samples
-
-    stop_gnmi_server
-
-    cd $YDKGEN_HOME
-}
-
-function run_go_gnmi_samples {
-    print_msg "Running Go gNMI samples"
-
-    cd $YDKGEN_HOME/sdk/go/gnmi/samples
-    run_cmd go run service_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
-    run_cmd go run session_subscribe_poll.go < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
-}
-
-########################## EXECUTION STARTS HERE #############################
-
-# Terminal colors
-RED='\033[0;31m'
-GREEN='\033[1;32m'
-NOCOLOR='\033[0m'
-YELLOW='\033[1;33m'
-MSG_COLOR=$YELLOW
-
-os_type=$(uname)
-if [[ ${os_type} == "Linux" ]] ; then
-  os_info=$(cat /etc/*-release)
-else
-  os_info=$(sw_vers)
-fi
-print_msg "Running OS type: $os_type"
-print_msg "OS info: $os_info"
-
-script_dir=$(cd $(dirname ${BASH_SOURCE}) > /dev/null && pwd)
-
-if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-  YDKGEN_HOME=$(cd "$script_dir/../" > /dev/null && pwd)
-  print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-fi
-
-if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]]; then
-  if [[ $LD_LIBRARY_PATH != *"protobuf-3.5.0"* ]]; then
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
-    print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
-  fi
-  centos_version=$(echo `lsb_release -r` | awk '{ print $2 }' | cut -d '.' -f 1)
-fi
-
-CMAKE_BIN=cmake
-command -v cmake3
-status=$?
-if [[ ${status} == 0 ]] ; then
-    CMAKE_BIN=cmake3
-fi
-
-curr_dir="$(pwd)"
-
-cd $YDKGEN_HOME
-
-init_go_env
-install_go_core
-install_go_bundle
-
-run_go_bundle_tests
-
-install_go_gnmi
-run_go_gnmi_tests
-
-$script_dir/clean_test_env.sh
-
-cd $curr_dir
diff --git a/test/run_py_tests.sh b/test/run_py_tests.sh
deleted file mode 100755
index fae5f2f46..000000000
--- a/test/run_py_tests.sh
+++ /dev/null
@@ -1,493 +0,0 @@
-#!/bin/bash
-#  -----------------------------------------------------------------------
-# Copyright 2020 Yan Gorelik, YDK Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ------------------------------------------------------------------------
-#
-# Bash script to install YDK-PY packages and run unit tests
-#
-# ------------------------------------------------------------------------
-
-function print_msg {
-    echo -e "\n${MSG_COLOR}*** $(date): run_py_test.sh: $* ${NOCOLOR}"
-}
-
-function run_cmd {
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command '$*' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function reset_yang_repository {
-    if [[ ! -d $HOME/.ydk/127.0.0.1 ]]; then
-      mkdir -p $HOME/.ydk
-      mkdir -p $HOME/.ydk/127.0.0.1
-    fi
-    rm -f $HOME/.ydk/127.0.0.1/*
-
-    # Correct issue with confd 7.3
-    if [[ $confd_version. > "7.2." ]]; then
-      cp ${YDKGEN_HOME}/sdk/cpp/core/tests/models/ietf-interfaces.yang $HOME/.ydk/127.0.0.1/
-    fi
-}
-
-function init_confd_rc {
-    print_msg "Initializing confd"
-
-    confd_rc=$(find $HOME/confd -name confdrc)
-    if [[ -z $confd_rc ]]; then
-        MSG_COLOR=$RED
-        print_msg "Cannot find confdrc resource file in user file system. Exiting"
-        exit 1
-    fi
-    print_msg "Found confd resource file: $confd_rc"
-    run_cmd source $confd_rc
-    confd_version=$(confd --version)
-}
-
-function init_confd {
-    print_msg "Initializing confd in $1"
-
-    cd $1
-    run_cmd make stop > /dev/null
-    run_cmd make clean > /dev/null
-    run_cmd make all > /dev/null
-    run_cmd make start
-    cd - > /dev/null
-
-    reset_yang_repository
-}
-
-function init_confd_ydktest {
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/ydktest
-}
-
-function init_rest_server {
-    print_msg "Starting rest server"
-    $YDKGEN_HOME/test/start_rest_server.sh
-    export REST_SERVER_PID=$moco_pid
-}
-
-function init_tcp_server {
-    print_msg "Starting TCP server"
-    $YDKGEN_HOME/test/start_tcp_server.sh
-    export TCP_SERVER_PID=$tcp_pid
-}
-
-function stop_tcp_server {
-    if [[ ! -z $TCP_SERVER_PID ]]; then
-        print_msg "Stopping TCP server PID $TCP_SERVER_PID"
-        kill $TCP_SERVER_PID
-    fi
-}
-
-function stop_rest_server {
-    if [[ ! -z $REST_SERVER_PID ]]; then
-        print_msg "Stopping REST server PID $REST_SERVER_PID"
-        kill $REST_SERVER_PID
-        unset REST_SERVER_PID
-    fi
-}
-
-function run_test {
-    print_msg "Executing: $*"
-    ${PYTHON_BIN} $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Command '${PYTHON_BIN} $*' FAILED with status=$status"
-        exit $status
-    fi
-    return $status
-}
-
-function init_test_env {
-    init_confd_rc
-    init_confd_ydktest
-    init_rest_server
-    init_tcp_server
-}
-
-# ------------------------------------------------------------------
-# Python specific functions
-# ------------------------------------------------------------------
-
-function init_python_env {
-  PYTHON_BIN=python3
-  PIP_BIN=pip3
-
-  print_msg "Checking python version and installation"
-  $PYTHON_BIN --version
-  status=$?
-  if [ $status -ne 0 ]; then
-    MSG_COLOR=$RED
-    print_msg "Could not locate python3 interpretor"
-    exit $status
-  fi
-  print_msg "Checking pip version and installation"
-  $PIP_BIN -V
-  status=$?
-  if [ $status -ne 0 ]; then
-    MSG_COLOR=$RED
-    print_msg "Could not locate ${PIP_BIN}"
-    exit $status
-  fi
-  print_msg "Python location: $(which ${PYTHON_BIN})"
-  print_msg "Pip location: $(which ${PIP_BIN})"
-}
-
-function pip_check_install {
-    sudo -H ${PIP_BIN} install $* -U
-}
-
-function install_py_core {
-    print_msg "Installing Python YDK core package"
-    cd $YDKGEN_HOME/sdk/python/core
-    rm -rf dist
-    ${PYTHON_BIN} setup.py sdist
-    ${PIP_BIN} install dist/ydk*.tar.gz -U
-    cd $YDKGEN_HOME
-
-    #print_msg "Generating py binaries"
-    #sudo -H ./generate_python_binary.sh
-    #cd $YDKGEN_HOME
-}
-
-function run_python_bundle_tests {
-    print_msg "Removing cache directory ./gen-api/.cache"
-    sudo rm -rf $YDKGEN_HOME/gen-api/.cache
-    py_sanity_ydktest
-    py_sanity_deviation
-    py_sanity_augmentation
-    py_sanity_common_cache
-    py_sanity_one_class_per_module
-}
-
-#--------------------------
-# Python ydktest bundle
-#--------------------------
-
-function py_sanity_ydktest {
-    py_sanity_ydktest_gen
-    py_sanity_ydktest_test
-
-    #py_sanity_doc_gen
-}
-
-function py_sanity_doc_gen {
-    print_msg "Generating docs"
-    #run_test generate.py --core --cpp --generate-doc &> /dev/null
-    #run_test generate.py --core --go --generate-doc &> /dev/null
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json
-    run_test generate.py --core --python --generate-doc
-}
-
-function py_sanity_ydktest_gen {
-    print_msg "Generating and installing YDK bundle ydk-models-ydktest"
-    cd $YDKGEN_HOME
-
-    run_test generate.py --python --bundle profiles/test/ydktest-cpp.json -i
-}
-
-function py_sanity_ydktest_test {
-    init_test_env
-    print_msg "Running test_sanity_codec tests"
-
-    cd $YDKGEN_HOME
-    run_test sdk/python/core/tests/test_sanity_codec.py
-
-    py_sanity_ydktest_test_netconf_ssh
-
-    if [ ! -f /.dockerenv ]; then
-      py_sanity_ydktest_test_tcp	# This test fails in docker
-    fi
-}
-
-function py_sanity_ydktest_test_netconf_ssh {
-    print_msg "Running py_sanity_ydktest_test_netconf_ssh"
-
-    run_test sdk/python/core/tests/test_netconf_operations.py
-    run_test sdk/python/core/tests/test_opendaylight.py
-    run_test sdk/python/core/tests/test_restconf_provider.py
-    run_test sdk/python/core/tests/test_sanity_delete.py
-    run_test sdk/python/core/tests/test_sanity_errors.py
-    run_test sdk/python/core/tests/test_sanity_filter_read.py
-    run_test sdk/python/core/tests/test_sanity_filters.py
-    run_test sdk/python/core/tests/test_sanity_levels.py
-    run_test sdk/python/core/tests/test_sanity_netconf.py
-    run_test sdk/python/core/tests/test_sanity_path.py
-    run_test sdk/python/core/tests/test_netconf_provider.py
-    run_test sdk/python/core/tests/test_sanity_service_errors.py
-    run_test sdk/python/core/tests/test_sanity_type_mismatch_errors.py
-    run_test sdk/python/core/tests/test_sanity_types.py
-    run_test sdk/python/core/tests/test_non_top_operations.py
-    run_test sdk/python/core/tests/test_sanity_executor_rpc.py
-}
-
-function py_sanity_ydktest_test_tcp {
-    print_msg "Running py_sanity_ydktest_test_tcp"
-    run_test sdk/python/core/tests/test_sanity_netconf.py tcp://admin:admin@127.0.0.1:12307
-    # init_confd_ydktest
-    # print_msg "Running py_sanity_ydktest_test_tcp with on-demand=false"
-    # run_test sdk/python/core/tests/test_sanity_netconf.py tcp://admin:admin@127.0.0.1:12307 --non-demand
-}
-
-#--------------------------
-# Python deviation tests
-#--------------------------
-
-function py_sanity_deviation {
-    print_msg "Running py_sanity_deviation"
-
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
-
-    py_sanity_deviation_ydktest_test
-
-    py_sanity_deviation_bgp_test
-}
-
-function py_sanity_deviation_ydktest_test {
-    print_msg "Running py_sanity_deviation_ydktest_test"
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json -i
-    run_test sdk/python/core/tests/test_sanity_deviation.py
-    run_test sdk/python/core/tests/test_sanity_deviation.py --non-demand
-}
-
-function py_sanity_deviation_bgp_test {
-    print_msg "Running py_sanity_deviation_bgp_test"
-    run_test generate.py --bundle profiles/test/deviation.json -i
-    run_test sdk/python/core/tests/test_sanity_deviation_bgp.py
-    run_test sdk/python/core/tests/test_sanity_deviation_bgp.py --non-demand
-}
-
-#--------------------------
-# Python augmentation tests
-#--------------------------
-
-function py_sanity_augmentation {
-    print_msg "Running py_sanity_augmentation_test"
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest-augmentation.json -i
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/augmentation
-
-    run_test sdk/python/core/tests/test_sanity_augmentation.py
-    run_test sdk/python/core/tests/test_sanity_augmentation.py --non-demand
-    run_test sdk/python/core/tests/test_on_demand.py
-}
-
-function py_sanity_common_cache {
-    print_msg "Running py_sanity_common_cache"
-
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
-    run_test sdk/python/core/tests/test_sanity_deviation.py --common-cache
-
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/augmentation
-    run_test sdk/python/core/tests/test_sanity_augmentation.py --common-cache
-
-    init_confd_ydktest
-    run_test sdk/python/core/tests/test_sanity_levels.py --common-cache
-    run_test sdk/python/core/tests/test_sanity_types.py --common-cache
-}
-
-function py_sanity_one_class_per_module {
-    print_msg "Running Running one class per module tests"
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest.json -oi
-
-    init_confd_ydktest
-    run_test sdk/python/core/tests/test_sanity_levels.py
-    run_test sdk/python/core/tests/test_sanity_types.py
-
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json -i
-}
-
-#-------------------------------------
-# Python generated model tests bundle
-#-------------------------------------
-
-function test_gen_tests {
-    print_msg "test_gen_tests"
-
-    cd $YDKGEN_HOME
-    git clone https://github.com/psykokwak4/ydk-test-yang.git sdk/cpp/core/tests/confd/testgen
-
-    py_test_gen
-    cpp_test_gen
-}
-
-function py_test_gen_test {
-    print_msg "py_test_gen_test"
-
-    cd $YDKGEN_HOME
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/testgen/confd
-    cd gen-api/python/models_test-bundle/ydk/models/models_test/test/
-    ${PYTHON_BIN} import_tests.py
-    cd models_test/
-    ${PYTHON_BIN} -m unittest discover
-}
-
-function py_test_gen {
-    print_msg "py_test_gen"
-
-    cd $YDKGEN_HOME
-    run_test generate.py -is --core --python
-    run_test generate.py --bundle profiles/test/ydk-models-test.json  --generate-tests --python &> /dev/null
-    pip_check_install gen-api/python/models_test-bundle/dist/ydk*.tar.gz
-
-    # py_test_gen_test
-}
-
-function run_python_oc_nis_tests {
-    print_msg "Installing ydktest_oc_nis bundle"
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest-oc-nis.json
-    pip_check_install gen-api/python/ydktest_oc_nis-bundle/dist/ydk*.tar.gz
-
-    print_msg "Running ydktest_oc_nis bundle tests"
-    run_test sdk/python/core/tests/test_oc_nis.py
-}
-
-function build_and_run_python_gnmi_tests {
-    build_python_gnmi_package
-    run_python_gnmi_tests
-}
-
-function build_python_gnmi_package {
-    print_msg "Installing gNMI package for Python"
-    cd $YDKGEN_HOME
-    run_test generate.py -i --service profiles/services/gnmi-0.4.0.json
-}
-
-function run_python_gnmi_tests {
-    print_msg "Run Python gNMI tests"
-
-    start_gnmi_server
-
-    run_test sdk/python/gnmi/tests/test_gnmi_session.py
-    run_test sdk/python/gnmi/tests/test_gnmi_crud.py
-    run_test sdk/python/gnmi/tests/test_gnmi_service.py < $YDKGEN_HOME/test/gnmi_subscribe_poll_input.txt
-
-    stop_gnmi_server
-}
-
-function start_gnmi_server {
-    current_dir="$(pwd)"
-    cd $YDKGEN_HOME/test/gnmi_server
-    if [ ! -x ./build/gnmi_server ]; then
-        print_msg "Building YDK gNMI server"
-        mkdir -p build && cd build
-        ${CMAKE_BIN} .. && make
-    fi
-
-    print_msg "Starting YDK gNMI server"
-    cd $YDKGEN_HOME/test/gnmi_server/build
-    ./gnmi_server &
-    local status=$?
-    if [ $status -ne 0 ]; then
-        print_msg "Could not start gNMI server"
-        exit $status
-    fi
-    cd $current_dir
-}
-
-function stop_gnmi_server {
-    print_msg "Stopping gNMI server"
-    pkill -f gnmi_server
-}
-
-#-------------------------------------
-# Meta-data test
-#-------------------------------------
-
-function run_py_metadata_test {
-    print_msg "Building ydktest bundle with metadata"
-    cd $YDKGEN_HOME
-    run_test generate.py -i --bundle profiles/test/ydktest-cpp.json --generate-meta
-
-    print_msg "Running metadata test"
-    run_test sdk/python/core/tests/test_meta.py
-}
-
-#-------------------------------------
-# Script environment setup
-#-------------------------------------
-
-function init_script_env {
-    RED='\033[0;31m'
-    GREEN='\033[1;32m'
-    NOCOLOR='\033[0m'
-    YELLOW='\033[1;33m'
-    MSG_COLOR=$YELLOW
-
-    curr_dir="$(pwd)"
-    os_type=$(uname)
-    if [[ ${os_type} == "Linux" ]]; then
-        os_info=$(cat /etc/*-release)
-    elif [[ ${os_type} == "Darwin" ]]; then
-        os_info=$(sw_vers)
-    else
-        MSG_COLOR=${RED}
-        print_msg "Unsupported OS type '${os_type}' detected"
-        exit 1
-    fi
-    print_msg "Running OS type: $os_type"
-    print_msg "OS info: $os_info"
-
-    CMAKE_BIN=cmake
-    which cmake3
-    status=$?
-    if [[ ${status} == 0 ]] ; then
-        CMAKE_BIN=cmake3
-    fi
-
-    script_dir=$(cd $(dirname ${BASH_SOURCE}) && pwd)
-    if [ -z ${YDKGEN_HOME} ] || [ ! -d ${YDKGEN_HOME} ]; then
-        export YDKGEN_HOME=$(cd $script_dir/.. && pwd)
-        print_msg "YDKGEN_HOME is set to ${YDKGEN_HOME}"
-    fi
-
-    if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]]; then
-      if [[ $LD_LIBRARY_PATH != *"protobuf-3.5.0"* ]]; then
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
-      fi
-      centos_version=$(echo `lsb_release -r` | awk '{ print $2 }' | cut -d '.' -f 1)
-    fi
-
-    cd $YDKGEN_HOME
-}
-
-########################## EXECUTION STARTS HERE #############################
-#
-init_script_env
-init_python_env
-
-install_py_core
-
-run_python_bundle_tests
-
-#run_python_oc_nis_tests
-
-run_py_metadata_test
-
-build_and_run_python_gnmi_tests
-
-$script_dir/clean_test_env.sh
-
-cd $curr_dir
diff --git a/test/tests.sh b/test/tests.sh
index 25206f019..3521fe09b 100755
--- a/test/tests.sh
+++ b/test/tests.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 #  ----------------------------------------------------------------
-# YDK = YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
-# ------------------------------------------------------------------
+# Copyright 2016 Cisco Systems
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -21,7 +20,7 @@
 # All rights reserved under Apache License, Version 2.0.
 # ------------------------------------------------------------------
 #
-# Script for running YDK unit tests on travis-ci.com
+# Script for running ydk CI on travis-ci.org
 #
 # ------------------------------------------------------------------
 
@@ -36,39 +35,27 @@ MSG_COLOR=$YELLOW
 ######################################################################
 
 function print_msg {
-    echo -e "${MSG_COLOR}*** $(date): tests.sh | $* ${NOCOLOR}"
-}
-
-function run_cmd {
-    $*
-    local status=$?
-    if [ $status -ne 0 ]; then
-        MSG_COLOR=$RED
-        print_msg "Exiting with status=$status"
-        exit $status
-    fi
-    return $status
+    echo -e "${MSG_COLOR}*** $(date): tests.sh | $@ ${NOCOLOR}"
 }
 
 function run_exec_test {
-    print_msg "Executing: $*"
-    $*
+    $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting with status=$status"
+        print_msg "Exiting '$@' with status=$status"
         exit $status
     fi
     return $status
 }
 
 function run_test_no_coverage {
-    print_msg "Executing: ${PYTHON_BIN} $*"
-    ${PYTHON_BIN} $*
+    print_msg "Executing: ${PYTHON_BIN} $@"
+    ${PYTHON_BIN} $@
     local status=$?
     if [ $status -ne 0 ]; then
         MSG_COLOR=$RED
-        print_msg "Exiting with status=$status"
+        print_msg "Exiting '${PYTHON_BIN} $@' with status=$status"
         exit $status
     fi
     return $status
@@ -76,17 +63,17 @@ function run_test_no_coverage {
 
 function run_test {
     if [[ $(command -v coverage) && $run_with_coverage ]]; then
-        print_msg "Executing with coverage: $*"
-        coverage run --omit=/usr/* --branch --parallel-mode $*
+        print_msg "Executing with coverage: $@"
+        coverage run --omit=/usr/* --branch --parallel-mode $@ > /dev/null
         local status=$?
         if [ $status -ne 0 ]; then
             MSG_COLOR=$RED
-            print_msg "Exiting 'coverage run $*' with status=$status"
+            print_msg "Exiting 'coverage run $@' with status=$status"
             exit $status
         fi
         return $status
     fi
-    run_test_no_coverage $*
+    run_test_no_coverage $@
     local status=$?
     return $status
 }
@@ -94,10 +81,10 @@ function run_test {
 function pip_check_install {
     if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* && ${PYTHON_VERSION} == "2"* ]]
     then
-        print_msg "Custom pip install of $* for CentOS"
-        ${PIP_BIN} install --install-option="--install-purelib=/usr/lib64/python${PYTHON_VERSION}/site-packages" --no-deps -U $*
+        print_msg "Custom pip install of $@ for CentOS"
+        ${PIP_BIN} install --install-option="--install-purelib=/usr/lib64/python${PYTHON_VERSION}/site-packages" --no-deps -U $@
     else
-        ${PIP_BIN} install --no-deps -U $*
+        ${PIP_BIN} install --no-deps -U $@
     fi
 }
 
@@ -105,35 +92,20 @@ function pip_check_install {
 # Environment setup-teardown functions
 ######################################################################
 
-function init_confd_rc {
-    print_msg "Initializing confd resource"
-    source $HOME/confd/confdrc
-    confd_version=$(confd --version)
-}
-
 function init_confd {
     cd $1
     print_msg "Initializing confd in $(pwd)"
-    run_cmd make stop > /dev/null
-    run_cmd make clean > /dev/null
-    run_cmd make all > /dev/null
-    run_cmd make start
+    source $HOME/confd/confdrc
+    run_exec_test make stop > /dev/null
+    run_exec_test make clean > /dev/null
+    run_exec_test make all > /dev/null
+    run_exec_test make start
     cd -
-
-    if [[ ! -d $HOME/.ydk/127.0.0.1 ]]; then
-      mkdir -p $HOME/.ydk
-      mkdir -p $HOME/.ydk/127.0.0.1
-    fi
-    rm -f $HOME/.ydk/127.0.0.1/*
-
-    # Correct issue with confd 7.3
-    if [[ $confd_version > "7.2." ]]; then
-      cp ${YDKGEN_HOME}/sdk/cpp/core/tests/models/ietf-interfaces.yang $HOME/.ydk/127.0.0.1/
-    fi
 }
 
 function init_confd_ydktest {
     init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/ydktest
+    rm -rf $HOME/.ydk/127.0.0.1
 }
 
 function init_rest_server {
@@ -172,16 +144,10 @@ function check_python_installation {
     fi
   fi
 
-  if [[ ! $run_with_coverage ]]; then
-    if [[ -z ${PYTHON_VENV} ]]; then
-      PYTHON_VENV=${HOME}/venv
-      print_msg "Python virtual environment location is set to ${PYTHON_VENV}"
-    fi
-    if [[ ! -d ${PYTHON_VENV} ]]; then
-      print_msg "Creating Python3 virtual environment in ${PYTHON_VENV}"
-      run_cmd python3 -m venv ${PYTHON_VENV}
-    fi
-    run_cmd source ${PYTHON_VENV}/bin/activate
+  if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* && ${PYTHON_VERSION} == "3"* ]]; then
+    print_msg "Creating Python3 virtual environment in $YDKGEN_HOME/venv"
+    run_exec_test ${PYTHON_BIN} -m venv $HOME/venv
+    run_exec_test source $HOME/venv/bin/activate
   fi
 
   print_msg "Checking installation of ${PYTHON_BIN}"
@@ -207,7 +173,7 @@ function check_python_installation {
 function init_py_env {
   check_python_installation
   print_msg "Initializing Python requirements"
-  ${PIP_BIN} install -r requirements.txt
+  ${PIP_BIN} install -r requirements.txt pybind11==2.2.2
   if [[ $run_with_coverage ]] ; then
     ${PIP_BIN} install coverage
   fi
@@ -215,10 +181,10 @@ function init_py_env {
 
 function init_go_env {
     print_msg "Initializing Go environment"
-    cd $YDKGEN_HOME
+
     if [[ $(uname) == "Darwin" ]]; then
         if [[ $GOPATH. == "." ]]; then
-            export GOPATH="$HOME/go"
+            export GOPATH="$(pwd)/golang"
         fi
         print_msg "GOROOT: $GOROOT"
         print_msg "GOPATH: $GOPATH"
@@ -232,7 +198,7 @@ function init_go_env {
         export PATH=$GOROOT/bin:$PATH
 
         if [[ $GOPATH. == "." ]]; then
-            export GOPATH="$HOME/go"
+            export GOPATH="$HOME/golang"
             mkdir -p $GOPATH
             print_msg "Setting GOPATH to $GOPATH"
         else
@@ -242,18 +208,13 @@ function init_go_env {
     go_version=$(echo `go version` | awk '{ print $3 }' | cut -d 'o' -f 2)
     print_msg "Current Go version is $go_version"
 
-    if [ ! -d $GOPATH/src/github.com/stretchr/testify ]; then
-        go get github.com/stretchr/testify
-        cd $GOPATH/src/github.com/stretchr/testify
-        git checkout tags/v1.6.1
-        cd -
-    fi
+    go get github.com/stretchr/testify
+    cd $GOPATH/src/github.com/stretchr/testify
+    git checkout tags/v1.6.1
+    cd -
 
     export CGO_ENABLED=1
     export CGO_LDFLAGS_ALLOW="-fprofile-arcs|-ftest-coverage|--coverage"
-    if [[ $go_version > "1.11." ]]; then
-        go env -w GO111MODULE=off
-    fi
 }
 
 ######################################################################
@@ -261,6 +222,7 @@ function init_go_env {
 ######################################################################
 
 function install_test_cpp_core {
+    print_msg "Installing / testing C++ core"
     install_cpp_core
     run_cpp_core_test
 
@@ -284,7 +246,7 @@ function install_cpp_core {
       run_exec_test ${CMAKE_BIN} ..
     fi
     print_msg "Compiling C++ core library"
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
     sudo make install
 }
 
@@ -293,7 +255,7 @@ function generate_libydk {
     cd $YDKGEN_HOME
     run_test generate.py --libydk
     cd gen-api/cpp/ydk/build
-    sudo make package &> /dev/null
+    sudo make package || true
     cp libydk*rpm libydk*deb /ydk-gen &> /dev/null
     cd -
 }
@@ -386,10 +348,10 @@ function generate_install_specified_cpp_bundle {
    bundle_profile=$1
    bundle_name=$2
 
-   run_test generate.py --bundle ${bundle_profile} --cpp
+   run_test generate.py --bundle ${bundle_profile} --cpp &> /dev/null
    cd gen-api/cpp/${bundle_name}/build
-   run_cmd make &> /dev/null
-   run_cmd sudo make install
+   run_exec_test make &> /dev/null
+   run_exec_test sudo make install
    cd -
 }
 
@@ -397,8 +359,8 @@ function cpp_sanity_ydktest_gen_install {
     print_msg "Generating and installing C++ ydktest bundle"
     generate_install_specified_cpp_bundle profiles/test/ydktest-cpp.json ydktest-bundle
 
-#    print_msg "Generating and installing C++ ydktest-oc-nis bundle"
-#    generate_install_specified_cpp_bundle profiles/test/ydktest-oc-nis.json ydktest_oc_nis-bundle
+    print_msg "Generating and installing C++ ydktest-oc-nis bundle"
+    generate_install_specified_cpp_bundle profiles/test/ydktest-oc-nis.json ydktest_oc_nis-bundle
 }
 
 function cpp_sanity_ydktest_test {
@@ -409,6 +371,7 @@ function cpp_sanity_ydktest_test {
     sudo touch /var/confd/homes/admin/.ssh/authorized_keys
     cd $YDKGEN_HOME
     sudo sh -c 'cat sdk/cpp/tests/ssh_host_rsa_key.pub >> /var/confd/homes/admin/.ssh/authorized_keys'
+    cd -
 
     print_msg "Building and running C++ bundle tests"
     mkdir -p $YDKGEN_HOME/sdk/cpp/tests/build && cd sdk/cpp/tests/build
@@ -418,7 +381,7 @@ function cpp_sanity_ydktest_test {
     else
       run_exec_test ${CMAKE_BIN} ..
     fi
-    run_cmd make &> /dev/null
+    run_exec_test make &> /dev/null
 
     #export CTEST_OUTPUT_ON_FAILURE=1
     #make test
@@ -441,8 +404,8 @@ function cpp_test_gen_test {
     init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/testgen/confd
     mkdir -p gen-api/cpp/models_test-bundle/ydk/models/models_test/test/build
     cd gen-api/cpp/models_test-bundle/ydk/models/models_test/test/build
-    run_cmd ${CMAKE_BIN} ..
-    run_cmd make &> /dev/null
+    run_exec_test ${CMAKE_BIN} ..
+    run_exec_test make &> /dev/null
     ctest --output-on-failure
 }
 
@@ -450,10 +413,10 @@ function cpp_test_gen {
     print_msg "cpp_test_gen"
 
     cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydk-models-test.json --generate-tests --cpp
+    run_test generate.py --bundle profiles/test/ydk-models-test.json --generate-tests --cpp &> /dev/null
     cd gen-api/cpp/models_test-bundle/build/
-    run_cmd make &> /dev/null
-    run_cmd sudo make install
+    run_exec_test make &> /dev/null
+    run_exec_test sudo make install
 
     # cpp_test_gen_test
 }
@@ -476,6 +439,7 @@ function collect_cpp_coverage {
 
 function run_go_bundle_tests {
     print_msg "Generating/installing go sanity bundle tests"
+    # TODO: go get
     cd $YDKGEN_HOME
     run_test generate.py -i --bundle profiles/test/ydktest-cpp.json --go
 
@@ -483,17 +447,20 @@ function run_go_bundle_tests {
 }
 
 function run_go_tests {
-    export CXX=/usr/bin/c++
-    export CC=/usr/bin/cc
-
-    print_msg "CC: ${CC}"
-    print_msg "CXX: ${CXX}"
+    print_msg "Running go tests"
     run_go_samples
     run_go_sanity_tests
 }
 
 function run_go_samples {
     print_msg "Running go samples"
+
+    export CXX=/usr/bin/c++
+    export CC=/usr/bin/cc
+
+    print_msg "CC: ${CC}"
+    print_msg "CXX: ${CXX}"
+
     cd $YDKGEN_HOME/sdk/go/core/samples
     run_exec_test go run cgo_path/cgo_path.go
     run_exec_test go run bgp_create/bgp_create.go -device ssh://admin:admin@localhost:12022
@@ -503,14 +470,13 @@ function run_go_samples {
 }
 
 function run_go_sanity_tests {
+    print_msg "Running go sanity tests"
     cd $YDKGEN_HOME/sdk/go/core/tests
     if [[ $run_with_coverage ]] ; then
-        print_msg "Running go sanity tests with coverage"
-        run_exec_test go test -race -coverpkg="github.com/CiscoDevNet/ydk-go/ydk/providers","github.com/CiscoDevNet/ydk-go/ydk/services","github.com/CiscoDevNet/ydk-go/ydk/types","github.com/CiscoDevNet/ydk-go/ydk/types/datastore","github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format","github.com/CiscoDevNet/ydk-go/ydk/types/protocol","github.com/CiscoDevNet/ydk-go/ydk/types/yfilter","github.com/CiscoDevNet/ydk-go/ydk/types/ylist","github.com/CiscoDevNet/ydk-go/ydk","github.com/CiscoDevNet/ydk-go/ydk/path" -coverprofile=coverage.txt -covermode=atomic
+        run_exec_test go test -race -coverpkg="github.com/CiscoDevNet/ydk-go/ydk/providers","github.com/CiscoDevNet/ydk-go/ydk/services","github.com/CiscoDevNet/ydk-go/ydk/types","github.com/CiscoDevNet/ydk-go/ydk/types/datastore","github.com/CiscoDevNet/ydk-go/ydk/types/encoding_format","github.com/CiscoDevNet/ydk-go/ydk/types/protocol","github.com/CiscoDevNet/ydk-go/ydk/types/yfilter","github.com/CiscoDevNet/ydk-go/ydk/types/ytype","github.com/CiscoDevNet/ydk-go/ydk","github.com/CiscoDevNet/ydk-go/ydk/path" -coverprofile=coverage.txt -covermode=atomic
         print_msg "Moving go coverage to ${YDKGEN_HOME}"
         mv coverage.txt ${YDKGEN_HOME}
     else
-        print_msg "Running go sanity tests"
         run_exec_test go test
     fi
     cd -
@@ -523,8 +489,8 @@ function run_go_sanity_tests {
 function run_python_bundle_tests {
     print_msg "Running python bundle tests"
     py_sanity_ydktest
-    if [[ ${os_type} != "Darwin" && .$confd_version < ".7.3" ]]; then
-        # GitHub issue #890
+    if [[ ${os_type} != "Darwin" ]] ; then
+        # GitHub issue #909
         py_sanity_deviation
     fi
     py_sanity_augmentation
@@ -551,18 +517,20 @@ function py_sanity_ydktest {
 }
 
 function py_sanity_ydktest_gen {
+    print_msg "Generating python ydk core and ydktest bundle"
+
     cd $YDKGEN_HOME
 
-    print_msg "Testing ydktest bundle generation"
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json --python
+    print_msg "py_sanity_ydktest_gen: testing bundle and documentation generation"
+    run_test generate.py --bundle profiles/test/ydktest-cpp.json --python --generate-doc &> /dev/null
 
-    print_msg "Testing core and bundle documentation generation"
-    run_test generate.py --core --generate-doc
+    print_msg "py_sanity_ydktest_gen: testing core and documentation generation"
+    run_test generate.py --core
 }
 
 function py_sanity_ydktest_install {
+    print_msg "Running py_sanity_ydktest_install"
     cd $YDKGEN_HOME
-    print_msg "Running ydktest bundle installation"
     pip_check_install gen-api/python/ydktest-bundle/dist/ydk*.tar.gz
 
     print_msg "Running import tests on generated bundle"
@@ -600,7 +568,7 @@ function py_sanity_ydktest_test {
     fi
 
     cd $YDKGEN_HOME/sdk/python/core/
-    rm -rf *.so ydk/models/*
+    rm -f *.so
 
     print_msg "Restoring YDK core installation"
     ${PYTHON_BIN} setup.py sdist
@@ -616,9 +584,9 @@ function run_py_sanity_ydktest_tests {
 
     py_sanity_ydktest_test_netconf_ssh
 
-    if [ ! -f /.dockerenv ]; then
-      py_sanity_ydktest_test_tcp	# This test fails in docker
-    fi
+#    if [[ ${os_info} == *"xenial"* ]]; then
+#      py_sanity_ydktest_test_tcp	# This test fails in docker
+#    fi
 
     stop_tcp_server
 }
@@ -642,11 +610,22 @@ function py_sanity_ydktest_test_netconf_ssh {
     run_test sdk/python/core/tests/test_sanity_types.py
     run_test sdk/python/core/tests/test_non_top_operations.py
     run_test sdk/python/core/tests/test_entity_diff.py
-    run_test_no_coverage sdk/python/core/tests/test_sanity_executor_rpc.py
+#    run_test_no_coverage sdk/python/core/tests/test_sanity_executor_rpc.py
   if [[ ${os_type} != "Darwin" ]] ; then
     print_msg "Running py_sanity_ydktest_test_netconf_ssh with no on-demand"
     run_test sdk/python/core/tests/test_netconf_operations.py --non-demand
     run_test sdk/python/core/tests/test_sanity_delete.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_errors.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_filter_read.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_filters.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_levels.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_netconf.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_path.py --non-demand
+    run_test sdk/python/core/tests/test_netconf_provider.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_service_errors.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_type_mismatch_errors.py --non-demand
+    run_test sdk/python/core/tests/test_sanity_types.py --non-demand
+#    run_test_no_coverage sdk/python/core/tests/test_sanity_executor_rpc.py --non-demand
   fi
 }
 
@@ -658,41 +637,101 @@ function py_sanity_ydktest_test_tcp {
 }
 
 #--------------------------
-# Python deviation tests
+# Python deviation bundle
 #--------------------------
 
 function py_sanity_deviation {
-    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
-
+    rm -rf $HOME/.ydk/*
+    py_sanity_deviation_ydktest_gen
+    py_sanity_deviation_ydktest_install
     py_sanity_deviation_ydktest_test
 
+    py_sanity_deviation_bgp_gen
+    py_sanity_deviation_bgp_install
     py_sanity_deviation_bgp_test
+    rm -rf $HOME/.ydk/*
+}
+
+function py_sanity_deviation_ydktest_gen {
+    print_msg "Running py_sanity_deviation_ydktest_gen"
+
+    cd $YDKGEN_HOME
+    rm -rf gen-api/python/*
+    run_test generate.py --bundle profiles/test/ydktest-cpp.json --python
+}
+
+function py_sanity_deviation_ydktest_install {
+    print_msg "Running py_sanity_deviation_ydktest_install"
+
+    ${PIP_BIN} uninstall ydk-models-ydktest -y
+    pip_check_install gen-api/python/ydktest-bundle/dist/ydk*.tar.gz
 }
 
 function py_sanity_deviation_ydktest_test {
     print_msg "Running py_sanity_deviation_ydktest_test"
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json -i
+
+    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
     run_test sdk/python/core/tests/test_sanity_deviation.py
 #    run_test sdk/python/core/tests/test_sanity_deviation.py --non-demand
 }
 
+function py_sanity_deviation_bgp_gen {
+    print_msg "Running py_sanity_deviation_bgp_gen"
+
+    rm -rf gen-api/python/*
+    cd $YDKGEN_HOME
+    run_test generate.py --bundle profiles/test/deviation.json --verbose
+}
+
+function py_sanity_deviation_bgp_install {
+    print_msg "Running py_sanity_deviation_bgp_install"
+
+    cd $YDKGEN_HOME
+    pip_check_install gen-api/python/deviation-bundle/dist/*.tar.gz
+}
+
 function py_sanity_deviation_bgp_test {
     print_msg "Running py_sanity_deviation_bgp_test"
-    cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/deviation.json --verbose -i
+
     run_test sdk/python/core/tests/test_sanity_deviation_bgp.py
 #    run_test sdk/python/core/tests/test_sanity_deviation_bgp.py --non-demand
 }
 
 #--------------------------
-# Python augmentation tests
+# Python augmentation bundle
 #--------------------------
 function py_sanity_augmentation {
-    print_msg "Running py_sanity_augmentation_test"
+    print_msg "Running py_sanity_augmentation"
+
+    rm -rf $HOME/.ydk/*
+    py_sanity_augmentation_gen
+    py_sanity_augmentation_install
+    py_sanity_augmentation_test
+    rm -rf $HOME/.ydk/*
+}
+
+function py_sanity_augmentation_gen {
+    print_msg "Running py_sanity_augmentation_gen"
+
+    cd $YDKGEN_HOME && rm -rf gen-api/python/*
+    run_test generate.py --core
+    run_test generate.py --bundle profiles/test/ydktest-augmentation.json
+}
+
+function py_sanity_augmentation_install {
+    print_msg "Running py_sanity_augmentation_install"
+
     cd $YDKGEN_HOME
+    ${PIP_BIN} uninstall ydk -y
+    ${PIP_BIN} install gen-api/python/ydk/dist/ydk*.tar.gz
+    pip_check_install gen-api/python/augmentation-bundle/dist/*.tar.gz
+}
+
+function py_sanity_augmentation_test {
+    print_msg "Running py_sanity_augmentation_test"
+
     init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/augmentation
-    run_test generate.py --bundle profiles/test/ydktest-augmentation.json -i
+
     run_test sdk/python/core/tests/test_sanity_augmentation.py
 #    run_test sdk/python/core/tests/test_sanity_augmentation.py --non-demand
     run_test sdk/python/core/tests/test_on_demand.py
@@ -701,17 +740,18 @@ function py_sanity_augmentation {
 function py_sanity_common_cache {
     print_msg "Running py_sanity_common_cache"
 
-    if [[ ${os_type} != "Darwin" && .$confd_version < ".7.3" ]]; then
-        # GitHub issue #890
-        init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
-        run_test sdk/python/core/tests/test_sanity_deviation.py --common-cache
-    fi
+    rm -rf $HOME/.ydk/*
+  if [[ ${os_type} != "Darwin" ]] ; then
+    # GitHub issue #909
+    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/deviation
+    run_test sdk/python/core/tests/test_sanity_deviation.py --common-cache
+  fi
     init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/augmentation
     run_test sdk/python/core/tests/test_sanity_augmentation.py --common-cache
 
-    init_confd_ydktest
     run_test sdk/python/core/tests/test_sanity_levels.py --common-cache
     run_test sdk/python/core/tests/test_sanity_types.py --common-cache
+    rm -rf $HOME/.ydk/*
 }
 
 function py_sanity_run_limited_tests {
@@ -729,21 +769,53 @@ function py_sanity_one_class_per_module {
     print_msg "**********************************"
     print_msg "Running ONE CLASS PER MODULE TESTS"
     cd $YDKGEN_HOME
-    run_test generate.py --bundle profiles/test/ydktest-cpp.json -o
+    run_test generate.py --bundle profiles/test/ydktest-cpp.json -o > /dev/null
+    py_sanity_run_limited_tests
+}
+
+function run_py_backward_compatibility {
+    print_msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+    print_msg "Running YDK-0.7.3 BUNDLE BACKWARD COMPATIBILITY TESTS"
+    cd $YDKGEN_HOME
+    CURRENT_GIT_REV=$(git rev-parse HEAD)
+    git checkout 454ffc06ec79995832538642638e03259e622b53
+    run_test generate.py --bundle profiles/test/ydktest-cpp.json > /dev/null
     init_confd_ydktest
     py_sanity_run_limited_tests
+    git checkout ${CURRENT_GIT_REV}
 }
 
 #-------------------------------------
 # Python generated model tests bundle
 #-------------------------------------
 
+#function test_gen_tests {
+#    print_msg "test_gen_tests"
+#
+#    cd $YDKGEN_HOME
+#    git clone https://github.com/psykokwak4/ydk-test-yang.git sdk/cpp/core/tests/confd/testgen
+#
+#    py_test_gen
+#    cpp_test_gen
+#}
+
+#function py_test_gen_test {
+#    print_msg "py_test_gen_test"
+#
+#    cd $YDKGEN_HOME
+#    init_confd $YDKGEN_HOME/sdk/cpp/core/tests/confd/testgen/confd
+#    cd gen-api/python/models_test-bundle/ydk/models/models_test/test/
+#    ${PYTHON_BIN} import_tests.py
+#    cd models_test/
+#    ${PYTHON_BIN} -m unittest discover
+#}
+
 function py_test_gen {
     print_msg "py_test_gen"
 
     cd $YDKGEN_HOME
     run_test generate.py --core --python
-    run_test generate.py --bundle profiles/test/ydk-models-test.json --generate-tests --python
+    run_test generate.py --bundle profiles/test/ydk-models-test.json  --generate-tests --python &> /dev/null
     ${PIP_BIN} install gen-api/python/ydk/dist/ydk*.tar.gz
     pip_check_install gen-api/python/models_test-bundle/dist/ydk*.tar.gz
 
@@ -831,11 +903,11 @@ else
 fi
 print_msg "Running OS type: $os_type"
 print_msg "OS info: $os_info"
-if [[ ${os_type} == "Linux" && ${os_info} != *"fedora"* ]] ; then
+if [[ ${os_type} == "Linux" && ${os_info} != *"trusty"* && ${os_info} != *"fedora"* ]] ; then
     run_with_coverage=1
 fi
 
-export YDKGEN_HOME=$(pwd)
+export YDKGEN_HOME="$(pwd)"
 print_msg "YDKGEN_HOME is set to: ${YDKGEN_HOME}"
 
 CMAKE_BIN=cmake
@@ -846,19 +918,15 @@ if [[ ${status} == 0 ]] ; then
 fi
 
 if [[ $(uname) == "Linux" && ${os_info} == *"fedora"* ]] ; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/usr/lib64
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib64:/usr/local/lib64:/usr/local/lib
    print_msg "LD_LIBRARY_PATH is set to: $LD_LIBRARY_PATH"
-   centos_version=$(echo `lsb_release -r` | awk '{ print $2 }' | cut -d '.' -f 1)
 fi
 
 init_py_env
-init_confd_rc
 init_confd_ydktest
 init_rest_server
 init_tcp_server
 
-print_msg "Using confd-basic-$confd_version for running unit tests"
-
 ######################################
 # Install and run C++ core tests
 ######################################
@@ -868,26 +936,20 @@ run_cpp_bundle_tests
 ######################################
 # Install and run Go tests
 ######################################
-if [[ ${os_info} != *"focal"* ]]; then
-  # TODO: issue running go tests on ubuntu:focal
-  # execution unexpectedly stalls.
-  # The tests are passing well on platform and docker
-  # GitHub issue #1028
-  init_go_env
-  install_go_core
-  run_go_bundle_tests
-fi
+init_go_env
+install_go_core
+run_go_bundle_tests
 
 ######################################
 # Install and run Python tests
 ######################################
 install_py_core
 run_python_bundle_tests
-#run_python_oc_nis_tests
+run_python_oc_nis_tests
 run_py_metadata_test
-if [[ .$confd_version < ".7.3" ]]; then
-  run_py_backward_compatibility
-fi
+run_py_backward_compatibility
+
+# test_gen_tests
 
 ######################################
 # Documentation tests
diff --git a/ydkgen/api_model.py b/ydkgen/api_model.py
index 667789174..9a5c1d68f 100644
--- a/ydkgen/api_model.py
+++ b/ydkgen/api_model.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
   api_model.py
@@ -28,8 +22,8 @@
 """
 from __future__ import absolute_import
 
-from pyang.statements import TypeStatement
-from pyang.types import UnionTypeSpec, PathTypeSpec
+import sys
+from pyang.types import UnionTypeSpec
 
 
 class Element(object):
@@ -143,7 +137,10 @@ class NamedElement(Element):
 
     def __init__(self):
         """ The name of the named element """
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(NamedElement, self).__init__()
         self.name = None
 
     def get_py_mod_name(self):
@@ -273,7 +270,10 @@ class Package(NamedElement):
     """
 
     def __init__(self, iskeyword):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Package, self).__init__()
         self._stmt = None
         self._sub_name = ''
         self._bundle_name = ''
@@ -281,7 +281,6 @@ def __init__(self, iskeyword):
         self._augments_other = False
         self.identity_subclasses = {}
         self.iskeyword = iskeyword
-        self.version = '1'
 
     def qn(self):
         """ Return the qualified name """
@@ -298,7 +297,6 @@ def is_augment(self):
     @property
     def augments_other(self):
         return self._augments_other
-
     @augments_other.setter
     def augments_other(self, augments_other):
         self._augments_other = augments_other
@@ -352,8 +350,6 @@ def stmt(self, stmt):
         desc = stmt.search_one('description')
         if desc is not None:
             self.comment = desc.arg
-        if hasattr(stmt, 'i_version'):
-            self.version = stmt.i_version
 
     def imported_types(self):
         """
@@ -381,7 +377,10 @@ class DataType(NamedElement):
     """
 
     def __init__(self):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(DataType, self).__init__()
 
 
 class Class(NamedElement):
@@ -391,7 +390,10 @@ class Class(NamedElement):
     """
 
     def __init__(self, iskeyword):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Class, self).__init__()
         self._stmt = None
         self._extends = []
         self._module = None
@@ -402,12 +404,11 @@ def extends(self):
         """ Returns the immediate super classes of this class. """
         if self.is_identity():
             base = []
-            base_stmts = self.stmt.search('base')
-            for base_stmt in base_stmts:
-                if hasattr(base_stmt, 'i_identity'):
-                    base_identity = base_stmt.i_identity
-                    if hasattr(base_identity, 'i_class'):
-                        base.append(base_identity.i_class)
+            base_stmt = self.stmt.search_one('base')
+            if base_stmt is not None and hasattr(base_stmt, 'i_identity'):
+                base_identity = base_stmt.i_identity
+                if hasattr(base_identity, 'i_class'):
+                    base.append(base_identity.i_class)
             return base
         else:
             return self._extends
@@ -462,7 +463,7 @@ def imported_types(self):
             prop_types = [p.property_type]
             if isinstance(p.property_type, UnionTypeSpec):
                 for child_type_stmt in p.property_type.types:
-                    prop_types.extend(_get_union_types(child_type_stmt))
+                    prop_types.extend(self._get_union_types(child_type_stmt, p))
             for prop_type in prop_types:
                 if isinstance(prop_type, Class) or isinstance(prop_type, Enum) or isinstance(prop_type, Bits):
                     if prop_type.get_package() != package:
@@ -471,10 +472,19 @@ def imported_types(self):
         # do this for nested classes too
         for nested_class in [clazz for clazz in self.owned_elements if isinstance(clazz, Class)]:
             imported_types.extend(
-                [c for c in nested_class.imported_types() if c not in imported_types])
+                [c for c in nested_class.imported_types() if not c in imported_types])
 
         return imported_types
 
+    def _get_union_types(self, type_stmt, p):
+        from .builder import TypesExtractor
+        prop_type = TypesExtractor().get_property_type(type_stmt)
+        prop_types = [prop_type]
+        if isinstance(prop_type, UnionTypeSpec):
+            for child_type_stmt in prop_type.types:
+                prop_types.extend(self._get_union_types(child_type_stmt, p))
+        return prop_types
+
     def get_dependent_siblings(self):
         ''' This will return all types that are referenced by this Class
         or nested Classes that are at the same level as this type within the package and are
@@ -598,7 +608,10 @@ class AnyXml(NamedElement):
     """
 
     def __init__(self):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(AnyXml, self).__init__()
         self._stmt = None
 
     @property
@@ -625,7 +638,10 @@ class Bits(DataType):
     """
 
     def __init__(self, iskeyword):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Bits, self).__init__()
         self._stmt = None
         self._dictionary = None
         self._pos_map = None
@@ -658,7 +674,7 @@ def stmt(self, stmt):
         # the name of the enumeration is derived either from the typedef
         # or the leaf under which it is defined
         leaf_or_typedef = stmt
-        while leaf_or_typedef.parent and leaf_or_typedef.keyword not in ['leaf', 'leaf-list', 'typedef']:
+        while leaf_or_typedef.parent is not None and not leaf_or_typedef.keyword in ('leaf', 'leaf-list', 'typedef'):
             leaf_or_typedef = leaf_or_typedef.parent
 
         name = '%s' % camel_case(leaf_or_typedef.arg)
@@ -688,7 +704,10 @@ class Property(NamedElement):
     """
 
     def __init__(self, iskeyword):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Property, self).__init__()
         self._stmt = None
         self.is_static = False
         self.featuring_classifiers = []
@@ -759,14 +778,14 @@ class Enum(DataType):
 
     """ Represents an enumeration. """
 
-    def __init__(self, iskeyword, typedef_stmt=None):
-        super().__init__()
+    def __init__(self, iskeyword):
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(Enum, self).__init__()
         self._stmt = None
         self.literals = []
         self.iskeyword = iskeyword
-        while typedef_stmt and typedef_stmt.keyword != 'typedef' and typedef_stmt.parent:
-            typedef_stmt = typedef_stmt.parent
-        self.typedef_stmt = typedef_stmt
 
     def get_package(self):
         """ Returns the Package that this enum is found in. """
@@ -784,13 +803,10 @@ def go_name(self):
         if hasattr(self, 'goName'):
             return self.goName
 
-        while stmt.parent and stmt.keyword not in ['leaf', 'leaf-list', 'typedef']:
+        while stmt.parent is not None and not stmt.keyword in ('leaf', 'leaf-list', 'typedef'):
             stmt = stmt.parent
 
-        name = stmt.arg
-        if self.typedef_stmt:
-            name = self.typedef_stmt.arg
-        name = escape_name(stmt.unclashed_arg if hasattr(stmt, 'unclashed_arg') else name)
+        name = escape_name(stmt.unclashed_arg if hasattr(stmt, 'unclashed_arg') else stmt.arg)
         name = camel_case(name)
         if self.iskeyword(name):
             name = '%s%s' % ('Y', name)
@@ -810,13 +826,10 @@ def stmt(self, stmt):
         # the name of the numeration is derived either from the typedef
         # or the leaf under which it is defined
         leaf_or_typedef = stmt
-        while leaf_or_typedef.parent and leaf_or_typedef.keyword not in ['leaf', 'leaf-list', 'typedef']:
+        while leaf_or_typedef.parent is not None and not leaf_or_typedef.keyword in ('leaf', 'leaf-list', 'typedef'):
             leaf_or_typedef = leaf_or_typedef.parent
 
-        name = leaf_or_typedef.arg
-        if self.typedef_stmt:
-            name = self.typedef_stmt.arg
-        name = camel_case(escape_name(name))
+        name = camel_case(escape_name(leaf_or_typedef.arg))
         if self.iskeyword(name) or self.iskeyword(name.lower()):
             name = '%s_' % name
 
@@ -825,17 +838,15 @@ def stmt(self, stmt):
 
         self.name = name
 
-        desc = None
-        if self.typedef_stmt:
-            desc = self.typedef_stmt.search_one('description')
-            if desc is None:
-                desc = stmt.search_one('description')
-                if desc is None:
-                    leaf_or_typedef.search_one('description')
-        if desc:
+        desc = stmt.search_one('description')
+        if desc is not None:
             self.comment = desc.arg
         else:
-            self.comment = ""
+            desc = leaf_or_typedef.search_one('description')
+            if desc is not None:
+                self.comment = desc.arg
+            else:
+                self.comment = ""
 
         for enum_stmt in stmt.search('enum'):
             literal = EnumLiteral(self.iskeyword)
@@ -848,7 +859,10 @@ class EnumLiteral(NamedElement):
     """ Represents an enumeration literal. """
 
     def __init__(self, iskeyword):
-        super().__init__()
+        if sys.version_info > (3,):
+            super().__init__()
+        else:
+            super(EnumLiteral, self).__init__()
         self._stmt = None
         self.value = None
         self.iskeyword = iskeyword
@@ -961,7 +975,7 @@ def _capitalize(s):
     result = ''.join([_capitalize(word) for word in input_text.split('-')])
     result = ''.join([_capitalize(word) for word in result.split('_')])
     if input_text.startswith('_'):
-        result = '_' + result
+        result = '_'+result;
     return result
 
 
@@ -996,17 +1010,3 @@ def escape_name(name):
     name = name.replace(';', '__SEMICOLON__')
 
     return name
-
-
-def _get_union_types(type_stmt):
-    from .builder import TypesExtractor
-    prop_type = TypesExtractor().get_property_type(type_stmt)
-    if isinstance(prop_type, TypeStatement):
-        prop_type = prop_type.i_type_spec
-    prop_type_specs = []
-    if isinstance(prop_type, UnionTypeSpec):
-        for child_type_stmt in prop_type.types:
-            prop_type_specs.extend(_get_union_types(child_type_stmt))
-    else:
-        prop_type_specs.append(prop_type)
-    return prop_type_specs
diff --git a/ydkgen/builder/_api_model_builder.py b/ydkgen/builder/_api_model_builder.py
index 204f58aa0..8ccfc8b8b 100644
--- a/ydkgen/builder/_api_model_builder.py
+++ b/ydkgen/builder/_api_model_builder.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
   api_model.py
@@ -88,16 +82,16 @@ def _add_enums_and_bits(self, s, pe):
         bits_type_stmt = self.types_extractor.get_bits_type_stmt(s)
         union_type_stmt = self.types_extractor.get_union_type_stmt(s)
 
-        if enum_type_stmt:
-            enum_class = Enum(self.iskeyword, s)
+        if enum_type_stmt is not None:
+            enum_class = Enum(self.iskeyword)
             enum_class.stmt = enum_type_stmt
-            disambiguate_class_name_from_ancestors_and_siblings(enum_class, pe)
+            disambiguate_class_name_from_ancestors_and_siblings(self.language, enum_class, pe)
             enum_type_stmt.parent.i_enum = enum_class
             enum_type_stmt.i_enum = enum_class
             pe.owned_elements.append(enum_class)
             enum_class.owner = pe
 
-        if bits_type_stmt:
+        if bits_type_stmt is not None:
             bits_class = Bits(self.iskeyword)
             bits_class.stmt = bits_type_stmt
             bits_type_stmt.parent.i_bits = bits_class
@@ -105,7 +99,7 @@ def _add_enums_and_bits(self, s, pe):
             pe.owned_elements.append(bits_class)
             bits_class.owner = pe
 
-        if union_type_stmt:
+        if union_type_stmt is not None:
             # need to process the type stmts under the union
             for contained_type in union_type_stmt.i_type_spec.types:
                 self._add_enums_and_bits(contained_type, pe)
@@ -140,13 +134,11 @@ def _resolve_expanded_cross_references(self, element):
             else:
                 # check for identity_ref's
                 identity_ref_type = self.types_extractor.get_identity_ref_type_stmt(element.stmt)
-                if identity_ref_type:
-                    identity_stmt = identity_ref_type.i_type_spec.idbases[0]
-                    identity_ref_type.i_type_spec.base = identity_stmt
-                    if not hasattr(identity_stmt.i_identity, 'i_class'):
+                if identity_ref_type is not None:
+                    if not hasattr(identity_ref_type.i_type_spec.base.i_identity, 'i_class'):
                         raise YdkGenException(
                             'Cross resolution of identity class failed for ' + element.fqn())
-                    element.property_type = identity_stmt.i_identity.i_class
+                    element.property_type = identity_ref_type.i_type_spec.base.i_identity.i_class
                 else:
                     # check for bits
                     bits_ref_type = self.types_extractor.get_bits_type_stmt(element.stmt)
@@ -210,7 +202,7 @@ def _add_leaf_leaflist_prop(self, stmt, parent_element):
             # we have to create the enum
             enum_class = Enum(self.iskeyword)
             enum_class.stmt = enum_type
-            disambiguate_class_name_from_ancestors_and_siblings(enum_class, parent_element)
+            disambiguate_class_name_from_ancestors_and_siblings(self.language, enum_class, parent_element)
             parent_element.owned_elements.append(enum_class)
             enum_class.owner = parent_element
             prop.property_type = enum_class
@@ -233,7 +225,7 @@ def _add_union_type(union_type_stmt, parent_element):
                     if contained_enum_type is not None and contained_enum_type == contained_type:
                         enum_class = Enum(self.iskeyword)
                         enum_class.stmt = contained_enum_type
-                        disambiguate_class_name_from_ancestors_and_siblings(enum_class, parent_element)
+                        disambiguate_class_name_from_ancestors_and_siblings(self.language, enum_class, parent_element)
                         parent_element.owned_elements.append(enum_class)
                         enum_class.owner = parent_element
                         contained_enum_type.i_enum = enum_class
@@ -329,14 +321,14 @@ def _create_expanded_api_model(self, stmt, parent_element, deviation_packages):
                     for e in parent_element.owned_elements:
                         if isinstance(e, Property):
                             s = snake_case(e.stmt.arg)
-                            stmt_arg = prop.stmt.unclashed_arg if hasattr(prop.stmt, 'unclashed_arg') else prop.stmt.arg
+                            stmt_arg = (prop.stmt.unclashed_arg if hasattr(prop.stmt, 'unclashed_arg') else prop.stmt.arg)
                             if snake_case(stmt_arg) == s:
                                 prop.name = prop.name + '_'
 
                     parent_element.owned_elements.append(prop)
                     prop.owner = parent_element
 
-        elif stmt.keyword in ['leaf', 'leaf-list', 'anyxml']:
+        elif stmt.keyword == 'leaf' or stmt.keyword == 'leaf-list' or stmt.keyword == 'anyxml':
             self._add_leaf_leaflist_prop(stmt, parent_element)
 
         if hasattr(stmt, 'i_deviation'):
@@ -462,7 +454,7 @@ def name_matches_ancestor(name, parent_element):
     return name_matches_ancestor(name, parent_element.owner)
 
 
-def disambiguate_class_name_from_ancestors_and_siblings(clazz, parent_element):
+def disambiguate_class_name_from_ancestors_and_siblings(language, clazz, parent_element):
     if name_matches_ancestor(clazz.name, parent_element):
         clazz.name = clazz.name + '_'
     for e in parent_element.owned_elements:
diff --git a/ydkgen/builder/_pyang_model_builder.py b/ydkgen/builder/_pyang_model_builder.py
index d3a5cc4b4..18ef6c16e 100644
--- a/ydkgen/builder/_pyang_model_builder.py
+++ b/ydkgen/builder/_pyang_model_builder.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,8 +21,9 @@
 
 import logging
 import os
-from pyang import repository as _repository, context as _context
+import pyang
 import re
+import sys
 
 from pyang import error, statements
 from pyang.error import err_add
@@ -36,14 +36,20 @@
 
 class PyangModelBuilder(object):
     def __init__(self, resolved_model_dir):
-        self.repos = _repository.FileRepository(resolved_model_dir, False)
-        self.ctx = _context.Context(self.repos)
+        self.repos = pyang.FileRepository(resolved_model_dir, False)
+        self.ctx = pyang.Context(self.repos)
         self.resolved_model_dir = resolved_model_dir
         self.submodules = []
+        try:
+            reload(sys)
+            sys.setdefaultencoding('utf8')
+        except:
+            pass
 
     def parse_and_return_modules(self):
         """ Use pyang to parse the files, validate them and get a list of modules.
 
+            :param str resolved_model_dir The directory where all models to be compiled are found.
             :raise YdkGenException If there was a problem parsing the modules
         """
         statements.add_validation_fun('reference_3', ['deviation'], self._add_i_deviation)
@@ -57,7 +63,7 @@ def parse_and_return_modules(self):
         modules = self._get_pyang_modules(filenames)
         self._validate_pyang_modules(filenames)
 
-        self.submodules = [m for m in modules if m.keyword == 'submodule']
+        self.submodules = [m for m in modules if  m.keyword == 'submodule']
         return [m for m in modules if m.keyword == 'module']
 
     def get_submodules(self):
@@ -178,6 +184,7 @@ def _add_i_deviation(self, ctx, stmt):
 
     def _set_i_aug(self, ctx, stmt):
         """ inject bool 'i_augment' to top statement for model being augmented"""
+        i_target_node = None
         if hasattr(stmt, 'i_target_node'):
             i_target_node = stmt.i_target_node
         else:
@@ -220,7 +227,7 @@ def _get_pyang_modules(self, filenames):
                 logger.debug(
                     'Parsing file %s. Module name: %s. Revision: %s', filename, name, rev)
                 module = self.ctx.add_module(filename, text, format, name, rev,
-                                             expect_failure_error=False)
+                                        expect_failure_error=False)
             else:
                 module = self.ctx.add_module(filename, text)
             if module is None:
diff --git a/ydkgen/builder/_types_extractor.py b/ydkgen/builder/_types_extractor.py
index e70d1875b..0bf229c4c 100644
--- a/ydkgen/builder/_types_extractor.py
+++ b/ydkgen/builder/_types_extractor.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
   _types_extractor.py
@@ -26,15 +20,16 @@
  Extractor for types
 """
 
-from pyang.types import EnumTypeSpec, BitTypeSpec, UnionTypeSpec, PathTypeSpec, IdentityrefTypeSpec
+from pyang.types import EnumerationTypeSpec, BitsTypeSpec, UnionTypeSpec, PathTypeSpec, \
+    IdentityrefTypeSpec
 
 
 class TypesExtractor(object):
     def __init__(self):
-        self.get_enum_type_stmt = lambda stmt: self._get_type_stmt(stmt, EnumTypeSpec)
+        self.get_enum_type_stmt = lambda stmt: self._get_type_stmt(stmt, EnumerationTypeSpec)
         self.get_identity_ref_type_stmt = lambda stmt: self._get_type_stmt(
             stmt, IdentityrefTypeSpec)
-        self.get_bits_type_stmt = lambda stmt: self._get_type_stmt(stmt, BitTypeSpec)
+        self.get_bits_type_stmt = lambda stmt: self._get_type_stmt(stmt, BitsTypeSpec)
         self.get_union_type_stmt = lambda stmt: self._get_type_stmt(stmt, UnionTypeSpec)
 
     def _get_type_stmt(self, stmt, typeSpec):
@@ -70,7 +65,7 @@ def get_property_type(self, type_stmt):
         union_type_stmt = self.get_union_type_stmt(type_stmt)
         contained_property_type = type_stmt.i_type_spec
         if isinstance(contained_property_type, IdentityrefTypeSpec):
-            contained_property_type = contained_property_type.idbases[0].i_identity.i_class
+            contained_property_type = contained_property_type.base.i_identity.i_class
         elif enum_type_stmt is not None:
             # this is an enumeration
             contained_property_type = enum_type_stmt.i_enum
diff --git a/ydkgen/builder/multi_file_builder.py b/ydkgen/builder/multi_file_builder.py
index 65543e634..67cb49a64 100644
--- a/ydkgen/builder/multi_file_builder.py
+++ b/ydkgen/builder/multi_file_builder.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,16 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
  multi_file_builder.py
 """
-
+import sys
 from ydkgen.api_model import Class, Package
 from ydkgen.common import sort_classes_at_same_level, get_include_guard_name
 
@@ -37,14 +32,20 @@ def __init__(self, fragmented):
 
 class MultiFileHeader(MultiFile):
     def __init__(self, package, file_index, fragmented):
-        super().__init__(fragmented)
+        if sys.version_info > (3,):
+            super().__init__(fragmented)
+        else:
+            super(MultiFileHeader, self).__init__(fragmented)
         self.file_name = _get_header_name(package, file_index)
         self.include_guard = get_include_guard_name(package.name, file_index)
 
 
 class MultiFileSource(MultiFile):
     def __init__(self, package, file_index, fragmented):
-        super().__init__(fragmented)
+        if sys.version_info > (3,):
+            super().__init__(fragmented)
+        else:
+            super(MultiFileSource, self).__init__(fragmented)
         self.file_name = _get_source_name(package, file_index)
 
 
diff --git a/ydkgen/builder/test_case/test_cases_builder.py b/ydkgen/builder/test_case/test_cases_builder.py
index 36ef950aa..f7650f1d9 100644
--- a/ydkgen/builder/test_case/test_cases_builder.py
+++ b/ydkgen/builder/test_case/test_cases_builder.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 test_cases_builder.py
 
 Build an individual test case within a test program file.
 """
-
+import sys
 from ydkgen import api_model as atypes
 from ydkgen.common import is_pkg_element, get_top_class, get_obj_name, get_qn, \
                         is_presence_element, is_list_element, is_mandatory_element, \
@@ -169,7 +164,10 @@ class and its requisites. Then CRUD create, read, and delete
     """
 
     def __init__(self, lang, identity_subclasses):
-        super().__init__(lang, identity_subclasses)
+        if sys.version_info > (3,):
+            super().__init__(lang, identity_subclasses)
+        else:
+            super(TestCasesBuilder, self).__init__(lang, identity_subclasses)
         self.stmts = Statements()
         self.test_name = ''
         self.clazz = None
diff --git a/ydkgen/builder/test_case/test_value_builder.py b/ydkgen/builder/test_case/test_value_builder.py
index b4891c6b1..8c9df7954 100644
--- a/ydkgen/builder/test_case/test_value_builder.py
+++ b/ydkgen/builder/test_case/test_value_builder.py
@@ -19,7 +19,7 @@
 
 Generate and return property value.
 """
-
+import sys
 import base64
 import rstr
 
@@ -114,7 +114,10 @@ def _handle_enum(self):
     def _handle_binary(self):
         """Return binary value."""
         random_string = self._get_string(0)
-        bin_string = base64.b64encode(str.encode(random_string)).decode()
+        if sys.version_info >= (3, 0):
+            bin_string = base64.b64encode(str.encode(random_string)).decode()
+        else:
+            bin_string = base64.b64encode(random_string)
         return self._render_string(bin_string)
 
     def _handle_boolean(self, prop):
diff --git a/ydkgen/common.py b/ydkgen/common.py
index 68876166d..5b97b2101 100644
--- a/ydkgen/common.py
+++ b/ydkgen/common.py
@@ -122,36 +122,29 @@ def merge_file_path_segments(segs):
 
     for seg in segs:
         if not seg.length() == 0 and not return_seg.endswith('/'):
-            return_seg = '%s/' % return_seg
+            return_seg = '%s/' % (return_seg)
         return_seg = '%s%s' % (return_seg, seg)
     return return_seg
 
-
 def ispythonkeyword(word):
     return keyword.iskeyword(word) or \
-        word in ['False', 'None', 'True', 'async', 'await', 'nonlocal', 'parent', 'print',
-                 'children', 'operation', 'exec', 'entity', 'yfilter']
-
+        word in ['False', 'None', 'True', 'async', 'await', 'nonlocal', 'parent', 'print', 'children', 'operation', 'exec', 'entity', 'yfilter']
 
 def iscppkeyword(word):
-    return word in ['parent', 'operator', 'inline', 'default', 'virtual',
+    return word in ('parent', 'operator', 'inline', 'default', 'virtual',
                     'children', 'value', 'auto', 'entity', 'int', 'signed',
                     'final', 'template', 'index', 'protected', 'true', 'false',
-                    'default', 'auto', 'static', 'or', 'do', 'new', 'delete',
-                    'private', 'public', 'export', 'virtual', 'for', 'and',
+                    'default' , 'auto', 'static', 'or', 'do', 'new', 'delete',
+                    'private', 'public', 'export' , 'virtual', 'for', 'and',
                     'break', 'case', 'catch', 'float', 'long', 'return',
                     'explicit', 'class', 'if', 'try', 'while', 'and', 'or',
                     'const', 'continue', 'double', 'else', 'value', 'namespace',
                     'operation', 'volatile', 'register', 'short', 'extern',
                     'mutable', 'unsigned', 'struct', 'switch', 'void', 'typedef', 'typename',
-                    'typeid', 'using', 'char', 'goto', 'not', 'clock', 'major', 'minor', 'INFINITY',
-                    'alignas', 'alignof', 'asm', 'and_eq', 'not_eq', 'or_eq', 'xor', 'xor_eq',
-                    'bitand', 'bitor', 'compl', 'constexpr', 'decltype',
-                    ]
-
+                    'typeid', 'using', 'char', 'goto', 'not','clock', 'major', 'INFINITY')
 
 def isgokeyword(word):
-    return word in [
+    return word in (
         # keywords
         'break', 'default', 'func', 'interface', 'select',
         'case', 'defer', 'go', 'map', 'struct', 'chan',
@@ -168,8 +161,7 @@ def isgokeyword(word):
         'nil',
         # functions
         'append', 'cap', 'close', 'complex', 'copy', 'delete', 'imag', 'len',
-        'make', 'new', 'panic', 'print', 'println', 'real', 'recover',
-    ]
+        'make', 'new', 'panic', 'print', 'println', 'real', 'recover',)
 
 def get_sphinx_ref_label(named_element):
     return named_element.fqn().replace('.', '_')
@@ -450,7 +442,6 @@ def _get_element_seg(element):
                 seg = prop.name
     return seg.lower()
 
-
 def get_path_sep(lang):
     sep = ''
     if lang == 'py':
@@ -464,7 +455,7 @@ def has_list_ancestor(clazz):
     c = clazz.owner
     parents = []
 
-    while c is not None and not isinstance(c, atypes.Package):
+    while c is not None and not isinstance(c,atypes.Package):
         parents.append(c)
         c = c.owner
 
diff --git a/ydkgen/printer/cpp/class_constructor_printer.py b/ydkgen/printer/cpp/class_constructor_printer.py
index 48522e902..96330dcf9 100644
--- a/ydkgen/printer/cpp/class_constructor_printer.py
+++ b/ydkgen/printer/cpp/class_constructor_printer.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +25,9 @@
  prints C++ classes
 
 """
-from ydkgen.api_model import Bits, Class, DataType, Enum, AnyXml
+from ydkgen.api_model import Bits, Class, DataType, Enum
 from ydkgen.common import get_module_name, has_list_ancestor, is_top_level_class
 
-from pyang.types import UnionTypeSpec
-
 
 def get_type_name(prop_type):
     if prop_type.name == 'string':
@@ -102,6 +99,7 @@ def _print_init_children(self, children):
             if child.is_many or child.stmt.search_one('presence') is not None:
                 continue
             self.ctx.writeln('%s->parent = this;' % child.name)
+        self.ctx.bline()
 
     def _print_class_constructor_trailer(self):
         self.ctx.lvl_dec()
@@ -114,6 +112,7 @@ def _print_class_inits(self, clazz, leafs, children):
             index = 0
             while index < len(leafs):
                 prop = leafs[index]
+                leaf_name = ''
                 if prop.stmt.i_module.arg != clazz.stmt.i_module.arg:
                     leaf_name = prop.stmt.i_module.arg + ':' + prop.stmt.arg
                 else:
@@ -134,10 +133,10 @@ def _print_class_inits(self, clazz, leafs, children):
                         key_str += '"%s"' % key.stmt.arg   # key.name
                     init_stmts.append('%s(this, {%s})' % (child.name,  key_str))
             else:
-                if child.stmt.search_one('presence'):
-                    init_stmts.append('%s(nullptr) // presence node' % (child.name))
-                else:
+                if (child.stmt.search_one('presence') is None):
                     init_stmts.append('%s(std::make_shared<%s>())' % (child.name, child.property_type.qualified_cpp_name()))
+                else:
+                    init_stmts.append('%s(nullptr) // presence node' % (child.name))
         if len(init_stmts) > 0:
             if len(leafs) == 0:
                 self.ctx.writeln(':')
diff --git a/ydkgen/printer/cpp/class_members_printer.py b/ydkgen/printer/cpp/class_members_printer.py
index bcea96358..336012d27 100644
--- a/ydkgen/printer/cpp/class_members_printer.py
+++ b/ydkgen/printer/cpp/class_members_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 header_printer.py
@@ -60,9 +55,6 @@ def _print_constructor_destructor(self, clazz):
         self.ctx.bline()
 
     def _print_common_method_declarations(self, clazz):
-        self.ctx.writeln('std::string get_bundle_name() const override;')
-        self.ctx.writeln('std::string get_bundle_yang_models_location() const override;')
-        self.ctx.writeln('ydk::augment_capabilities_function get_augment_capabilities_function() const override;')
         self.ctx.writeln('bool has_data() const override;')
         self.ctx.writeln('bool has_operation() const override;')
         self.ctx.writeln('std::vector<std::pair<std::string, ydk::LeafData> > get_name_leaf_data() const override;')
@@ -78,6 +70,9 @@ def _print_common_method_declarations(self, clazz):
     def _print_top_level_entity_functions(self, clazz):
         if clazz.owner is not None and isinstance(clazz.owner, Package):
             self.ctx.writeln('std::shared_ptr<ydk::Entity> clone_ptr() const override;')
+            self.ctx.writeln('ydk::augment_capabilities_function get_augment_capabilities_function() const override;')
+            self.ctx.writeln('std::string get_bundle_yang_models_location() const override;')
+            self.ctx.writeln('std::string get_bundle_name() const override;')
             self.ctx.writeln('std::map<std::pair<std::string, std::string>, std::string> get_namespace_identity_lookup() const override;')
 
     def _print_class_value_members(self, clazz):
diff --git a/ydkgen/printer/cpp/class_source_printer.py b/ydkgen/printer/cpp/class_source_printer.py
index bf464f398..32868f0f0 100644
--- a/ydkgen/printer/cpp/class_source_printer.py
+++ b/ydkgen/printer/cpp/class_source_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 source_printer.py
@@ -61,9 +56,6 @@ def _print_class_destructor(self, clazz):
     def _print_class_method_definitions(self, clazz, leafs, children):
         if clazz.is_identity():
             return
-        self._print_bundle_name_function(clazz)
-        self._print_yang_models_function(clazz)
-        self._print_capabilities_lookup_function(clazz)
         self._print_class_has_data(clazz, leafs, children)
         self._print_class_has_operation(clazz, leafs, children)
         self._print_class_get_absolute_path(clazz)
@@ -78,6 +70,9 @@ def _print_class_method_definitions(self, clazz, leafs, children):
     def _print_top_level_entity_functions(self, clazz, leafs):
         if clazz.owner is not None and isinstance(clazz.owner, Package):
             self._print_clone_ptr_function(clazz)
+            self._print_yang_models_function(clazz)
+            self._print_bundle_name_function(clazz)
+            self._print_capabilities_lookup_function(clazz)
             self._print_namespace_identity_lookup_function(clazz)
 
     def _print_clone_ptr_function(self, clazz):
@@ -102,7 +97,7 @@ def _print_bundle_name_function(self, clazz):
         self.ctx.writeln('std::string %s::get_bundle_name() const' % clazz.qualified_cpp_name())
         self.ctx.writeln('{')
         self.ctx.lvl_inc()
-        self.ctx.writeln('return ydk_%s_bundle_name;' % snake_case(self.bundle_name))
+        self.ctx.writeln('return "%s";' % snake_case(self.bundle_name))
         self.ctx.lvl_dec()
         self.ctx.writeln('}')
         self.ctx.bline()
diff --git a/ydkgen/printer/cpp/cpp_bindings_printer.py b/ydkgen/printer/cpp/cpp_bindings_printer.py
index bc67d4ab7..3e348bf2c 100644
--- a/ydkgen/printer/cpp/cpp_bindings_printer.py
+++ b/ydkgen/printer/cpp/cpp_bindings_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,19 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
+'''
    YDK PY converter
-"""
 
+'''
 from __future__ import print_function
 
 import os
+import sys
 
 from ydkgen.api_model import Class, Enum
 from ydkgen.builder import MultiFileBuilder, MultiFileHeader, MultiFileSource
@@ -43,7 +39,10 @@
 class CppBindingsPrinter(LanguageBindingsPrinter):
 
     def __init__(self, ydk_root_dir, bundle, generate_tests, one_class_per_module):
-        super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        if sys.version_info > (3,):
+            super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        else:
+            super(CppBindingsPrinter, self).__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
         self.source_files = []
         self.header_files = []
 
diff --git a/ydkgen/printer/cpp/entity_lookup_printer.py b/ydkgen/printer/cpp/entity_lookup_printer.py
index 04a5ced6d..7da66a020 100644
--- a/ydkgen/printer/cpp/entity_lookup_printer.py
+++ b/ydkgen/printer/cpp/entity_lookup_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
- entity_lookup_printer.py
+entity_lookup_printer.py
 
  Prints top entity lookup map
-"""
 
+"""
+import sys
 from ydkgen.api_model import snake_case, Class
 from ydkgen.common import get_include_guard_name, get_module_name
 from ydkgen.printer.file_printer import FilePrinter
@@ -32,7 +28,10 @@
 
 class EntityLookUpPrinter(FilePrinter):
     def __init__(self, ctx, module_namespace_lookup):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(EntityLookUpPrinter, self).__init__(ctx)
         self.headers = None
         self.entity_lookup = None
         self.capability_lookup = None
@@ -113,7 +112,8 @@ def _print_capabilities_lookup_tables_func_header(self):
         self.ctx.writeln('namespace %s' % self.bundle_name)
         self.ctx.writeln('{')
         self.ctx.bline()
-        self.ctx.writelns(["void {}_augment_lookup_tables()".format(snake_case(self.bundle_name)), "{"])
+        self.ctx.writelns(["void {}_augment_lookup_tables()".format(snake_case(self.bundle_name)),
+                           "{"])
 
         self.ctx.bline()
         self.ctx.lvl_inc()
diff --git a/ydkgen/printer/cpp/header_printer.py b/ydkgen/printer/cpp/header_printer.py
index a939cbb4b..59a08436c 100644
--- a/ydkgen/printer/cpp/header_printer.py
+++ b/ydkgen/printer/cpp/header_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
- header_printer.py
+header_printer.py
 
- Prints C++ classes
-"""
+ prints C++ classes
 
+"""
+import sys
 from ydkgen.api_model import Class
 from ydkgen.builder import MultiFileHeader
 from ydkgen.printer import MultiFilePrinter
@@ -35,7 +31,10 @@
 
 class HeaderPrinter(MultiFilePrinter):
     def __init__(self, ctx, identity_subclasses, bundle_name):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(HeaderPrinter, self).__init__(ctx)
         self.enum_printer = EnumPrinter(self.ctx)
         self.identity_subclasses = identity_subclasses
         self.bundle_name = bundle_name
diff --git a/ydkgen/printer/cpp/source_printer.py b/ydkgen/printer/cpp/source_printer.py
index 7f81c52c6..22337bf1e 100644
--- a/ydkgen/printer/cpp/source_printer.py
+++ b/ydkgen/printer/cpp/source_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
- source_printer.py
+source_printer.py
 
- Prints C++ classes
-"""
+ prints C++ classes
 
+"""
+import sys
 from ydkgen.builder import MultiFileSource
 from ydkgen.printer import MultiFilePrinter
 
@@ -34,7 +30,10 @@
 
 class SourcePrinter(MultiFilePrinter):
     def __init__(self, ctx, bundle_name, module_namespace_lookup):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(SourcePrinter, self).__init__(ctx)
         self.enum_printer = EnumPrinter(self.ctx)
         self.bundle_name = bundle_name
         self.module_namespace_lookup = module_namespace_lookup
diff --git a/ydkgen/printer/file_printer.py b/ydkgen/printer/file_printer.py
index 73bd8c9e5..29d9a5f5d 100644
--- a/ydkgen/printer/file_printer.py
+++ b/ydkgen/printer/file_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
  import_test_printer.py 
  
  YANG model driven API, python emitter.
-"""
 
+"""
 import abc
 from ydkgen.api_model import Class
 
@@ -63,7 +58,7 @@ def _check_tab_leak(self):
         if self._start_tab.pop() != end_tab:
             raise Exception('Tab leak !!!')
 
-    def print_output(self, packages):
+    def print_output(self,packages):
         self._start_tab_leak_check()
         self.print_header(packages)
         self.print_body(packages)
diff --git a/ydkgen/printer/go/class_constructor_printer.py b/ydkgen/printer/go/class_constructor_printer.py
index 73eafdae9..7ec8207ed 100644
--- a/ydkgen/printer/go/class_constructor_printer.py
+++ b/ydkgen/printer/go/class_constructor_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
- source_printer.py
+source_printer.py
 
- Prints Go class constructor
-"""
+ prints Go class constructor
 
+"""
+import sys
 from functools import reduce
 from ydkgen.api_model import Bits, Class, DataType, Enum
 from pyang.types import PathTypeSpec, UnionTypeSpec
@@ -35,7 +31,10 @@
 
 class ClassConstructorPrinter(FunctionPrinter):
     def __init__(self, ctx, clazz, leafs, identity_subclasses):
-        super().__init__(ctx, clazz, leafs)
+        if sys.version_info > (3,):
+            super().__init__(ctx, clazz, leafs)
+        else:
+            super(ClassConstructorPrinter, self).__init__(ctx, clazz, leafs)
         self.identity_subclasses = identity_subclasses
 
     def print_function_header(self):
diff --git a/ydkgen/printer/go/go_bindings_printer.py b/ydkgen/printer/go/go_bindings_printer.py
index d14afbc6c..c93e2d9ab 100644
--- a/ydkgen/printer/go/go_bindings_printer.py
+++ b/ydkgen/printer/go/go_bindings_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
+'''
    YDK GO converter
-"""
+
+'''
 
 from __future__ import print_function
 
 import os
-
+import sys
 from distutils.file_util import copy_file
 from distutils.dir_util import mkpath
 
@@ -42,7 +38,10 @@
 class GoBindingsPrinter(LanguageBindingsPrinter):
 
     def __init__(self, ydk_root_dir, bundle, generate_tests, one_class_per_module):
-        super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        if sys.version_info > (3,):
+            super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        else:
+            super(GoBindingsPrinter, self).__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
 
     def print_files(self):
         only_modules = [package.stmt for package in self.packages]
@@ -126,25 +125,20 @@ def _print_yang_files(self):
         mkpath(yang_files_dir)
         copy_tree(self.bundle.resolved_models_dir, yang_files_dir)
 
-
 def get_table_of_contents_file_name(path):
     return '%s/ydk.models.rst' % path
 
-
 def get_go_doc_file_name(path, named_element):
     return '%s/%s.rst' % (path, get_rst_file_name(named_element))
 
-
 def emit_table_of_contents(ctx, packages, extra_args):
     bundle_name, bundle_version = extra_args
     DocPrinter(ctx, 'go', bundle_name, bundle_version).print_table_of_contents(packages)
 
-
 def emit_go_doc(ctx, named_element, extra_args):
     identity_subclasses, bundle_name = extra_args
     DocPrinter(ctx, 'go', bundle_name).print_module_documentation(named_element, identity_subclasses)
 
-
 def copy_tree(src, dst):
     names = os.listdir(src)
     outputs = []
diff --git a/ydkgen/printer/go/module_printer.py b/ydkgen/printer/go/module_printer.py
index 9c0dc305b..6ef8d854f 100644
--- a/ydkgen/printer/go/module_printer.py
+++ b/ydkgen/printer/go/module_printer.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +20,7 @@
  prints Go classes
 
 """
-
+import sys
 from ydkgen.api_model import Class, Enum, Bits
 from .class_printer import ClassPrinter
 from .class_identity_printer import IdentityPrinter
@@ -33,7 +32,10 @@
 class ModulePrinter(FilePrinter):
 
     def __init__(self, ctx, bundle_name, identity_subclasses):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(ModulePrinter, self).__init__(ctx)
         self.bundle_name = bundle_name
         self.identity_subclasses = identity_subclasses
         self.class_printer = ClassPrinter(ctx, bundle_name, identity_subclasses)
@@ -88,15 +90,12 @@ def _print_imports(self, package):
     def _print_init(self, package):
         self.ctx.writeln('func init() {')
         self.ctx.lvl_inc()
-        self.ctx.writeln('ydk.YLogDebug(fmt.Sprintf("Registering top level entities for package {}"))'.
-                         format(package.name))
+        self.ctx.writeln('ydk.YLogDebug(fmt.Sprintf("Registering top level entities for package {}"))'.format(package.name))
         for e in package.owned_elements:
             ns = package.stmt.search_one('namespace')
             if ns is not None and isinstance(e, Class) and not e.is_identity():
-                self.ctx.writeln('ydk.RegisterEntity("{{{} {}}}", reflect.TypeOf({}{{}}))'.
-                                 format(ns.arg, e.stmt.arg, e.go_name()))
-                self.ctx.writeln('ydk.RegisterEntity("{}:{}", reflect.TypeOf({}{{}}))'.
-                                 format(package.stmt.arg, e.stmt.arg, e.go_name()))
+                self.ctx.writeln('ydk.RegisterEntity("{{{} {}}}", reflect.TypeOf({}{{}}))'.format(ns.arg, e.stmt.arg, e.go_name()))
+                self.ctx.writeln('ydk.RegisterEntity("{}:{}", reflect.TypeOf({}{{}}))'.format(package.stmt.arg, e.stmt.arg, e.go_name()))
         self.ctx.lvl_dec()
         self.ctx.writeln('}')
         self.ctx.bline()
diff --git a/ydkgen/printer/meta_data_util.py b/ydkgen/printer/meta_data_util.py
index cf2acc26e..f4e8b54d3 100644
--- a/ydkgen/printer/meta_data_util.py
+++ b/ydkgen/printer/meta_data_util.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,32 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
   meta_data_util.py
 
   YANG model driven API, python emitter.
 """
-
-from ydkgen.api_model import Bits, Class, Enum, Package, Deviation
+from ydkgen.api_model import Bits, Class, Enum, Package
 from ydkgen.builder import TypesExtractor
 from ydkgen.common import convert_to_reStructuredText, get_module_name, is_config_stmt
 from pyang import types
 from pyang.error import EmitError
 from pyang.types import BinaryTypeSpec, BooleanTypeSpec, Decimal64TypeSpec, EmptyTypeSpec, \
     IntTypeSpec, LengthTypeSpec, PatternTypeSpec, RangeTypeSpec, StringTypeSpec, PathTypeSpec, \
-    BitTypeSpec, IdentityrefTypeSpec, UnionTypeSpec, TypeSpec
+    BitsTypeSpec, IdentityrefTypeSpec, UnionTypeSpec, TypeSpec
 
 
 class MetaInfoData:
-    """
+
+    '''
     Meta info for a property
-    """
+    '''
+
     def __init__(self, prop):
         self.name = prop.stmt.arg
         self.mtype = ''
@@ -87,7 +82,7 @@ def get_class_docstring(clazz, language, identity_subclasses=None):
 
         id_subclasses = None
         if (hasattr(prop.property_type, 'is_identity') and
-                prop.property_type.is_identity() and identity_subclasses is not None):
+            prop.property_type.is_identity() and identity_subclasses is not None):
             id_subclasses = identity_subclasses
 
         meta_info_data = get_meta_info_data(
@@ -103,26 +98,26 @@ def get_class_docstring(clazz, language, identity_subclasses=None):
             attribute_title = prop.go_name()
         if prop in keys:
             attribute_title = '%s  (key)' % attribute_title
-        properties_description.append('.. attribute:: %s\n\n' % attribute_title)
+        properties_description.append('.. attribute:: %s\n\n' % (attribute_title))
 
-        if prop_comment:
-            properties_description.append('    %s\n\n' % convert_to_reStructuredText(prop_comment))
+        properties_description.append('\t%s\n' % (
+            convert_to_reStructuredText(prop_comment)))
 
-        properties_description.extend(get_type_doc(meta_info_data, 1, '    '))
+        properties_description.extend(get_type_doc(meta_info_data, 1, ''))
         if len(meta_info_data.target_of_leafref) > 0:
-            properties_description.append('    **refers to**: %s\n\n' % meta_info_data.target_of_leafref)
+            properties_description.append('\t**refers to**\: %s\n\n' % (meta_info_data.target_of_leafref))
         if meta_info_data.mandatory:
-            properties_description.append('    **mandatory**: True\n\n')
+            properties_description.append('\t**mandatory**\: True\n\n')
         if meta_info_data.is_presence:
-            properties_description.append('    **presence node**: True\n\n')
+            properties_description.append('\t**presence node**\: True\n\n')
         if not meta_info_data.is_config:
-            properties_description.append('    **config**: False\n\n')
+            properties_description.append('\t**config**\: False\n\n')
         if len(meta_info_data.units) > 0:
-            properties_description.append('    **units**: %s\n\n' % meta_info_data.units)
+            properties_description.append('\t**units**\: %s\n\n' % meta_info_data.units)
         if len(meta_info_data.default_value) > 0:
-            properties_description.append('    **default value**: %s\n\n' % meta_info_data.default_value)
+            properties_description.append('\t**default value**\: %s\n\n' % meta_info_data.default_value)
         if len(meta_info_data.status) > 0:
-            properties_description.append('    **status**: %s\n\n' % meta_info_data.status)
+            properties_description.append('\t**status**\: %s\n\n' % meta_info_data.status)
 
     return convert_to_reStructuredText(class_description) + '\n\n' + ''.join(properties_description)
 
@@ -133,29 +128,33 @@ def get_type_doc(meta_info_data, type_depth, ident):
     if len(meta_info_data.children) > 0:
         if type_depth == 1:
             if hasattr(meta_info_data, 'property_type') and isinstance(meta_info_data.property_type, UnionTypeSpec):
-                properties_description.append(ident+'**type**: union of the below types:\n\n')
+                properties_description.append('\t**type**\: union of the below types:\n\n')
         for child in meta_info_data.children:
-            properties_description.extend(get_type_doc(child, type_depth+1, ident+'    '))
+            properties_description.extend(get_type_doc(child, type_depth+1, '\t'))
 
     else:
         target = meta_info_data.doc_link
         if isinstance(meta_info_data.doc_link, list):
             doc_link = map(lambda l: '\n\n'+ident+'\t\t%s' % l, meta_info_data.doc_link)
             target = ''.join(doc_link)
-        while target[0] == '\n' or target[0] == '\t':
+        while target[0]=='\n' or target[0]=='\t':
             target = target[1:]
 
-        if len(meta_info_data.doc_link_description) == 0:
-            properties_description.append(ident+'**type**: %s\n\n' % target)
+        if len(meta_info_data.doc_link_description)==0:
+            properties_description.append(ident+'\t**type**\: %s\n\n' % target)
         else:
-            # if not meta_info_data.doc_link_description.startswith('list of'):
-            #     if not meta_info_data.doc_link_description.endswith('\n'):
-            #         meta_info_data.doc_link_description += '\n\n'
-            properties_description.append(ident+'**type**: %s %s\n\n' % (meta_info_data.doc_link_description, target))
+            if not meta_info_data.doc_link_description.startswith('list of'):
+                if not meta_info_data.doc_link_description.endswith('\n'):
+                    meta_info_data.doc_link_description += '\n\n'
+            properties_description.append(ident+'\t**type**\: %s' % meta_info_data.doc_link_description)
+            properties_description.append(ident+'\t\t%s\n\n' % target)
 
         prop_restriction = get_property_restriction(meta_info_data)
         if prop_restriction is not None and len(prop_restriction) > 0:
-            properties_description.append(ident+'    %s\n\n' % prop_restriction)
+            if ident=='':
+                properties_description.append('\t%s\n\n' % (prop_restriction))
+            else:
+                properties_description.append(ident+'\t\t%s\n\n' % (prop_restriction))
 
     return properties_description
 
@@ -165,7 +164,7 @@ def get_enum_class_docstring(enumz, language):
     if enumz.comment is not None:
         enumz_description = enumz.comment
 
-    enumz_description = "%s (Enum Class)\n\n\n" % enumz.name + enumz_description
+    enumz_description = "%s (Enum Class)\n\n\n" % (enumz.name) + enumz_description
 
     literals_description = []
     for enum_literal in enumz.literals:
@@ -177,7 +176,7 @@ def get_enum_class_docstring(enumz, language):
             literals_description.append(".. data:: %s = %s\n" % (enum_literal.name, enum_literal.value))
         if enum_literal.comment is not None:
             for line in enum_literal.comment.split("\n"):
-                literals_description.append("    %s\n\n" % line)
+                literals_description.append("\t%s\n\n" % line)
 
     return ''.join([convert_to_reStructuredText(enumz_description)] + ['\n\n'] + literals_description)
 
@@ -338,7 +337,7 @@ def get_meta_info_data(prop, property_type, type_stmt, language, identity_subcla
         if isinstance(type_spec, BinaryTypeSpec):
             meta_info_data.ptype = 'str'
             meta_info_data.doc_link += get_primitive_type_tag('str', language)
-        elif isinstance(type_spec, BitTypeSpec):
+        elif isinstance(type_spec, BitsTypeSpec):
             # This can happen in a Union
             raise EmitError('Illegal Code path')
         elif isinstance(type_spec, BooleanTypeSpec):
@@ -419,11 +418,11 @@ def get_meta_info_data(prop, property_type, type_stmt, language, identity_subcla
 
 
 def _set_mtype_docstring(meta_info_data, prop, leaftype, language):
-    meta_info_data.mtype = leaftype
-    if prop.is_many:
-        meta_info_data.mtype = 'REFERENCE_LEAFLIST'
-        meta_info_data.doc_link = _get_list_doc_link_tag(
-            meta_info_data, 'doc_link', language, meta_info_data.mtype)
+        meta_info_data.mtype = leaftype
+        if prop.is_many:
+            meta_info_data.mtype = 'REFERENCE_LEAFLIST'
+            meta_info_data.doc_link = _get_list_doc_link_tag(
+                meta_info_data, 'doc_link', language, meta_info_data.mtype)
 
 
 def add_pattern_docstring(meta_info_data, target_type_stmt):
@@ -455,6 +454,8 @@ def get_length_limits(length_type):
         raise AssertionError
     prange = []
     for m_min, m_max in length_type.lengths:
+        pmin = None
+        pmax = None
         if m_min == 'min':
             pmin = '0'
         else:
@@ -475,6 +476,7 @@ def get_range_limits(range_type):
     if isinstance(base_type, IntTypeSpec):
         for m_min, m_max in range_type.ranges:
             pmin = None
+            pmax = None
             if m_min == 'min':
                 pmin = range_type.base.min
             else:
@@ -493,6 +495,7 @@ def get_range_limits(range_type):
     elif isinstance(base_type, Decimal64TypeSpec):
         for m_min, m_max in range_type.ranges:
             pmin = None
+            pmax = None
             if m_min == 'min':
                 pmin = range_type.base.min.s
             else:
@@ -561,15 +564,15 @@ def get_primitive_type_tag(typ, language):
 def get_tag_template(language, domain, crossref):
     templates = {
         ('py', 'class', False): '.. py:class:: %s\n',
-        ('py', 'class', True): ' :py:class:`%s<%s.%s>`',
+        ('py', 'class', True): ' :py:class:`%s <%s.%s>`',
         ('py', 'module', False): '.. py:module:: %s.%s\n',
         ('py', 'currentmodule', False): '.. py:currentmodule:: %s\n',
 
         ('cpp', 'class', False): '.. cpp:class:: %s\n',
-        ('cpp', 'class', True): ' :cpp:class:`%s<%s>`',
+        ('cpp', 'class', True): ' :cpp:class:`%s <%s>`',
 
         ('go', 'class', False): '.. go:struct:: %s()\n',
-        ('go', 'class', True): ' :go:struct:`%s<%s>`',
+        ('go', 'class', True): ' :go:struct:`%s <%s>`',
         ('go', 'module', False): '.. go:package:: %s.%s\n',
         ('go', 'currentmodule', False): '.. go:package:: %s\n',
     }
@@ -642,17 +645,6 @@ def get_class_tag(named_element, language):
         raise Exception('Language {0} not yet supported'.format(language))
 
 
-def reference_cpp_name(element):
-    """ get the C++ doc reference name"""
-    names = []
-    while element is not None:
-        if isinstance(element, Deviation):
-            element = element.owner
-        names.append(element.name)
-        element = element.owner
-    return '::'.join(reversed(names))
-
-
 def get_class_crossref_tag(name, named_element, language):
     if language == 'py':
         template = get_tag_template('py', 'class', True)
@@ -661,7 +653,8 @@ def get_class_crossref_tag(name, named_element, language):
                            named_element.qn())
     elif language == 'cpp':
         template = get_tag_template('cpp', 'class', True)
-        return template % (name, reference_cpp_name(named_element))
+        return template % (name,
+                           named_element.fully_qualified_cpp_name())
     elif language == 'go':
         template = get_tag_template('go', 'class', True)
         link = '%s/%s' % (named_element.get_py_mod_name().replace('.', '/'),
@@ -676,9 +669,9 @@ def get_bits_class_docstring(bitz):
     if bitz.comment is not None:
         for line in bitz.comment.split('\n'):
             bitz_description.append(convert_to_reStructuredText(line))
-    bitz_description.append('\n    **Bits positions:**\n')
+    bitz_description.append('\n\t**Bits positions\:**\n')
     for pos, name in enumerate(bitz._dictionary):
-        bitz_description.append("        %s: %s\n" % (name, pos))
+        bitz_description.append("\t\t%s\: %s\n" % (name, pos))
 
     return ''.join(bitz_description)
 
@@ -687,7 +680,7 @@ def get_bits_doc_link(bitz, language):
     if language == 'py':
         return get_class_crossref_tag(bitz.name, bitz, language)
     elif language == 'cpp':
-        return ':cpp:class:`Bits<ydk::Bits>`\n    %s' % get_bits_class_docstring(bitz)
+        return ':cpp:class:`Bits<ydk::Bits>`\n\t%s' % get_bits_class_docstring(bitz)
     elif language == 'go':
         return get_class_crossref_tag(bitz.name, bitz, language)
     else:
@@ -706,10 +699,11 @@ def get_langage_spec_tags(named_element, language):
 
 
 def get_class_bases(clazz, language):
+    bases = []
+
     if language not in ('py', 'cpp', 'go'):
         raise Exception('Language {0} not yet supported'.format(language))
 
-    bases = []
     if language == 'py':
         bases.append(':py:class:`Entity<ydk.types.Entity>`')
     if isinstance(clazz, Enum):
@@ -742,9 +736,9 @@ def get_default_value_object(ptype, property_type, clazz_name, default_value, id
     elif isinstance(property_type, Bits):
         default_value_object = "'%s'" % default_value
     elif isinstance(property_type, Enum):
-        for lit in property_type.literals:
-            if lit.stmt.arg == default_value:
-                default_value_object = "'%s.%s'" % (property_type.fqn(), lit.name)
+        for l in property_type.literals:
+            if l.stmt.arg == default_value:
+                default_value_object = "'%s.%s'" % (property_type.fqn(), l.name)
                 break
     elif isinstance(property_type, Class):
         if identity_subclasses is not None:
diff --git a/ydkgen/printer/multi_file_printer.py b/ydkgen/printer/multi_file_printer.py
index e2e7a9f9b..13bce7f4d 100644
--- a/ydkgen/printer/multi_file_printer.py
+++ b/ydkgen/printer/multi_file_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,31 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
  import_test_printer.py
 
  YANG model driven API, python emitter.
-"""
 
+"""
 import abc
 import os
-import logging
-
+import sys
 from ydkgen.printer import FilePrinter
 from ydkgen.builder import MultiFile
+import logging
 
 logger = logging.getLogger('ydkgen')
 
 
 class MultiFilePrinter(FilePrinter):
     def __init__(self, ctx):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(MultiFilePrinter, self).__init__(ctx)
 
     def print_output(self, package, multi_file, path_prefix):
         assert isinstance(multi_file, MultiFile)
diff --git a/ydkgen/printer/python/class_docstring_printer.py b/ydkgen/printer/python/class_docstring_printer.py
index a383ccade..a38bd8abe 100644
--- a/ydkgen/printer/python/class_docstring_printer.py
+++ b/ydkgen/printer/python/class_docstring_printer.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 class_docstring_printer.py
@@ -36,6 +30,7 @@ def __init__(self, ctx):
             Class doc string printer
 
             :attribute ctx The printer context
+
         """
         self.ctx = ctx
 
@@ -44,25 +39,25 @@ def print_output(self, clazz):
             Prints the doc strings for the clazz
 
             :param `api_model.Class` clazz :- The Class object.
+
         """
         self.ctx.lvl_inc()
         self.ctx.writeln('"""')
         self._print_class_docstring_text(clazz)
         self._print_class_docstring_presence(clazz)
         self.ctx.writeln('"""')
+        self.ctx.bline()
         self.ctx.lvl_dec()
 
     def _print_class_docstring_text(self, clazz):
         class_docstring = get_class_docstring(clazz, 'py')
         if len(class_docstring) > 0:
-            prev_line = ''
             for line in class_docstring.split('\n'):
-                if line or prev_line:
-                    self.ctx.writeln('%s' % line)
-                prev_line = line
+                self.ctx.writeln('%s' % line)
+        self.ctx.bline()
 
     def _print_class_docstring_presence(self, clazz):
         if clazz.stmt.search_one('presence') is not None:
-            self.ctx.bline()
             line = """This class is a :ref:`presence class<presence-class>`"""
             self.ctx.writeln(line)
+            self.ctx.bline()
diff --git a/ydkgen/printer/python/class_inits_printer.py b/ydkgen/printer/python/class_inits_printer.py
index 88e3a040b..4ace8b32a 100644
--- a/ydkgen/printer/python/class_inits_printer.py
+++ b/ydkgen/printer/python/class_inits_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,16 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 class_inits_printer.py
 
  __init__ printer
+
 """
 
 from pyang.types import UnionTypeSpec
@@ -96,9 +92,19 @@ def _print_class_inits_header(self, clazz):
 
     def _print_class_inits_body(self, clazz, leafs, children):
         if clazz.is_identity():
-            self.ctx.writeln('super().__init__(ns, pref, tag)')
+            self.ctx.writeln('if sys.version_info > (3,):')
+            self.ctx.writeln('    super().__init__(ns, pref, tag)')
+            self.ctx.writeln('else:')
+            line = '    super(%s, self).__init__(ns, pref, tag)' % clazz.name
+            self.ctx.writeln(line)
         else:
-            self.ctx.writeln('super().__init__()')
+            self.ctx.writeln('if sys.version_info > (3,):')
+            self.ctx.writeln('    super().__init__()')
+            self.ctx.writeln('else:')
+            if self.one_class_per_module:
+                self.ctx.writeln('    super(%s, self).__init__()' % clazz.name)
+            else:
+                self.ctx.writeln('    super(%s, self).__init__()' % clazz.qn())
             if clazz.owner is not None and isinstance(clazz.owner, Package):
                 self.ctx.writeln('self._top_entity = None')
             self.ctx.bline()
diff --git a/ydkgen/printer/python/class_meta_printer.py b/ydkgen/printer/python/class_meta_printer.py
index 420bd0a0d..a811ad8fa 100644
--- a/ydkgen/printer/python/class_meta_printer.py
+++ b/ydkgen/printer/python/class_meta_printer.py
@@ -1,6 +1,5 @@
 #  ----------------------------------------------------------------
-# YDK - YANG Development Kit
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
 """
 class_meta_printer.py
@@ -87,17 +81,16 @@ def _print_meta_member(self, clazz):
             mtype = 'REFERENCE_LEAFLIST'
         elif clazz.stmt.keyword == 'identity':
             mtype = 'REFERENCE_IDENTITY_CLASS'
-        self.ctx.writeln('\'%s\': {' % (clazz.qn()))
+        self.ctx.writeln('\'%s\' : {' % (clazz.qn()))
         self.ctx.lvl_inc()
-        self.ctx.writeln("'meta_info': _MetaInfoClass(")
+        self.ctx.writeln("'meta_info' : _MetaInfoClass('%s', %s," % (clazz.qn(), mtype))
         self.ctx.lvl_inc()
-        self.ctx.writeln("'%s', %s," % (clazz.qn(), mtype))
         description = " "
         for st in clazz.stmt.substmts:
             if st.keyword == 'description':
                 description = st.arg
                 break
-        self.ctx.writeln('"""%s""",' % description)
+        self.ctx.writeln("'''%s'''," % description)
         if clazz.is_grouping():
             self.ctx.writeln('True, ')
         else:
@@ -158,16 +151,15 @@ def print_meta_class_member(self, meta_info_data, ctx):
         min_elements = meta_info_data.min_elements
         default_value_object = meta_info_data.default_value_object
 
-        ctx.writeln("  _MetaInfoClassMember(")
+        ctx.writeln("_MetaInfoClassMember('%s', %s, '%s', '%s'," % (name, mtype, ptype, ytype))
         ctx.lvl_inc()
-        ctx.writeln("'%s', %s, '%s', '%s'," % (name, mtype, ptype, ytype))
         ctx.writeln("%s, %s," % (pmodule_name, clazz_name))
         ctx.writeln("%s, %s," % (str(prange), str(pattern)))
-        ctx.writeln('"""')
+        ctx.write("'''")
         if meta_info_data.comment is not None:
             for line in meta_info_data.comment.split('\n'):
                 ctx.writeln('%s' % line)
-        ctx.writeln('""",')
+        ctx.writeln("''',")
         ctx.writeln("'%s'," % presentation_name)
 
         if len(meta_info_data.children) > 0:
diff --git a/ydkgen/printer/python/class_printer.py b/ydkgen/printer/python/class_printer.py
index 1d9e036f2..91f98a03b 100644
--- a/ydkgen/printer/python/class_printer.py
+++ b/ydkgen/printer/python/class_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 """
 class_printer.py
 
-YANG model driven API, class emitter.
-"""
+ YANG model driven API, class emitter.
 
+"""
 from ydkgen.api_model import Class, Package, Enum
 from ydkgen.common import sort_classes_at_same_level
 from ydkgen.printer.file_printer import FilePrinter
@@ -34,6 +34,7 @@
 from .enum_printer import EnumPrinter
 
 
+
 class ClassPrinter(FilePrinter):
 
     def __init__(self, ctx, module_namespace_lookup, one_class_per_module, generate_meta, identity_subclasses):
@@ -44,10 +45,9 @@ def __init__(self, ctx, module_namespace_lookup, one_class_per_module, generate_
         self.generate_meta = generate_meta
 
     def print_body(self, unsorted_classes):
-        """ This arranges the classes at the same level
+        ''' This arranges the classes at the same level
             so that super references are printed before
-            the subclassess
-        """
+            the subclassess'''
         sorted_classes = sort_classes_at_same_level(unsorted_classes)
 
         for clazz in sorted_classes:
@@ -66,7 +66,7 @@ def _print_class_header(self, clazz):
     def _print_class_body(self, clazz):
         leafs = []
         children = []
-        _get_class_members(clazz, leafs, children)
+        self._get_class_members(clazz, leafs, children)
         self._print_class_inits(clazz, leafs, children)
         self._print_class_setattr(clazz, leafs)
         self._print_child_enums(clazz)
@@ -105,14 +105,16 @@ def _print_class_trailer(self, clazz):
         self.ctx.lvl_dec()
 
     def _print_class_declaration(self, clazz):
+        self.ctx.bline()
+
         parents = '_Entity_'
         if clazz.is_identity():
             if len(clazz.extends) > 0:
-                parents = ', '.join([sup.qn() for sup in clazz.extends])
+                parents = ' ,'.join([sup.qn() for sup in clazz.extends])
             else:
                 parents = 'Identity'
 
-        self.ctx.writeln('class %s(%s):' % (clazz.name, parents))
+        self.ctx.writeln("class %s(%s):" % (clazz.name, parents))
 
     def _print_class_docstring(self, clazz):
         ClassDocstringPrinter(self.ctx).print_output(clazz)
@@ -128,6 +130,14 @@ def _print_class_attributes(self, clazz):
             self.ctx.writeln("_revision = '%s'" % revision_stmt.arg)
         self.ctx.bline()
 
+    def _get_class_members(self, clazz, leafs, children):
+        for prop in clazz.properties():
+            ptype = prop.property_type
+            if isinstance(prop.property_type, Class) and not prop.property_type.is_identity():
+                children.append(prop)
+            elif ptype is not None:
+                leafs.append(prop)
+
     def _print_class_inits(self, clazz, leafs, children):
         ClassInitsPrinter(self.ctx, self.module_namespace_lookup, self.one_class_per_module,
                           self.identity_subclasses).print_output(clazz, leafs, children)
@@ -144,17 +154,8 @@ def _print_class_clone_ptr(self, clazz):
             self.ctx.bline()
             self.ctx.lvl_dec()
 
-    # def _print_bits(self, bits):
-    #     BitsPrinter(self.ctx).print_bits(bits)
+    def _print_bits(self, bits):
+        BitsPrinter(self.ctx).print_bits(bits)
 
     def _print_enum(self, enum_class):
         EnumPrinter(self.ctx).print_enum(enum_class, self.generate_meta)
-
-
-def _get_class_members(clazz, leafs, children):
-    for prop in clazz.properties():
-        ptype = prop.property_type
-        if isinstance(prop.property_type, Class) and not prop.property_type.is_identity():
-            children.append(prop)
-        elif ptype is not None:
-            leafs.append(prop)
diff --git a/ydkgen/printer/python/enum_printer.py b/ydkgen/printer/python/enum_printer.py
index f64c9bf48..6c2d6ff8d 100644
--- a/ydkgen/printer/python/enum_printer.py
+++ b/ydkgen/printer/python/enum_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
  enum_printer.py
 
  YANG model driven API, python emitter.
+
 """
 
+
 from ydkgen.api_model import Enum
 from ydkgen.common import get_module_name
 from ydkgen.printer.meta_data_util import get_enum_class_docstring
 
-
 class EnumPrinter(object):
 
     def __init__(self, ctx):
@@ -36,25 +37,25 @@ def print_enum(self, enum_class, meta_assign):
         self._print_enum_trailer(enum_class)
 
     def print_enum_meta(self, enum_class):
-        self.ctx.writeln("'%s': _MetaInfoEnum(" % enum_class.qn())
+        self.ctx.writeln("'%s' : _MetaInfoEnum('%s'," % (
+                         enum_class.qn(),
+                         enum_class.name))
         self.ctx.lvl_inc()
-        self.ctx.writeln("'%s'," % enum_class.name)
         self.ctx.writeln("'%s', '%s'," % (
                          enum_class.get_py_mod_name(),
                          enum_class.qn()))
-        # description = " "
-        # for st in enum_class.stmt.parent.substmts:
-        #     if st.keyword == 'description':
-        #         description = st.arg
-        #         break
-        self.ctx.writeln('"""%s""",' % enum_class.comment)
+        description = " "
+        for st in enum_class.stmt.parent.substmts:
+            if st.keyword == 'description':
+                description = st.arg
+                break
+        self.ctx.writeln("'''%s'''," % description)
         self.ctx.writeln("{")
         self.ctx.lvl_inc()
         for literal in enum_class.literals:
-            self.ctx.writeln("'%s': '%s'," % (literal.stmt.arg, literal.name))
+            self.ctx.writeln("'%s':'%s'," % (literal.stmt.arg, literal.name))
         self.ctx.lvl_dec()
-        self.ctx.writeln("}, '%s', _yang_ns.NAMESPACE_LOOKUP['%s'])," %
-                         (get_module_name(enum_class.stmt), get_module_name(enum_class.stmt)))
+        self.ctx.writeln("}, '%s', _yang_ns.NAMESPACE_LOOKUP['%s'])," % (get_module_name(enum_class.stmt), get_module_name(enum_class.stmt)))
         self.ctx.lvl_dec()
 
     def _print_enum_header(self, enum_class):
diff --git a/ydkgen/printer/python/import_test_printer.py b/ydkgen/printer/python/import_test_printer.py
index c9a3dbe43..4cc612827 100644
--- a/ydkgen/printer/python/import_test_printer.py
+++ b/ydkgen/printer/python/import_test_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
  import_test_printer.py
 
  YANG model driven API, python emitter.
+
 """
 
 from ydkgen.api_model import Class, Enum, Package
@@ -32,9 +33,9 @@ def print_import_tests(self, packages):
         self.ctx.bline()
         self.ctx.writeln('import unittest')
         self.ctx.bline()
-        self.ctx.bline()
         self.ctx.writeln('class ImportTest(unittest.TestCase):')
         self.ctx.lvl_inc()
+        self.ctx.bline()
 
         def collect_types(element, typelist):
             sorted(types, key=lambda x: x.name)
@@ -57,10 +58,10 @@ def collect_types(element, typelist):
             else:
                 self.ctx.writeln('pass')
             self.ctx.lvl_dec()
-
+            self.ctx.bline()
         self.ctx.lvl_dec()
         self.ctx.bline()
-        self.ctx.bline()
+
         self.ctx.writeln("if __name__ == '__main__':")
         self.ctx.lvl_inc()
         self.ctx.writeln('unittest.main()')
diff --git a/ydkgen/printer/python/module_printer.py b/ydkgen/printer/python/module_printer.py
index 42ca09f33..5b4aa4dea 100644
--- a/ydkgen/printer/python/module_printer.py
+++ b/ydkgen/printer/python/module_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
  module_printer.py
 
  YANG model driven API, python emitter.
-"""
 
+"""
+import sys
 from ydkgen.api_model import Class, Enum, Package
 from ydkgen.common import convert_to_reStructuredText
 
@@ -36,7 +37,10 @@
 class ModulePrinter(FilePrinter):
 
     def __init__(self, ctx, extra_args):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(ModulePrinter, self).__init__(ctx)
         self.one_class_per_module = extra_args.get('one_class_per_module', False)
         self.identity_subclasses = extra_args.get('identity_subclasses', {})
         self.module_namespace_lookup = extra_args.get('module_namespace_lookup', {})
@@ -75,6 +79,7 @@ def _print_module_description(self, package):
         self.ctx.writeln('"""')
 
     def _print_static_imports(self):
+        self.ctx.writeln("import sys")
         self.ctx.writeln("from collections import OrderedDict")
         self.ctx.bline()
         self.ctx.writeln("from ydk.types import Entity as _Entity_")
@@ -84,6 +89,7 @@ def _print_static_imports(self):
         self.ctx.writeln("from ydk.filters import YFilter")
         self.ctx.writeln("from ydk.errors import YError, YModelError")
         self.ctx.writeln("from ydk.errors.error_handler import handle_type_error as _handle_type_error")
+        self.ctx.bline()
 
     def _print_imports(self, package):
         self._print_static_imports()
@@ -101,9 +107,6 @@ def _print_imports(self, package):
                         imported_type.get_py_mod_name(), imported_type.qn().split('.')[0])
                 imports_to_print.add(imported_stmt)
 
-        if imports_to_print:
-            self.ctx.bline()
-
         for imported_stmt in sorted(imports_to_print):
             self.ctx.writeln(imported_stmt)
 
diff --git a/ydkgen/printer/python/namespace_printer.py b/ydkgen/printer/python/namespace_printer.py
index a7b5aa784..e22700b5a 100644
--- a/ydkgen/printer/python/namespace_printer.py
+++ b/ydkgen/printer/python/namespace_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------------
-# This file has been modified by Yan Gorelik, YDK Solutions.
-# All modifications in original under CiscoDevNet domain
-# introduced since October 2019 are copyrighted.
-# All rights reserved under Apache License, Version 2.0.
-# ------------------------------------------------------------------
 
-"""
- namespace_printer.py
+""" namespace_printer.py
 
- Print capabilities for bundle package.
+Print capabilities for bundle package.
 """
-
+import sys
 from ydkgen.printer.file_printer import FilePrinter
 from ydkgen.api_model import get_property_name, Class
 from ydkgen.common import get_module_name
@@ -32,7 +26,10 @@
 
 class NamespacePrinter(FilePrinter):
     def __init__(self, ctx, one_class_per_module):
-        super().__init__(ctx)
+        if sys.version_info > (3,):
+            super().__init__(ctx)
+        else:
+            super(NamespacePrinter, self).__init__(ctx)
         self.bundle_name = ''
         self.packages = None
         self.one_class_per_module = one_class_per_module
diff --git a/ydkgen/printer/python/python_bindings_printer.py b/ydkgen/printer/python/python_bindings_printer.py
index c5e930c23..811192ea7 100644
--- a/ydkgen/printer/python/python_bindings_printer.py
+++ b/ydkgen/printer/python/python_bindings_printer.py
@@ -1,5 +1,5 @@
 #  ----------------------------------------------------------------
-# Copyright 2016-2019 Cisco Systems
+# Copyright 2016 Cisco Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,10 +20,11 @@
 # ------------------------------------------------------------------
 
 """
- YDK PY converter
+   YDK PY converter
 """
 
 import os
+import sys
 import shutil
 from distutils import dir_util
 
@@ -47,7 +48,10 @@
 class PythonBindingsPrinter(LanguageBindingsPrinter):
 
     def __init__(self, ydk_root_dir, bundle, generate_tests, one_class_per_module):
-        super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        if sys.version_info > (3,):
+            super().__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
+        else:
+            super(PythonBindingsPrinter, self).__init__(ydk_root_dir, bundle, generate_tests, one_class_per_module)
         self.bundle = bundle
         self.bundle_name = bundle.name
         self.bundle_version = bundle.str_version
diff --git a/ydkgen/printer/tests/test_fixture_printer.py b/ydkgen/printer/tests/test_fixture_printer.py
index 58c46cc52..2d22611f0 100644
--- a/ydkgen/printer/tests/test_fixture_printer.py
+++ b/ydkgen/printer/tests/test_fixture_printer.py
@@ -19,7 +19,7 @@
 
 Printer for test fixture.
 """
-
+import sys
 from .printer import Printer
 
 
@@ -32,7 +32,10 @@ class FixturePrinter(Printer):
     def __init__(self, ctx, lang,
                  address='localhost', username='admin',
                  password='admin', port=1222):
-        super().__init__(ctx, lang)
+        if sys.version_info > (3,):
+            super().__init__(ctx, lang)
+        else:
+            super(FixturePrinter, self).__init__(ctx, lang)
         self.address = address
         self.username = username
         self.password = password
diff --git a/ydkgen/printer/tests/test_printer.py b/ydkgen/printer/tests/test_printer.py
index a94930d22..0e419ce48 100644
--- a/ydkgen/printer/tests/test_printer.py
+++ b/ydkgen/printer/tests/test_printer.py
@@ -19,7 +19,7 @@
 
 Test printer.
 """
-
+import sys
 from ydkgen.common import iscppkeyword
 
 from ydkgen.builder import TestBuilder
@@ -36,7 +36,10 @@ class TestPrinter(FixturePrinter):
     """Test printer."""
 
     def __init__(self, ctx, lang):
-        super().__init__(ctx, lang)
+        if sys.version_info > (3,):
+            super().__init__(ctx, lang)
+        else:
+            super(TestPrinter, self).__init__(ctx, lang)
 
     def print_tests(self, package, identity_subclasses):
         """Print all test case."""
diff --git a/ydkgen/resolver/bundle_resolver.py b/ydkgen/resolver/bundle_resolver.py
index 231098e42..bec057ad1 100644
--- a/ydkgen/resolver/bundle_resolver.py
+++ b/ydkgen/resolver/bundle_resolver.py
@@ -25,6 +25,7 @@
 """
 import re
 import os
+import sys
 import json
 import logging
 import tempfile
@@ -33,7 +34,6 @@
 from collections import namedtuple, defaultdict
 from .bundle_translator import translate
 from ..common import YdkGenException
-from packaging.version import Version, InvalidVersion
 
 
 logger = logging.getLogger('ydkgen')
@@ -44,6 +44,7 @@
 Remote = namedtuple('Remote', ['url', 'commitid', 'path'])
 RepoDir = namedtuple('RepoDir', ['repo', 'dir'])
 Bundles = namedtuple('Bundles', ['curr_bundle', 'bundles'])
+Version = namedtuple('Version', ['major', 'minor', 'patch'])
 
 
 def nested_defaultdict():
@@ -86,16 +87,8 @@ class BundleDefinition(object):
 
     def __init__(self, data):
         self._name = data['name'].replace('-', '_')
-        try:
-            self._version = Version(data['version'])
-        except InvalidVersion:
-            raise YdkGenException("Bundle version '%s' is not valid."
-                                  "Version format must be 'N(.N)*[{a|b|rc}N][.postN][.devN]'." % data['version'])
-        try:
-            self._core_version = Version(data['core-version'])
-        except InvalidVersion:
-            raise YdkGenException("YDK core version '%s' is not valid."
-                                  "Version format must be 'N(.N)*[{a|b|rc}N][.postN][.devN]'." % data['core_version'])
+        self._version = Version(*tuple(data['version'].split('.')))
+        self._core_version = Version(*tuple(data['core-version'].split('.')))
         self._description = data['description'] if 'description' in data else str()
         self._long_description = data['long-description'] if 'long-description' in data else str()
 
@@ -121,12 +114,12 @@ def core_version(self):
     @property
     def str_version(self):
         """ Return string representation of version."""
-        return str(self.version)
+        return "%s.%s.%s" % self.version
 
     @property
     def str_core_version(self):
         """ Return string representation of ydk version."""
-        return str(self.core_version)
+        return "%s.%s.%s" % self.core_version
 
     @property
     def description(self):
@@ -151,7 +144,10 @@ class BundleDependency(BundleDefinition):
     """
 
     def __init__(self, data):
-        super().__init__(data)
+        if sys.version_info > (3,):
+            super().__init__(data)
+        else:
+            super(BundleDependency, self).__init__(data)
         self.uri = parse_uri(data['uri'])
 
 
@@ -239,7 +235,10 @@ def __init__(self, uri, resolved_models_root, iskeyword):
 
         try:
             data['bundle']['name'] = data['bundle']['name'].replace('.', '_')
-            super().__init__(data['bundle'])
+            if sys.version_info > (3,):
+                super().__init__(data['bundle'])
+            else:
+                super(Bundle, self).__init__(data['bundle'])
             if 'modules' in data:
                 for m in data['modules']:
                     self.models.append(Model(m, self.iskeyword))
@@ -326,15 +325,38 @@ def _resolve_bundles(self, root):
                 elif isinstance(entry, list):
                     entry.append(root)
             elif isinstance(uri, Local):
-                _resolve_file(uri.url, root.resolved_models_dir)
+                self._resolve_file(uri.url, root.resolved_models_dir)
         for d in root.dependencies:
             if d.fqn not in self.bundles:
                 node = Bundle(self._resolve_bundle_file(d.uri),
                               self.cached_models_dir, self.iskeyword)
                 self.bundles[d.fqn] = node
-                _add_symlink(root, node)
+                self._add_symlink(root, node)
                 self._resolve_bundles(node)
 
+    def _add_symlink(self, bundle, dependency):
+        source = dependency.resolved_models_dir
+        link_name = os.path.basename(source)
+        link_name = os.path.join(bundle.resolved_models_dir, link_name)
+        os.symlink(source, link_name)
+
+    def _clone_repo(self, url, suffix=''):
+        tmp_dir = tempfile.mkdtemp(suffix)
+        repo = Repo.clone_from(url, tmp_dir)
+        return RepoDir(repo, tmp_dir)
+
+    def _resolve_file(self, src, dst_dir, rename=''):
+        """ Resolve file from src to dst directory.
+        """
+        fname = os.path.basename(src)
+        logger.debug('Resolving file {} --> {}'.format(fname, dst_dir))
+        if rename == '':
+            dst = os.path.join(dst_dir, fname)
+        else:
+            dst = os.path.join(dst_dir, rename)
+        copy(src, dst)
+        return dst
+
     def _translate(self, description_file):
         """ Try to translate description file to bundle description file syntax.
         """
@@ -353,49 +375,23 @@ def _resolve_bundle_file(self, uri):
         if isinstance(uri, Local):
             src = uri.url
         else:
-            repo, tmp_dir = _clone_repo(uri.url, suffix='.bundle')
+            repo, tmp_dir = self._clone_repo(uri.url, suffix='.bundle')
             repo.git.checkout(uri.commitid)
             src = os.path.join(tmp_dir, uri.path)
 
-        resolved_file = _resolve_file(src, self.cached_bundles_dir)
+        resolved_file = self._resolve_file(src, self.cached_bundles_dir)
         return self._translate(resolved_file)
 
     def _resolve_models(self):
         """ Resolve module files."""
         for url in self.repos:
-            repo, tmp_dir = _clone_repo(url, suffix='.yang')
+            repo, tmp_dir = self._clone_repo(url, suffix='.yang')
             for commitid in self.repos[url]:
                 repo.git.checkout(commitid)
                 for path in self.repos[url][commitid]:
                     src = os.path.join(tmp_dir, path)
                     bundles = self.repos[url][commitid][path]
                     for bundle in bundles:
-                        _resolve_file(src, bundle.resolved_models_dir)
+                        self._resolve_file(src, bundle.resolved_models_dir)
 
             rmtree(tmp_dir)
-
-
-def _add_symlink(bundle, dependency):
-    source = dependency.resolved_models_dir
-    link_name = os.path.basename(source)
-    link_name = os.path.join(bundle.resolved_models_dir, link_name)
-    os.symlink(source, link_name)
-
-
-def _clone_repo(url, suffix=''):
-    tmp_dir = tempfile.mkdtemp(suffix)
-    repo = Repo.clone_from(url, tmp_dir)
-    return RepoDir(repo, tmp_dir)
-
-
-def _resolve_file(src, dst_dir, rename=''):
-    """ Resolve file from src to dst directory.
-    """
-    fname = os.path.basename(src)
-    logger.debug('Resolving file {} --> {}'.format(fname, dst_dir))
-    if rename == '':
-        dst = os.path.join(dst_dir, fname)
-    else:
-        dst = os.path.join(dst_dir, rename)
-    copy(src, dst)
-    return dst
diff --git a/ydkgen/resolver/bundle_translator.py b/ydkgen/resolver/bundle_translator.py
index 4935329f5..5f841e8b7 100644
--- a/ydkgen/resolver/bundle_translator.py
+++ b/ydkgen/resolver/bundle_translator.py
@@ -144,8 +144,8 @@ def get_file_attrs(files, root, remote=None):
 
 def get_dir_attrs(dirs, root, remote=None):
     for d in dirs:
-        for (dd, _, files) in walk(os.path.join(root, d.lstrip('/'))):
-            for res in get_file_attrs((os.path.join(dd, f) for f in files),
+        for (d, _, files) in walk(os.path.join(root, d.lstrip('/'))):
+            for res in get_file_attrs((os.path.join(d, f) for f in files),
                                       root,
                                       remote):
                 yield res
@@ -204,18 +204,17 @@ def translate(in_file, out_file, root_dir):
     for source in accepted_resources:
         if source in data['models']:
             get_fun = 'get_%s_attrs' % source
-            modules.extend(globals()[get_fun](data['models'][source], ydk_root))
+            modules.extend(globals()[get_fun](data['models'][source],ydk_root))
 
     try:
-        name = data['name']
         version = data['version']
-        core_version = data['core_version']
         description = data['description']
     except KeyError:
-        raise YdkGenException('Bundle profile requires to specify name, version, core_version and description.')
+        raise YdkGenException('Bundle file requires version and description.')
 
+    core_version = data['core_version'] if 'core_version' in data else version
     long_description = data['long_description'] if 'long_description' in data else str()
-    definition = Bundle(name, version, core_version, description, long_description)
+    definition = Bundle(load_profile_attr(in_file, 'name'), version, core_version, description, long_description)
     dependency = load_profile_attr(in_file, 'dependency')
 
     output = Environment().from_string(TEMPLATE).render(