diff --git a/CHANGELOG.md b/CHANGELOG.md
index d72888cf05..b0bb35b1a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,10 +37,10 @@
 * migraphx - `2.1.0.50101-48`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.5.5](https://github.com/opencv/opencv/releases/tag/4.5.5)
-* RPP - [0.95](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.95)
+* RPP - [0.96](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.96)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.3.5`
+* MIVisionX Setup Script - `V2.3.6`
 
 ### Known issues
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dbc7e0d53..b1ad1be9c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,8 @@ else()
     set(BACKEND "CPU")
     set(GPU_SUPPORT OFF)
   else()
-    message("-- ${Red}Warning: MIVisionX backend option unknown -- ${BACKEND}${ColourReset}")
-    message("-- ${Red}Warning: MIVisionX default backend will enforced${ColourReset}")
+    message("-- ${Red}Warning: MIVisionX backend option: ${BACKEND} -- unknown${ColourReset}")
+    message("-- ${Red}Warning: MIVisionX default backend will be enforced${ColourReset}")
     set(BACKEND "HIP")
   endif()
 endif()
@@ -101,9 +101,11 @@ if(NOT CMAKE_BUILD_TYPE)
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
+  # -O0  -- Don't Optimize output file; -g -- generate debugging information; -Og -- Optimize for debugging experience rather than speed or size.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -Og")
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
+  # -O3 -- Optimize output file; -DNDEBUG -- turn off asserts.
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG")
 endif()
 message("-- ${BoldBlue}MIVisionX Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}")
 
diff --git a/MIVisionX-setup.py b/MIVisionX-setup.py
index ae2ea44eeb..a82bae5b7f 100644
--- a/MIVisionX-setup.py
+++ b/MIVisionX-setup.py
@@ -30,7 +30,7 @@
 __author__ = "Kiriti Nagesh Gowda"
 __copyright__ = "Copyright 2018 - 2022, AMD ROCm MIVisionX"
 __license__ = "MIT"
-__version__ = "2.3.5"
+__version__ = "2.3.6"
 __maintainer__ = "Kiriti Nagesh Gowda"
 __email__ = "mivisionx.support@amd.com"
 __status__ = "Shipping"
@@ -43,8 +43,8 @@
                     help='OpenCV Version - optional (default:4.5.5)')
 parser.add_argument('--protobuf',  	type=str, default='3.12.4',
                     help='ProtoBuf Version - optional (default:3.12.4)')
-parser.add_argument('--rpp',   		type=str, default='0.95',
-                    help='RPP Version - optional (default:0.95)')
+parser.add_argument('--rpp',   		type=str, default='0.96',
+                    help='RPP Version - optional (default:0.96)')
 parser.add_argument('--ffmpeg',    	type=str, default='no',
                     help='FFMPEG V4.4.2 Installation - optional (default:no) [options:yes/no]')
 parser.add_argument('--neural_net',	type=str, default='yes',
@@ -390,8 +390,6 @@
             # RPP
             # Remove Previous Install - RPP
             os.system('sudo -v')
-            if os.path.exists(ROCM_PATH+'/rpp'):
-                os.system('sudo rm -rf '+ROCM_PATH+'/rpp')
             os.system('(cd '+deps_dir+'; git clone -b '+rppVersion+' https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git; cd rpp; mkdir build-'+backend+'; cd build-'+backend+'; ' +
                       linuxCMake+' -DBACKEND='+backend+' ../; make -j4; sudo make install)')
 
diff --git a/README.md b/README.md
index 9163964019..55e9a379ee 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ For the convenience of the developer, we here provide the setup script which wil
   python MIVisionX-setup.py --directory [setup directory - optional (default:~/)]
                             --opencv    [OpenCV Version - optional (default:4.5.5)]
                             --protobuf  [ProtoBuf Version - optional (default:3.12.4)]
-                            --rpp       [RPP Version - optional (default:0.91)]
+                            --rpp       [RPP Version - optional (default:0.96)]
                             --ffmpeg    [FFMPEG V4.4.2 Installation - optional (default:no) [options:yes/no]]
                             --rocal     [MIVisionX rocAL Dependency Install - optional (default:yes) [options:yes/no]]
                             --neural_net[MIVisionX Neural Net Dependency Install - optional (default:yes) [options:yes/no]]
@@ -440,10 +440,10 @@ Review all notable [changes](CHANGELOG.md#changelog) with the latest release
 * migraphx - `2.1.0.50101-48`
 * Protobuf - [V3.12.4](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.4)
 * OpenCV - [4.5.5](https://github.com/opencv/opencv/releases/tag/4.5.5)
-* RPP - [0.95](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.95)
+* RPP - [0.96](https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/releases/tag/0.96)
 * FFMPEG - [n4.4.2](https://github.com/FFmpeg/FFmpeg/releases/tag/n4.4.2)
 * Dependencies for all the above packages
-* MIVisionX Setup Script - `V2.3.5`
+* MIVisionX Setup Script - `V2.3.6`
 
 ### Known issues
 
diff --git a/amd_openvx/cmake/FindAMDRPP.cmake b/amd_openvx/cmake/FindAMDRPP.cmake
index 09ce4666e6..f2474f117f 100644
--- a/amd_openvx/cmake/FindAMDRPP.cmake
+++ b/amd_openvx/cmake/FindAMDRPP.cmake
@@ -27,7 +27,7 @@ find_path(AMDRPP_INCLUDE_DIRS
     NAMES rpp.h
     PATHS
     /usr/include
-    ${ROCM_PATH}/rpp/include
+    ${ROCM_PATH}/include/rpp
 )
 mark_as_advanced( AMDRPP_INCLUDE_DIRS )
 
@@ -35,7 +35,7 @@ find_library( AMDRPP_LIBRARIES
     NAMES amd_rpp
     PATHS
     /usr/lib
-    ${ROCM_PATH}/rpp/lib
+    ${ROCM_PATH}/lib
 )
 mark_as_advanced( AMDRPP_LIBRARIES_DIR )
 
@@ -43,7 +43,7 @@ find_path(AMDRPP_LIBRARIES_DIR
     NAMES libamd_rpp.so
     PATHS
     /usr/lib
-    ${ROCM_PATH}/rpp/lib
+    ${ROCM_PATH}/lib
 )
     
 include( FindPackageHandleStandardArgs )
diff --git a/amd_openvx_extensions/CMakeLists.txt b/amd_openvx_extensions/CMakeLists.txt
index e2645bec9f..e66008dc43 100644
--- a/amd_openvx_extensions/CMakeLists.txt
+++ b/amd_openvx_extensions/CMakeLists.txt
@@ -136,14 +136,14 @@ if(AMDRPP_FOUND AND GPU_SUPPORT)
     #find the RPP backend type
     set(RPP_BACKEND_OPENCL_FOUND 0)
     set(RPP_BACKEND_HIP_FOUND 0)
-    if(EXISTS ${ROCM_PATH}/rpp/include/rpp_backend.h)
-        file(READ ${ROCM_PATH}/rpp/include/rpp_backend.h RPP_BACKEND_FILE)
+    if(EXISTS ${ROCM_PATH}/include/rpp/rpp_backend.h)
+        file(READ ${ROCM_PATH}/include/rpp/rpp_backend.h RPP_BACKEND_FILE)
         string(REGEX MATCH "RPP_BACKEND_OPENCL ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_OPENCL_FOUND ${CMAKE_MATCH_1})
         string(REGEX MATCH "RPP_BACKEND_HIP ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_HIP_FOUND ${CMAKE_MATCH_1})
     else()
-        message("-- ${Red}WARNING: ${ROCM_PATH}/rpp/include/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
+        message("-- ${Red}WARNING: ${ROCM_PATH}/include/rpp/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
     endif()
 
     if ("${BACKEND}" STREQUAL "OPENCL" AND OpenCL_FOUND)
diff --git a/amd_openvx_extensions/amd_media/CMakeLists.txt b/amd_openvx_extensions/amd_media/CMakeLists.txt
index 0cc2308f39..248fcd282f 100644
--- a/amd_openvx_extensions/amd_media/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_media/CMakeLists.txt
@@ -96,6 +96,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else()
+    # -Wno-deprecated-declarations -- Do not warn about uses of functions, variables, and types marked as deprecated by using the deprecated attribute. 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -msse4.2 -std=gnu++14")
 endif()
 
diff --git a/amd_openvx_extensions/amd_opencv/CMakeLists.txt b/amd_openvx_extensions/amd_opencv/CMakeLists.txt
index 4eb81a47aa..6ecbdf3105 100644
--- a/amd_openvx_extensions/amd_opencv/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_opencv/CMakeLists.txt
@@ -122,6 +122,7 @@ if(WIN32)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 else()
 	target_link_libraries(vx_opencv openvx)
+	# -fdata-sections -- Place data items into their own section.
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -std=gnu++14")
 endif()
 
diff --git a/amd_openvx_extensions/amd_rpp/CMakeLists.txt b/amd_openvx_extensions/amd_rpp/CMakeLists.txt
index 75ce1eaadf..153e934244 100644
--- a/amd_openvx_extensions/amd_rpp/CMakeLists.txt
+++ b/amd_openvx_extensions/amd_rpp/CMakeLists.txt
@@ -154,6 +154,7 @@ elseif (GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP" AND HIP_FOUND)
     add_library(vx_rpp SHARED ${SOURCES})
     set_target_properties(openvx PROPERTIES LINKER_LANGUAGE CXX)
     set_target_properties(openvx PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    # TBD -- CHECK to FIX
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGPU_SUPPORT=1 -DRPP_BACKEND_HIP=1") # Currently used by rpp. To be removed.
     target_link_libraries(vx_rpp amd_rpp boost_filesystem boost_system ${HIP_LIBRARY})
 else()
diff --git a/apps/cloud_inference/server_app/CMakeLists.txt b/apps/cloud_inference/server_app/CMakeLists.txt
index 89005c655a..4d52810ee7 100644
--- a/apps/cloud_inference/server_app/CMakeLists.txt
+++ b/apps/cloud_inference/server_app/CMakeLists.txt
@@ -64,6 +64,7 @@ add_executable(${PROJECT_NAME} ${My_Source_Files})
 
 # Link Libraries & Set CXX Flags
 target_link_libraries(${PROJECT_NAME} vx_nn openvx pthread dl)
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 # Link OpenCL/HIP
diff --git a/apps/image_augmentation/CMakeLists.txt b/apps/image_augmentation/CMakeLists.txt
index 23124ddded..2817eedbe8 100644
--- a/apps/image_augmentation/CMakeLists.txt
+++ b/apps/image_augmentation/CMakeLists.txt
@@ -73,6 +73,7 @@ else()
 endif()
 
 # Link Libraries & Set CXX Flags
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mf16c -Wall ")
 target_link_libraries(${PROJECT_NAME} rocal ${OpenCV_LIBRARIES} )
 
diff --git a/apps/image_augmentation/README.md b/apps/image_augmentation/README.md
index 4956b2968c..3caefdc13f 100644
--- a/apps/image_augmentation/README.md
+++ b/apps/image_augmentation/README.md
@@ -17,7 +17,6 @@ This application demonstrates the basic usage of rocAL's C API to load JPEG imag
 
 ``` 
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib
  mkdir build
  cd build
  cmake ../
diff --git a/apps/mivisionx_openvx_classifier/CMakeLists.txt b/apps/mivisionx_openvx_classifier/CMakeLists.txt
index 58ce5950ec..f52926559d 100644
--- a/apps/mivisionx_openvx_classifier/CMakeLists.txt
+++ b/apps/mivisionx_openvx_classifier/CMakeLists.txt
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME} source/classifier.cpp)
 
 # Link Libraries & Set CXX Flags
 target_link_libraries(${PROJECT_NAME} openvx vx_nn caffeModels pthread)
+# -mf16c -- Support F16C built-in functions and code generation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 # OpenCV 3/4 Support
diff --git a/apps/mivisionx_validation_tool/README.md b/apps/mivisionx_validation_tool/README.md
index 5e71ecbacd..909d281960 100644
--- a/apps/mivisionx_validation_tool/README.md
+++ b/apps/mivisionx_validation_tool/README.md
@@ -51,7 +51,7 @@ Pre-trained models in [ONNX](https://onnx.ai/), [NNEF](https://www.khronos.org/n
 
 ``` 
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 ```
 
 **NOTE:**
@@ -89,7 +89,7 @@ sudo docker run -it --device=/dev/kfd --device=/dev/dri --cap-add=SYS_RAWIO --de
 
 ``` 
 export PATH=$PATH:/opt/rocm/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 runvx /opt/rocm/share/mivisionx/samples/gdf/canny.gdf
 ```
 
@@ -200,7 +200,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-1/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 
@@ -245,7 +245,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-2/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 
@@ -291,7 +291,7 @@ usage: python mivisionx_validation_tool.py
     ``` 
 	cd ~/sample-3/MIVisionX-validation-tool/
 	export PATH=$PATH:/opt/rocm/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 	python mivisionx_validation_tool.py -h
     ```
 
diff --git a/docker/mivisionx-on-ubuntu18.dockerfile b/docker/mivisionx-on-ubuntu18.dockerfile
index a616633101..39048b703b 100644
--- a/docker/mivisionx-on-ubuntu18.dockerfile
+++ b/docker/mivisionx-on-ubuntu18.dockerfile
@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/mivisionx-on-ubuntu20.dockerfile b/docker/mivisionx-on-ubuntu20.dockerfile
index 75c99e9aa5..0636d54ff7 100644
--- a/docker/mivisionx-on-ubuntu20.dockerfile
+++ b/docker/mivisionx-on-ubuntu20.dockerfile
@@ -39,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/mivisionx-opencl-on-ubuntu18.dockerfile b/docker/mivisionx-opencl-on-ubuntu18.dockerfile
index ba004d6779..034cee929a 100644
--- a/docker/mivisionx-opencl-on-ubuntu18.dockerfile
+++ b/docker/mivisionx-opencl-on-ubuntu18.dockerfile
@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/mivisionx-opencl-on-ubuntu20.dockerfile b/docker/mivisionx-opencl-on-ubuntu20.dockerfile
index ab7a48218c..aca1f2e94c 100644
--- a/docker/mivisionx-opencl-on-ubuntu20.dockerfile
+++ b/docker/mivisionx-opencl-on-ubuntu20.dockerfile
@@ -39,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/pytorch/mivisionx-with-pytorch.dockerfile b/docker/pytorch/mivisionx-with-pytorch.dockerfile
index dcb509c11f..0066968243 100644
--- a/docker/pytorch/mivisionx-with-pytorch.dockerfile
+++ b/docker/pytorch/mivisionx-with-pytorch.dockerfile
@@ -40,7 +40,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/ubuntu18/level-5.dockerfile b/docker/ubuntu18/level-5.dockerfile
index ba004d6779..034cee929a 100644
--- a/docker/ubuntu18/level-5.dockerfile
+++ b/docker/ubuntu18/level-5.dockerfile
@@ -39,7 +39,7 @@ RUN apt-get -y install wget autoconf automake libbz2-dev libssl-dev python-dev p
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/ubuntu20/level-5.dockerfile b/docker/ubuntu20/level-5.dockerfile
index ab7a48218c..aca1f2e94c 100644
--- a/docker/ubuntu20/level-5.dockerfile
+++ b/docker/ubuntu20/level-5.dockerfile
@@ -39,7 +39,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=OCL ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/docker/zenDNN/zenDNN-HIP.dockerfile b/docker/zenDNN/zenDNN-HIP.dockerfile
index 5503634de4..6d4ef51364 100644
--- a/docker/zenDNN/zenDNN-HIP.dockerfile
+++ b/docker/zenDNN/zenDNN-HIP.dockerfile
@@ -43,7 +43,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget libbz2-dev libssl-dev
         sudo ./b2 install threading=multi link=shared --with-system --with-filesystem && \
         ./b2 stage -j16 threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic" && \
         sudo ./b2 install threading=multi link=static --with-system --with-filesystem && cd ../ && \
-        git clone -b 0.95  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
+        git clone -b 0.96  https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git && cd rpp && mkdir build && cd build && \
         cmake -DBACKEND=HIP ../ && make -j4 && sudo make install && cd ../../ && \
         git clone -b v3.12.4 https://github.com/protocolbuffers/protobuf.git && cd protobuf && git submodule update --init --recursive && \
         ./autogen.sh && ./configure && make -j8 && make check -j8 && sudo make install && sudo ldconfig && cd
diff --git a/rocAL/rocAL/CMakeLists.txt b/rocAL/rocAL/CMakeLists.txt
index 38877506be..c2ff150a7a 100644
--- a/rocAL/rocAL/CMakeLists.txt
+++ b/rocAL/rocAL/CMakeLists.txt
@@ -86,14 +86,14 @@ if(GPU_SUPPORT)
         #find the RPP backend type
         set(RPP_BACKEND_OPENCL_FOUND 0)
         set(RPP_BACKEND_HIP_FOUND 0)
-        if(EXISTS ${ROCM_PATH}/rpp/include/rpp_backend.h)
-            file(READ ${ROCM_PATH}/rpp/include/rpp_backend.h RPP_BACKEND_FILE)
+        if(EXISTS ${ROCM_PATH}/include/rpp/rpp_backend.h)
+            file(READ ${ROCM_PATH}/include/rpp/rpp_backend.h RPP_BACKEND_FILE)
             string(REGEX MATCH "RPP_BACKEND_OPENCL ([0-9]*)" _ ${RPP_BACKEND_FILE})
             set(RPP_BACKEND_OPENCL_FOUND ${CMAKE_MATCH_1})
             string(REGEX MATCH "RPP_BACKEND_HIP ([0-9]*)" _ ${RPP_BACKEND_FILE})
             set(RPP_BACKEND_HIP_FOUND ${CMAKE_MATCH_1})
         else()
-            message("-- ${Red}WARNING: ${ROCM_PATH}/rpp/include/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
+            message("-- ${Red}WARNING: ${ROCM_PATH}/include/rpp/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
         endif()
 
         if ("${BACKEND}" STREQUAL "OPENCL" AND OpenCL_FOUND)
@@ -140,8 +140,6 @@ if(${BUILD_ROCAL})
         find_path(AVFORMAT_INCLUDE_DIR libavformat/avformat.h)
     endif()
     include_directories(
-                ${OpenCL_INCLUDE_DIRS}
-                ${OpenCL_INCLUDE_DIRS}/Headers
                 ${AVUTIL_INCLUDE_DIR}
                 ${AVCODEC_INCLUDE_DIR}
                 ${SWSCALE_INCLUDE_DIR}
@@ -217,7 +215,11 @@ if(${BUILD_ROCAL})
     else()
         target_compile_definitions(${PROJECT_NAME} PUBLIC ENABLE_OPENCV=0)
     endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -msse4.2 -mavx2 -Wall -fPIC -pg -pthread -Wno-deprecated-declarations -std=gnu++17")
+    # -Wall -- Enable most warning messages; -fPIC -- Generate position-independent code if possible.
+    # -mavx2 -- Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX and AVX2 built-in functions and code generation.
+    # -Wno-deprecated-declarations -- Do not warn about uses of functions, variables, and types marked as deprecated by using the deprecated attribute.
+    # -std=gnu++17 -- Conform to the ISO 2017 C++ standard with GNU extensions.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -pthread -Wall -fPIC -mavx2 -Wno-deprecated-declarations -std=gnu++17")
     message("-- ${White}rocAL -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}")
 
     if(NOT FFMPEG_FOUND)
diff --git a/rocAL/rocAL_pybind/CMakeLists.txt b/rocAL/rocAL_pybind/CMakeLists.txt
index a1bcb12f90..f7c4b98e22 100644
--- a/rocAL/rocAL_pybind/CMakeLists.txt
+++ b/rocAL/rocAL_pybind/CMakeLists.txt
@@ -69,14 +69,14 @@ else()
     #find the RPP backend type
     set(RPP_BACKEND_OPENCL_FOUND 0)
     set(RPP_BACKEND_HIP_FOUND 0)
-    if(EXISTS ${ROCM_PATH}/rpp/include/rpp_backend.h)
-        file(READ ${ROCM_PATH}/rpp/include/rpp_backend.h RPP_BACKEND_FILE)
+    if(EXISTS ${ROCM_PATH}/include/rpp/rpp_backend.h)
+        file(READ ${ROCM_PATH}/include/rpp/rpp_backend.h RPP_BACKEND_FILE)
         string(REGEX MATCH "RPP_BACKEND_OPENCL ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_OPENCL_FOUND ${CMAKE_MATCH_1})
         string(REGEX MATCH "RPP_BACKEND_HIP ([0-9]*)" _ ${RPP_BACKEND_FILE})
         set(RPP_BACKEND_HIP_FOUND ${CMAKE_MATCH_1})
     else()
-        message("-- ${Red}WARNING: ${ROCM_PATH}/rpp/include/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
+        message("-- ${Red}WARNING: ${ROCM_PATH}/include/rpp/rpp_backend.h file Not Found. please run the setup script to install latest RPP package ${ColourReset}")
     endif()
     if ("${BACKEND}" STREQUAL "OPENCL" AND OpenCL_FOUND)
         if (NOT RPP_BACKEND_OPENCL_FOUND)
@@ -108,9 +108,8 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${MIN_CXX_VER_REQUIRED})
 endif()
 
 if(${BUILD_ROCAL_PYBIND})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 
-    link_directories(${ROCM_PATH}/rpp/lib ${ROCM_PATH}/lib)
+    link_directories(${ROCM_PATH}/lib)
 
     include_directories(../rocAL/include/api/
                         third_party_lib/
@@ -120,7 +119,7 @@ if(${BUILD_ROCAL_PYBIND})
 
     pybind11_add_module(rocal_pybind rocal_pybind.cpp)
     target_link_libraries(rocal_pybind PRIVATE rocal  vx_rpp amd_rpp)
-
+    message("-- ${White}rocal_pybind -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}")
     install(TARGETS rocal_pybind DESTINATION lib)
     message("-- ${Green}Radeon Augmentation Library Python Binding - rocal_pybind module added ${ColourReset}")
 else()
diff --git a/rocAL/rocAL_pybind/README.md b/rocAL/rocAL_pybind/README.md
index efde1ac5f2..3e583b3605 100644
--- a/rocAL/rocAL_pybind/README.md
+++ b/rocAL/rocAL_pybind/README.md
@@ -37,7 +37,6 @@ pip3 install numpy opencv-python torch
 * Export `RPP` & `rocAL` library into PATH
 ```
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib/
 ```
 #### Run Test Script
 
diff --git a/samples/inference/mv_objdetect/CMakeLists.txt b/samples/inference/mv_objdetect/CMakeLists.txt
index 3a04085b28..5b22a86ceb 100644
--- a/samples/inference/mv_objdetect/CMakeLists.txt
+++ b/samples/inference/mv_objdetect/CMakeLists.txt
@@ -82,6 +82,6 @@ if (USE_POSTPROC)
   add_subdirectory (mv_extras)
   set(EXTRA_LIBS ${EXTRA_LIBS} mv_extras)
 endif (USE_POSTPROC)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -msse4.1 -mf16c")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -msse4.2 -mf16c")
 target_compile_definitions (mvobjdetect PRIVATE ENABLE_MVDEPLOY=1)
 target_link_libraries(mvobjdetect openvx vx_nn vx_amd_media pthread mv_deploy ${EXTRA_LIBS} ${CMAKE_DL_LIBS})
diff --git a/tests/openvx_node_tests/runvxTestAllScript.sh b/tests/openvx_node_tests/runvxTestAllScript.sh
index 625b3ae39e..987c38a97a 100755
--- a/tests/openvx_node_tests/runvxTestAllScript.sh
+++ b/tests/openvx_node_tests/runvxTestAllScript.sh
@@ -534,16 +534,16 @@ if [ "$BACKEND_TYPE" = "HOST" ]; then
         cd build_host
         cmake ..
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     elif [ "$OVERRIDE" = "1" ]; then
         cd ../../build_host
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     else
         RUNVX_PATH="$PRIMARY_RUNVX_PATH/"
-        export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib"
     fi
     echo "$LD_LIBRARY_PATH"
 
@@ -587,16 +587,16 @@ if [ "$BACKEND_TYPE" = "OCL" ] || [ "$BACKEND_TYPE" = "OCLvsHIP" ]; then
         cd build_ocl
         cmake ..
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     elif [ "$OVERRIDE" = "1" ]; then
         cd ../../build_ocl
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     else
         RUNVX_PATH="$PRIMARY_RUNVX_PATH/"
-        export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib"
     fi
     echo "$LD_LIBRARY_PATH"
 
@@ -640,20 +640,20 @@ if [ "$BACKEND_TYPE" = "HIP" ] || [ "$BACKEND_TYPE" = "OCLvsHIP" ]; then
         cd build_hip
         cmake -DBACKEND=HIP ..
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     elif [ "$OVERRIDE" = "1" ]; then
         cd ../../build_hip
         sudo make -j20 install
-        export LD_LIBRARY_PATH="/opt/rocm/lib:/opt/rocm/rpp/lib"
+        export LD_LIBRARY_PATH="/opt/rocm/lib"
         cd ../tests/openvx_node_tests
     else
         if [ "$BACKEND_TYPE" = "HIP" ]; then
             RUNVX_PATH="$PRIMARY_RUNVX_PATH/"
-            export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib:/opt/rocm/rpp/lib"
+            export LD_LIBRARY_PATH="$PRIMARY_RUNVX_PATH/../lib"
         else
             RUNVX_PATH="$SECONDARY_RUNVX_PATH/"
-            export LD_LIBRARY_PATH="$SECONDARY_RUNVX_PATH/../lib:/opt/rocm/rpp/lib"
+            export LD_LIBRARY_PATH="$SECONDARY_RUNVX_PATH/../lib"
         fi
     fi
     echo "$LD_LIBRARY_PATH"
diff --git a/tests/smoke_tests/RALI/RALI-UNITTEST-CPU.sh b/tests/smoke_tests/RALI/RALI-UNITTEST-CPU.sh
index c7c9870f8a..b1854c5375 100644
--- a/tests/smoke_tests/RALI/RALI-UNITTEST-CPU.sh
+++ b/tests/smoke_tests/RALI/RALI-UNITTEST-CPU.sh
@@ -1,4 +1,4 @@
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 rm -rf RALI-CPU-RESULTS
 mkdir RALI-CPU-RESULTS
 
diff --git a/tests/smoke_tests/RALI/RALI-UNITTEST-GPU.sh b/tests/smoke_tests/RALI/RALI-UNITTEST-GPU.sh
index ef798490bd..0d19d5c84f 100644
--- a/tests/smoke_tests/RALI/RALI-UNITTEST-GPU.sh
+++ b/tests/smoke_tests/RALI/RALI-UNITTEST-GPU.sh
@@ -1,4 +1,4 @@
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 rm -rf RALI-GPU-RESULTS
 mkdir RALI-GPU-RESULTS
 
diff --git a/tests/smoke_tests/rocAL/rocAL-unittest-CPU.sh b/tests/smoke_tests/rocAL/rocAL-unittest-CPU.sh
index 4a7ef5f8b4..f088e304c8 100644
--- a/tests/smoke_tests/rocAL/rocAL-unittest-CPU.sh
+++ b/tests/smoke_tests/rocAL/rocAL-unittest-CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 rm -rf rocAL-CPU-RESULTS
 mkdir rocAL-CPU-RESULTS
 
diff --git a/tests/smoke_tests/rocAL/rocAL-unittest-GPU.sh b/tests/smoke_tests/rocAL/rocAL-unittest-GPU.sh
index 5014bd4e80..ae3dd92ac6 100644
--- a/tests/smoke_tests/rocAL/rocAL-unittest-GPU.sh
+++ b/tests/smoke_tests/rocAL/rocAL-unittest-GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib:/opt/rocm/rpp/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
 rm -rf rocAL-GPU-RESULTS
 mkdir rocAL-GPU-RESULTS
 
diff --git a/utilities/mv_deploy/CMakeLists.txt b/utilities/mv_deploy/CMakeLists.txt
index 5884f8af64..8a00e1a0d6 100644
--- a/utilities/mv_deploy/CMakeLists.txt
+++ b/utilities/mv_deploy/CMakeLists.txt
@@ -32,6 +32,6 @@ add_executable(mv_compile mv_compile.cpp)
 # install MIVisionX executables -- {ROCM_PATH}/bin
 install (TARGETS mv_compile DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -mf16c -std=gnu++14")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 target_link_libraries(mv_compile ${CMAKE_DL_LIBS})
 
diff --git a/utilities/rocAL/rocAL_dataloader/README.md b/utilities/rocAL/rocAL_dataloader/README.md
index 2796dcb54c..f9743a93f7 100644
--- a/utilities/rocAL/rocAL_dataloader/README.md
+++ b/utilities/rocAL/rocAL_dataloader/README.md
@@ -13,7 +13,6 @@ This application demonstrates a basic usage of rocAL's C API to load RAW images
 ### build
   ````
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib
   mkdir build
   cd build
   cmake ../
diff --git a/utilities/rocAL/rocAL_dataloader_mt/README.md b/utilities/rocAL/rocAL_dataloader_mt/README.md
index ef398674ef..aab2fa6b96 100644
--- a/utilities/rocAL/rocAL_dataloader_mt/README.md
+++ b/utilities/rocAL/rocAL_dataloader_mt/README.md
@@ -13,7 +13,6 @@ This application demonstrates a basic usage of rocAL's C API to use sharded data
 ### build
   ````
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib
   mkdir build
   cd build
   cmake ../
diff --git a/utilities/rocAL/rocAL_dataloader_tf/README.md b/utilities/rocAL/rocAL_dataloader_tf/README.md
index 48f3c65f52..355d7c02f1 100644
--- a/utilities/rocAL/rocAL_dataloader_tf/README.md
+++ b/utilities/rocAL/rocAL_dataloader_tf/README.md
@@ -13,7 +13,6 @@ This application demonstrates a basic usage of rocAL's C API to load TfRecords f
 ### build
   ````
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/lib
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/rocm/rpp/lib
   mkdir build
   cd build
   cmake ../