Merge branch 'master' into feature/openvr-update

2025-04-07 04:53:28 +02:00 · 2020-05-09 07:25:40 +12:00 · 2020-05-09 07:25:40 +12:00 · 42036b2746
commit 42036b2746
parent be8d97cbf7 affcc6f918
83 changed files with 1377 additions and 554 deletions
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@ -9,7 +9,8 @@ env:
  BUILD_TYPE: Release
  CI_BUILD: Github
  GIT_COMMIT: ${{ github.sha }}
-  HIFI_VCPKG_BOOTSTRAP: true
+  # VCPKG did not build well on OSX disabling HIFI_VCPKG_BOOTSTRAP, which invokes a download to a working version of vcpkg
+  # HIFI_VCPKG_BOOTSTRAP: true
  RELEASE_TYPE: PR
  RELEASE_NUMBER: ${{ github.event.number }}
  VERSION_CODE: ${{ github.event.number }}
@ -28,8 +29,12 @@ jobs:
  build:
    strategy:
        matrix:
-          os: [windows-latest, macOS-latest]
+          os: [windows-latest, macOS-latest, ubuntu-18.04]
          build_type: [full]
+          include:
+            - os: ubuntu-18.04
+              build_type: full
+              apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
        fail-fast: false
    runs-on: ${{matrix.os}}
    if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
@ -39,10 +44,14 @@ jobs:
      id: buildenv1
      run: |
        echo ::set-env name=GIT_COMMIT_SHORT::`echo $GIT_COMMIT | cut -c1-7`
+        echo ::set-env name=JOB_NAME::"build (${{matrix.os}}, ${{matrix.build_type}})"
+
        # Linux build variables
-        if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
+        if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
          echo ::set-env name=PYTHON_EXEC::python3
-          echo ::set-env name=INSTALLER_EXT::tgz
+          echo ::set-env name=INSTALLER_EXT::*
+          echo ::set-env name=CMAKE_BUILD_EXTRA::"-- -j3"
+          echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE"
        fi
        # Mac build variables
        if [ "${{ matrix.os }}" = "macOS-latest" ]; then
@ -61,11 +70,11 @@ jobs:
      shell: bash
      run: |
        echo "${{ steps.buildenv1.outputs.symbols_archive }}"
-        echo ::set-env name=ARTIFACT_PATTERN::HighFidelity-Beta-*.$INSTALLER_EXT
+        echo ::set-env name=ARTIFACT_PATTERN::ProjectAthena-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT
        # Build type variables
        echo ::set-env name=INSTALLER::HighFidelity-Beta-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT
    - name: Clear Working Directory
-      if: matrix.os[1] == 'windows'
+      if: startsWith(matrix.os, 'windows')
      shell: bash
      working-directory: ${{runner.workspace}}
      run: rm -rf ./*
@ -73,61 +82,83 @@ jobs:
      with: 
        submodules: true
        fetch-depth: 1
+    - name: Install dependencies
+      shell: bash
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        echo "Installing Python Modules:"
+        pip3 install distro || exit 1
+
+        echo "Updating apt repository index"
+        sudo apt update || exit 1
+
+        echo "Installing apt packages"
+        sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
    - name: Create Build Environment
      shell: bash
      run: cmake -E make_directory "${{runner.workspace}}/build"
    - name: Configure CMake
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_EXTRA
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release $CMAKE_EXTRA
    - name: Build Application
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target $APP_NAME
+      run: cmake --build . --config $BUILD_TYPE --target $APP_NAME $CMAKE_BUILD_EXTRA
    - name: Build Domain Server
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target domain-server
+      run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
    - name: Build Assignment Client
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target assignment-client
+      run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
    - name: Build Console
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console
+      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
    - name: Build Installer
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target package
+      run: |
+        echo "Retry code from https://unix.stackexchange.com/a/137639"
+        function fail {
+          echo $1 >&2
+          exit 1
+        }
+
+        function retry {
+          local n=1
+          local max=5
+          local delay=15
+          while true; do
+            "$@" && break || {
+              if [[ $n -lt $max ]]; then
+                ((n++))
+                echo "Command failed. Attempt $n/$max:"
+                sleep $delay;
+              else
+                fail "The command has failed after $n attempts."
+              fi
+            }
+          done
+        }
+        retry cmake --build . --config $BUILD_TYPE --target package $CMAKE_BUILD_EXTRA
+    - name: Output system stats
+      if: ${{ always() }}
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: |
+        echo "Disk usage:"
+        df -h
    - name: Output Installer Logs
      if: failure() && matrix.os == 'windows-latest'
      shell: bash
      working-directory: ${{runner.workspace}}/build
      run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
-
-  build_full_linux:
-    runs-on: ubuntu-latest
-    if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
-    steps:
-    - uses: actions/checkout@v1
-      with: 
-        submodules: true
-        fetch-depth: 1
-    - name: Update apt repository index
-      run: sudo apt update
-    - name: Install apt packages
-      run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
-    - name: Install python modules
-      shell: bash
-      run: pip install boto3 distro PyGithub
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
-    - name: Configure CMake
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TOOLS:BOOLEAN=FALSE
-    - name:
+    - name: Upload Artifact
      shell: bash
      working-directory: ${{runner.workspace}}/build
-      run: cmake --build . -- -j3
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: $PYTHON_EXEC "$GITHUB_WORKSPACE/tools/ci-scripts/upload_to_publish_server.py"
--- a/BUILD.md
+++ b/BUILD.md
@ -73,6 +73,18 @@ Create a build directory in the root of your checkout and then run the CMake bui

 If cmake gives you the same error message repeatedly after the build fails, try removing `CMakeCache.txt`.

+##### Generating a release/debug only vcpkg build
+
+In order to generate a release or debug only vcpkg package, you could use the use the `VCPKG_BUILD_TYPE` define in your cmake generate command. Building a release only vcpkg can drastically decrease the total build time.
+
+For release only vcpkg:
+
+`cmake .. -DVCPKG_BUILD_TYPE=release`
+
+For debug only vcpkg:
+
+`cmake .. -DVCPKG_BUILD_TYPE=debug`
+
 #### Variables

 Any variables that need to be set for CMake to find dependencies can be set as ENV variables in your shell profile, or passed directly to CMake with a `-D` flag appended to the `cmake ..` command.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -67,8 +67,12 @@ if (HIFI_ANDROID)
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
 else()
+    set(VCPKG_BUILD_TYPE_PARAM "")
+    if (VCPKG_BUILD_TYPE)
+      set(VCPKG_BUILD_TYPE_PARAM --vcpkg-build-type ${VCPKG_BUILD_TYPE})
+    endif()
    execute_process(
-        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --release-type ${RELEASE_TYPE} --build-root ${CMAKE_BINARY_DIR}
+        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --release-type ${RELEASE_TYPE} --build-root ${CMAKE_BINARY_DIR} ${VCPKG_BUILD_TYPE_PARAM}
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
    # squelch the Policy CMP0074 warning without requiring an update to cmake 3.12.
--- a/cmake/macros/TargetDraco.cmake
+++ b/cmake/macros/TargetDraco.cmake
@ -1,6 +1,5 @@
 macro(TARGET_DRACO)
    set(LIBS draco dracodec dracoenc)
-    find_library(LIBPATH ${LIB} PATHS )
    if (ANDROID)
        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/draco)
        set(DRACO_INCLUDE_DIRS "${INSTALL_DIR}/include" CACHE STRING INTERNAL)
@ -12,6 +11,8 @@ macro(TARGET_DRACO)
    else()
        set(LIB_SEARCH_PATH_RELEASE ${VCPKG_INSTALL_ROOT}/lib/)
        set(LIB_SEARCH_PATH_DEBUG ${VCPKG_INSTALL_ROOT}/debug/lib/)
+        set(DRACO_LIBRARY_RELEASE "")
+        set(DRACO_LIBRARY_DEBUG "")
        foreach(LIB ${LIBS}) 
            find_library(${LIB}_LIBPATH ${LIB} PATHS ${LIB_SEARCH_PATH_RELEASE} NO_DEFAULT_PATH)
            list(APPEND DRACO_LIBRARY_RELEASE ${${LIB}_LIBPATH})
--- a/cmake/macros/TargetOpenEXR.cmake
+++ b/cmake/macros/TargetOpenEXR.cmake
@ -28,6 +28,8 @@ macro(TARGET_OPENEXR)
            string(REGEX MATCHALL "[0-9]" OPENEXR_MINOR_VERSION ${TMP})
        endif()

+        set(OPENEXR_LIBRARY_RELEASE "")
+        set(OPENEXR_LIBRARY_DEBUG "")
        foreach(OPENEXR_LIB
            IlmImf
            IlmImfUtil
--- a/cmake/ports/glad/portfile.cmake
+++ b/cmake/ports/glad/portfile.cmake
@ -1,17 +1,19 @@
 include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 if (ANDROID)
    vcpkg_download_distfile(
        SOURCE_ARCHIVE
-        URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad32es.zip
+        URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/glad/glad32es.zip
        SHA512 2e02ac633eed8f2ba2adbf96ea85d08998f48dd2e9ec9a88ec3c25f48eaf1405371d258066327c783772fcb3793bdb82bd7375fdabb2ba5e2ce0835468b17f65
    )
 else()
    # else Linux desktop
    vcpkg_download_distfile(
        SOURCE_ARCHIVE
-        URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad45.zip
+        URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/glad/glad45.zip
        SHA512 653a7b873f9fbc52e0ab95006cc3143bc7b6f62c6e032bc994e87669273468f37978525c9af5efe36f924cb4acd221eb664ad9af0ce4bf711b4f1be724c0065e
        FILENAME glad45.zip
    )
@ -33,4 +35,3 @@ vcpkg_install_cmake()

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glad)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
--- a/cmake/ports/hifi-deps/CONTROL
+++ b/cmake/ports/hifi-deps/CONTROL
@ -1,4 +1,4 @@
 Source: hifi-deps
-Version: 0.1.4-github-actions
+Version: 0.1.5-github-actions
 Description: Collected dependencies for High Fidelity applications
 Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android), zlib
--- a/cmake/ports/polyvox/portfile.cmake
+++ b/cmake/ports/polyvox/portfile.cmake
@ -1,9 +1,11 @@
 include(vcpkg_common_functions)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 # else Linux desktop
 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/polyvox-master-2015-7-15.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/polyvox-master-2015-7-15.zip
    SHA512 cc04cd43ae74b9c7bb065953540c0048053fcba6b52dc4218b3d9431fba178d65ad4f6c53cc1122ba61d0ab4061e99a7ebbb15db80011d607c5070ebebf8eddc
    FILENAME polyvox.zip
 )
@ -23,33 +25,45 @@ vcpkg_install_cmake()

 file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/polyvox RENAME copyright)
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
+endif()
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
 if(WIN32)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/lib/Release/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxCore.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore/lib/Debug/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxCore.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxUtil.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxUtil.lib)
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/lib/Release/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxCore.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxUtil.lib)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore/lib/Debug/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxCore.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxUtil.lib)
+    endif()
    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/include/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore)
    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/include/PolyVoxUtil ${CURRENT_PACKAGES_DIR}/include/PolyVoxUtil)
    file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/PolyVoxConfig.cmake ${CURRENT_PACKAGES_DIR}/share/polyvox/polyvoxConfig.cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/PolyVoxCore)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/PolyVoxUtil)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil)
 else()
-    file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/Release/*)
-    foreach(_lib ${LIBS})
-        file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/lib/Release ${_lib})
-        file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/lib/${_libName})
-    endforeach()
-    file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/*)
-    foreach(_lib ${LIBS})
-        file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/debug/lib/Debug ${_lib})
-        file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/debug/lib/${_libName})
-    endforeach()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/Release/*)
+        foreach(_lib ${LIBS})
+            file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/lib/Release ${_lib})
+            file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/lib/${_libName})
+        endforeach()
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/*)
+        foreach(_lib ${LIBS})
+            file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/debug/lib/Debug ${_lib})
+            file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/debug/lib/${_libName})
+        endforeach()
+    endif()
    file(RENAME ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp)
    file(RENAME ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp)
--- a/cmake/ports/quazip/portfile.cmake
+++ b/cmake/ports/quazip/portfile.cmake
@ -1,10 +1,11 @@
 include(vcpkg_common_functions)

 file(READ "${VCPKG_ROOT_DIR}/_env/QT_CMAKE_PREFIX_PATH.txt" QT_CMAKE_PREFIX_PATH)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)

 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/quazip-0.7.3.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/quazip-0.7.3.zip
    SHA512 b2d812b6346317fd6d8f4f1344ad48b721d697c429acc8b7e7cb776ce5cba15a59efd64b2c5ae1f31b5a3c928014f084aa1379fd55d8a452a6cf4fd510b3afcc
    FILENAME quazip.zip
 )
@ -24,10 +25,14 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 if (WIN32)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll)
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll)
+    endif()
 elseif(DEFINED VCPKG_TARGET_IS_LINUX)
    # We only want static libs.
    file(GLOB QUAZIP5_DYNAMIC_LIBS ${CURRENT_PACKAGES_DIR}/lib/libquazip5.so* ${CURRENT_PACKAGES_DIR}/debug/lib/libquazip5d.so*)
--- a/cmake/ports/tbb/CONTROL
+++ b/cmake/ports/tbb/CONTROL
@ -1,4 +1,4 @@
 Source: tbb
 Version: 2019_U8-1
-Homepage: https://github.com/01org/tbb
+Homepage: https://github.com/oneapi-src/oneTBB
 Description: Intel's Threading Building Blocks.
--- a/cmake/ports/vhacd/portfile.cmake
+++ b/cmake/ports/vhacd/portfile.cmake
@ -1,10 +1,12 @@
 include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 # else Linux desktop
 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/v-hacd-master.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/v-hacd-master.zip
    SHA512 5d9bd4872ead9eb3574e4806d6c4f490353a04036fd5f571e1e44f47cb66b709e311abcd53af30bae0015a690152170aeed93209a626c28ebcfd6591f3bb036f
    FILENAME vhacd.zip
 )
@ -22,10 +24,17 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/vhacd)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+endif()
+
 if (WIN32)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Release/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/lib/VHACD.lib)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/Release)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/debug/lib/VHACD.lib)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/Debug)
-endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Release/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/lib/VHACD.lib)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/Release)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/debug/lib/VHACD.lib)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/Debug)
+    endif()
+endif()
--- a/cmake/ports/zlib/CONTROL
+++ b/cmake/ports/zlib/CONTROL
@ -1,4 +1,4 @@
 Source: zlib
-Version: 1.2.11-5
+Version: 1.2.11-6
 Homepage: https://www.zlib.net/
 Description: A compression library
--- a/cmake/ports/zlib/cmake_dont_build_more_than_needed.patch
+++ b/cmake/ports/zlib/cmake_dont_build_more_than_needed.patch
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0fe939d..8d2f5f1 100644
+index 0fe939d..a1291d5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ set(VERSION "1.2.11")
@ -10,24 +10,56 @@ index 0fe939d..8d2f5f1 100644
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -211,7 +212,15 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
+@@ -124,9 +125,11 @@ set(ZLIB_SRCS
+ )
+ 
+ if(NOT MINGW)
+-    set(ZLIB_DLL_SRCS
+-        win32/zlib1.rc # If present will override custom build rule below.
+-    )
+    if(BUILD_SHARED_LIBS)
+        set(ZLIB_DLL_SRCS
+            win32/zlib1.rc # If present will override custom build rule below.
+        )
+    endif()
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCC)
+@@ -180,11 +183,12 @@ if(MINGW)
+                             -I ${CMAKE_CURRENT_BINARY_DIR}
+                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+    if(BUILD_SHARED_LIBS)
+        set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+    endif()
+ endif(MINGW)
+ 
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+ 
+@@ -201,7 +205,7 @@ endif()
+ 
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+    if(NOT APPLE)
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+    endif()
+@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
 endif()
 
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
 -    install(TARGETS zlib zlibstatic
-+    if (BUILD_SHARED_LIBS)
-+        set(ZLIB_TARGETS zlib)
-+        set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL ON)
-+    else()
-+        set(ZLIB_TARGETS zlibstatic)
-+        set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL ON)
-+    endif()
-+
-+    install(TARGETS ${ZLIB_TARGETS}
+    install(TARGETS zlib
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-@@ -230,6 +239,7 @@ endif()
+@@ -230,6 +234,7 @@ endif()
 # Example binaries
 #============================================================================
 
@ -35,7 +67,7 @@ index 0fe939d..8d2f5f1 100644
 add_executable(example test/example.c)
 target_link_libraries(example zlib)
 add_test(example example)
-@@ -247,3 +257,4 @@ if(HAVE_OFF64_T)
+@@ -247,3 +252,4 @@ if(HAVE_OFF64_T)
     target_link_libraries(minigzip64 zlib)
     set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
 endif()
--- a/hifi_qt.py
+++ b/hifi_qt.py
@ -29,7 +29,7 @@ endif()
        self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
        self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.12.3')

-        self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')
+        self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')

        defaultBasePath = os.path.expanduser('~/hifi/qt')
        self.basePath = os.getenv('HIFI_QT_BASE', defaultBasePath)
@ -74,10 +74,10 @@ endif()
                    self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.6-ubuntu-19.10.tar.xz'
                elif u_major > 18 and ( u_major != 19 and u_minor != 4):
                    print("We don't support " + distro.name(pretty=True) + " yet. Perhaps consider helping us out?")
-                    raise Exception('UNSUPPORTED LINUX VERSION!!!')
+                    raise Exception('LINUX DISTRO IS NOT SUPPORTED YET!!!')
                else:
                    print("Sorry, " + distro.name(pretty=True) + " is old and won't be officially supported. Please consider upgrading.");
-                    raise Exception('UNSUPPORTED LINUX VERSION!!!')
+                    raise Exception('UNKNOWN LINUX DISTRO VERSION!!!')
            else:
                print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
                print("It's also possible to build Qt for your distribution, please see the documentation at:")
@ -89,10 +89,6 @@ endif()
            print("Machine     : " + platform.machine())
            raise Exception('UNKNOWN OPERATING SYSTEM!!!')

-    def readVar(self, var):
-        with open(os.path.join(self.args.build_root, '_env', var + ".txt")) as fp:
-            return fp.read()
-
    def writeConfig(self):
        print("Writing cmake config to {}".format(self.configFilePath))
        # Write out the configuration for use by CMake
--- a/hifi_utils.py
+++ b/hifi_utils.py
@ -121,3 +121,7 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
        with tarfile.open(tempFileName, 'r:*') as tgz:
            tgz.extractall(destPath)
    os.remove(tempFileName)
+
+def readEnviromentVariableFromFile(buildRootDir, var):
+    with open(os.path.join(buildRootDir, '_env', var + ".txt")) as fp:
+        return fp.read()
--- a/hifi_vcpkg.py
+++ b/hifi_vcpkg.py
@ -21,6 +21,7 @@ get_filename_component(CMAKE_TOOLCHAIN_FILE "{}" ABSOLUTE CACHE)
 get_filename_component(CMAKE_TOOLCHAIN_FILE_UNCACHED "{}" ABSOLUTE)
 set(VCPKG_INSTALL_ROOT "{}")
 set(VCPKG_TOOLS_DIR "{}")
+set(VCPKG_TARGET_TRIPLET "{}")
 """

    CMAKE_TEMPLATE_NON_ANDROID = """
@ -34,7 +35,11 @@ endif()
        self.args = args
        # our custom ports, relative to the script location
        self.sourcePortsPath = args.ports_path
-        self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8]
+        self.vcpkgBuildType = args.vcpkg_build_type
+        if (self.vcpkgBuildType):
+            self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8] + "-" + self.vcpkgBuildType
+        else:
+            self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8]
        self.configFilePath = os.path.join(args.build_root, 'vcpkg.cmake')
        self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')

@ -78,27 +83,31 @@ endif()
        self.bootstrapEnv = os.environ.copy()
        self.buildEnv = os.environ.copy()
        self.prebuiltArchive = None
-        usePrebuilt = ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean)
+        usePrebuilt = False
+        # usePrebuild Disabled, to re-enabled using the prebuilt archives for GitHub action builds uncomment the following line:
+        # usePrebuilt = ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean)

        if 'Windows' == system:
            self.exe = os.path.join(self.path, 'vcpkg.exe')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.bat') ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.bat'), '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-win32-client.zip%3FversionId=tSFzbw01VkkVFeRQ6YuAY4dro2HxJR9U'
            self.vcpkgHash = 'a650db47a63ccdc9904b68ddd16af74772e7e78170b513ea8de5a3b47d032751a3b73dcc7526d88bcb500753ea3dd9880639ca842bb176e2bddb1710f9a58cd3'
            self.hostTriplet = 'x64-windows'
            if usePrebuilt:
-               self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-win32.zip%3FversionId=3SF3mDC8dkQH1JP041m88xnYmWNzZflx"
+                self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-win32.zip%3FversionId=3SF3mDC8dkQH1JP041m88xnYmWNzZflx"
        elif 'Darwin' == system:
            self.exe = os.path.join(self.path, 'vcpkg')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '--allowAppleClang' ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '--allowAppleClang', '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-osx-client.tgz%3FversionId=j0b4azo_zTlH_Q9DElEWOz1UMYZ2nqQw'
            self.vcpkgHash = '519d666d02ef22b87c793f016ca412e70f92e1d55953c8f9bd4ee40f6d9f78c1df01a6ee293907718f3bbf24075cc35492fb216326dfc50712a95858e9cbcb4d'
            self.hostTriplet = 'x64-osx'
+            # Potential fix for a vcpkg build issue on OSX (see https://github.com/microsoft/vcpkg/issues/9029)
+            self.bootstrapEnv['CXXFLAGS'] = '-D_CTERMID_H_'
            if usePrebuilt:
                self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-osx.tgz%3FversionId=6JrIMTdvpBF3MAsjA92BMkO79Psjzs6Z"
        else:
            self.exe = os.path.join(self.path, 'vcpkg')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh') ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-linux-client.tgz%3FversionId=y7mct0gFicEXz5hJy3KROBugcLR56YWf'
            self.vcpkgHash = '6a1ce47ef6621e699a4627e8821ad32528c82fce62a6939d35b205da2d299aaa405b5f392df4a9e5343dd6a296516e341105fbb2dd8b48864781d129d7fba10d'
            self.hostTriplet = 'x64-linux'
@ -206,6 +215,19 @@ endif()
        print(actualCommands)
        hifi_utils.executeSubprocess(actualCommands, folder=self.path, env=self.buildEnv)

+    def copyTripletForBuildType(self, triplet):
+        print('Copying triplet ' + triplet + ' to have build type ' + self.vcpkgBuildType)
+        tripletPath = os.path.join(self.path, 'triplets', triplet + '.cmake')
+        tripletForBuildTypePath = os.path.join(self.path, 'triplets', self.getTripletWithBuildType(triplet) + '.cmake')
+        shutil.copy(tripletPath, tripletForBuildTypePath)
+        with open(tripletForBuildTypePath, "a") as tripletForBuildTypeFile:
+            tripletForBuildTypeFile.write("set(VCPKG_BUILD_TYPE " + self.vcpkgBuildType + ")\n")
+
+    def getTripletWithBuildType(self, triplet):
+        if (not self.vcpkgBuildType):
+            return triplet
+        return triplet + '-' + self.vcpkgBuildType
+
    def setupDependencies(self, qt=None):
        if self.prebuiltArchive:
            if not os.path.isfile(self.prebuildTagFile):
@ -224,12 +246,16 @@ endif()
            self.setupAndroidDependencies()

        print("Installing host tools")
-        self.run(['install', '--triplet', self.hostTriplet, 'hifi-host-tools'])
+        if (self.vcpkgBuildType):
+            self.copyTripletForBuildType(self.hostTriplet)
+        self.run(['install', '--triplet', self.getTripletWithBuildType(self.hostTriplet), 'hifi-host-tools'])

        # If not android, install the hifi-client-deps libraries
        if not self.args.android:
            print("Installing build dependencies")
-            self.run(['install', '--triplet', self.triplet, 'hifi-client-deps'])
+            if (self.vcpkgBuildType):
+                self.copyTripletForBuildType(self.triplet)
+            self.run(['install', '--triplet', self.getTripletWithBuildType(self.triplet), 'hifi-client-deps'])

    def cleanBuilds(self):
        if self.noClean:
@ -240,6 +266,12 @@ endif()
            print("Wiping build trees")
            shutil.rmtree(builddir, ignore_errors=True)

+    # Removes large files used to build the vcpkg, for CI purposes.
+    def cleanupDevelopmentFiles(self):
+        shutil.rmtree(os.path.join(self.path, "downloads"), ignore_errors=True)
+        shutil.rmtree(os.path.join(self.path, "packages"), ignore_errors=True)
+
+
    def setupAndroidDependencies(self):
        # vcpkg prebuilt
        if not os.path.isdir(os.path.join(self.path, 'installed', 'arm64-android')):
@ -276,12 +308,32 @@ endif()
        with open(self.prebuildTagFile, 'w') as f:
            f.write(self.tagContents)

+    def fixupCmakeScript(self):
+        cmakeScript = os.path.join(self.path, 'scripts/buildsystems/vcpkg.cmake')
+        newCmakeScript = cmakeScript + '.new'
+        isFileChanged = False
+        removalPrefix = "set(VCPKG_TARGET_TRIPLET "
+        # Open original file in read only mode and dummy file in write mode
+        with open(cmakeScript, 'r') as read_obj, open(newCmakeScript, 'w') as write_obj:
+            # Line by line copy data from original file to dummy file
+            for line in read_obj:
+                if not line.startswith(removalPrefix):
+                    write_obj.write(line)
+                else:
+                    isFileChanged = True
+     
+        if isFileChanged:
+            shutil.move(newCmakeScript, cmakeScript)
+        else:
+            os.remove(newCmakeScript)
+ 
+
    def writeConfig(self):
        print("Writing cmake config to {}".format(self.configFilePath))
        # Write out the configuration for use by CMake
        cmakeScript = os.path.join(self.path, 'scripts/buildsystems/vcpkg.cmake')
-        installPath = os.path.join(self.path, 'installed', self.triplet)
-        toolsPath = os.path.join(self.path, 'installed', self.hostTriplet, 'tools')
+        installPath = os.path.join(self.path, 'installed', self.getTripletWithBuildType(self.triplet))
+        toolsPath = os.path.join(self.path, 'installed', self.getTripletWithBuildType(self.hostTriplet), 'tools')

        cmakeTemplate = VcpkgRepo.CMAKE_TEMPLATE
        if self.args.android:
@ -289,7 +341,7 @@ endif()
            cmakeTemplate += 'set(HIFI_ANDROID_PRECOMPILED "{}")\n'.format(precompiled)
        else:
            cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID
-        cmakeConfig = cmakeTemplate.format(cmakeScript, cmakeScript, installPath, toolsPath).replace('\\', '/')
+        cmakeConfig = cmakeTemplate.format(cmakeScript, cmakeScript, installPath, toolsPath, self.getTripletWithBuildType(self.hostTriplet)).replace('\\', '/')
        with open(self.configFilePath, 'w') as f:
            f.write(cmakeConfig)

--- a/interface/src/graphics/WorldBox.h
+++ b/interface/src/graphics/WorldBox.h
@ -19,8 +19,6 @@
 #include <GeometryCache.h>
 #include "Menu.h"

-
-
 class WorldBoxRenderData {
 public:
    typedef render::Payload<WorldBoxRenderData> Payload;
@ -29,8 +27,6 @@ public:
    int _val = 0;
    static render::ItemID _item; // unique WorldBoxRenderData

-
-
    static void renderWorldBox(RenderArgs* args, gpu::Batch& batch);
 };

--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@ -325,7 +325,7 @@ public slots:
     * @param {number} [aspectRatio=0] - The width/height ratio of the snapshot required. If the value is <code>0</code>, the
     *     full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
     *     dimensions is adjusted in order to match the aspect ratio.
-     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "hifi-snap-by-&lt;user 
+     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user 
     *     name&gt;-on-YYYY-MM-DD_HH-MM-SS".
     *     <p>Still images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>, 
     *     <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of 
@ -364,7 +364,7 @@ public slots:
     * @function Window.takeSecondaryCameraSnapshot
     * @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
     *     signal.
-     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "hifi-snap-by-&lt;user
+     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user
     *     name&gt;-on-YYYY-MM-DD_HH-MM-SS".
     *     <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
     *     <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
@ -383,7 +383,7 @@ public slots:
     *     otherwise it is saved as an equirectangular image.
     * @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
     *     signal.
-     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "hifi-snap-by-&lt;user
+     * @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user
     *     name&gt;-on-YYYY-MM-DD_HH-MM-SS".
     *     <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
     *     <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@ -42,9 +42,9 @@
 #include "Snapshot.h"
 #include "SnapshotUploader.h"

-// filename format: hifi-snap-by-%username%-on-%date%_%time%_@-%location%.jpg
+// filename format: vircadia-snap-by-%username%-on-%date%_%time%_@-%location%.jpg
 // %1 <= username, %2 <= date and time, %3 <= current location
-const QString FILENAME_PATH_FORMAT = "hifi-snap-by-%1-on-%2.jpg";
+const QString FILENAME_PATH_FORMAT = "vircadia-snap-by-%1-on-%2.jpg";
 const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss";
 const QString SNAPSHOTS_DIRECTORY = "Snapshots";
 const QString URL = "highfidelity_url";
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@ -129,7 +129,7 @@ std::shared_ptr<T> make_renderer(const EntityItemPointer& entity) {
    return std::shared_ptr<T>(new T(entity), [](T* ptr) { ptr->deleteLater(); });
 }

-EntityRenderer::EntityRenderer(const EntityItemPointer& entity) : _created(entity->getCreated()), _entity(entity) {}
+EntityRenderer::EntityRenderer(const EntityItemPointer& entity) : _created(entity->getCreated()), _entity(entity), _entityID(entity->getID()) {}

 EntityRenderer::~EntityRenderer() {}

@ -197,6 +197,23 @@ uint32_t EntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) const {
    return 0;
 }

+bool EntityRenderer::passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const {
+    auto renderWithZones = resultWithReadLock<QVector<QUuid>>([&] {
+        return _renderWithZones;
+    });
+    if (!renderWithZones.isEmpty()) {
+        if (!containingZones.empty()) {
+            for (auto renderWithZone : renderWithZones) {
+                if (containingZones.find(renderWithZone) != containingZones.end()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    return true;
+}
+
 void EntityRenderer::render(RenderArgs* args) {
    if (!isValidRenderItem()) {
        return;
@ -386,6 +403,10 @@ bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity
        return true;
    }

+    if (entity->needsZoneOcclusionUpdate()) {
+        return true;
+    }
+
    return false;
 }

@ -427,6 +448,10 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa
        _canCastShadow = entity->getCanCastShadow();
        setCullWithParent(entity->getCullWithParent());
        _cauterized = entity->getCauterized();
+        if (entity->needsZoneOcclusionUpdate()) {
+            entity->resetNeedsZoneOcclusionUpdate();
+            setRenderWithZones(entity->getRenderWithZones());
+        }
        entity->setNeedsRenderUpdate(false);
    });
 }
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@ -65,6 +65,7 @@ public:

    virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) const override;
    virtual Item::Bound getBound() override;
+    bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const override;

 protected:
    virtual bool needsRenderUpdateFromEntity() const final { return needsRenderUpdateFromEntity(_entity); }
@ -109,6 +110,7 @@ protected:
    virtual void setRenderLayer(RenderLayer value) { _renderLayer = value; }
    virtual void setPrimitiveMode(PrimitiveMode value) { _primitiveMode = value; }
    virtual void setCullWithParent(bool value) { _cullWithParent = value; }
+    virtual void setRenderWithZones(const QVector<QUuid>& renderWithZones) { _renderWithZones = renderWithZones; }

    template <typename F, typename T>
    T withReadLockResult(const std::function<T()>& f) {
@ -143,6 +145,7 @@ protected:
    bool _cullWithParent { false };
    RenderLayer _renderLayer { RenderLayer::WORLD };
    PrimitiveMode _primitiveMode { PrimitiveMode::SOLID };
+    QVector<QUuid> _renderWithZones;
    bool _cauterized { false };
    bool _moving { false };
    // Only touched on the rendering thread
@ -153,6 +156,7 @@ protected:
    std::mutex _materialsLock;

    quint64 _created;
+    QUuid _entityID;

    // The base class relies on comparing the model transform to the entity transform in order 
    // to trigger an update, so the member must not be visible to derived classes as a modifiable
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@ -1264,6 +1264,9 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
            setKey(didVisualGeometryRequestSucceed);
            _model->setTagMask(getTagMask());
            _model->setHifiRenderLayer(getHifiRenderLayer());
+            _model->setPrimitiveMode(_primitiveMode);
+            _model->setCullWithParent(_cullWithParent);
+            _model->setRenderWithZones(_renderWithZones);
            emit requestRenderUpdate();
            if(didVisualGeometryRequestSucceed) {
                emit DependencyManager::get<scriptable::ModelProviderFactory>()->
@ -1447,6 +1450,13 @@ void ModelEntityRenderer::setCullWithParent(bool value) {
    }
 }

+void ModelEntityRenderer::setRenderWithZones(const QVector<QUuid>& renderWithZones) {
+    Parent::setRenderWithZones(renderWithZones);
+    if (_model) {
+        _model->setRenderWithZones(renderWithZones);
+    }
+}
+
 // NOTE: this only renders the "meta" portion of the Model, namely it renders debugging items
 void ModelEntityRenderer::doRender(RenderArgs* args) {
    DETAILED_PROFILE_RANGE(render_detail, "MetaModelRender");
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@ -165,6 +165,7 @@ protected:
    void setRenderLayer(RenderLayer value) override;
    void setPrimitiveMode(PrimitiveMode value) override;
    void setCullWithParent(bool value) override;
+    void setRenderWithZones(const QVector<QUuid>& renderWithZones) override;

 private:
    void animate(const TypedEntityPointer& entity);
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@ -289,6 +289,17 @@ ShapeKey entities::TextPayload::getShapeKey() const {
    return ShapeKey::Builder::invalid();
 }

+bool entities::TextPayload::passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const {
+    auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>();
+    if (entityTreeRenderer) {
+        auto renderable = entityTreeRenderer->renderableForEntityId(_entityID);
+        if (renderable) {
+            return std::static_pointer_cast<TextEntityRenderer>(renderable)->passesZoneOcclusionTest(containingZones);
+        }
+    }
+    return false;
+}
+
 void entities::TextPayload::render(RenderArgs* args) {
    PerformanceTimer perfTimer("TextPayload::render");
    Q_ASSERT(args->_batch);
@ -388,4 +399,12 @@ template <> const ShapeKey shapeGetShapeKey(const TextPayload::Pointer& payload)
 template <> void payloadRender(const TextPayload::Pointer& payload, RenderArgs* args) {
    return payload->render(args);
 }
+
+template <> bool payloadPassesZoneOcclusionTest(const entities::TextPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones) {
+    if (payload) {
+        return payload->passesZoneOcclusionTest(containingZones);
+    }
+    return false;
+}
+
 }
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.h
@ -94,6 +94,7 @@ public:
    Item::Bound getBound() const;
    ShapeKey getShapeKey() const;
    void render(RenderArgs* args);
+    bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const;

 protected:
    QUuid _entityID;
@ -109,6 +110,7 @@ namespace render {
    template <> const Item::Bound payloadGetBound(const entities::TextPayload::Pointer& payload);
    template <> const ShapeKey shapeGetShapeKey(const entities::TextPayload::Pointer& payload);
    template <> void payloadRender(const entities::TextPayload::Pointer& payload, RenderArgs* args);
+    template <> bool payloadPassesZoneOcclusionTest(const entities::TextPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones);
 }

 #endif // hifi_RenderableTextEntityItem_h
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@ -71,6 +71,11 @@ void ZoneEntityRenderer::onRemoveFromSceneTyped(const TypedEntityPointer& entity
 }

 void ZoneEntityRenderer::doRender(RenderArgs* args) {
+    // This is necessary so that zones can themselves be zone culled
+    if (!passesZoneOcclusionTest(CullTest::_prevContainingZones)) {
+        return;
+    }
+
    if (!_stage) {
        _stage = args->_scene->getStage<LightStage>();
        assert(_stage);
@ -180,6 +185,8 @@ void ZoneEntityRenderer::doRender(RenderArgs* args) {
            _bloomStage->_currentFrame.pushBloom(_bloomIndex);
        }
    }
+
+    CullTest::_containingZones.insert(_entityID);
 }

 void ZoneEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@ -106,6 +106,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
    requestedProperties += PROP_RENDER_LAYER;
    requestedProperties += PROP_PRIMITIVE_MODE;
    requestedProperties += PROP_IGNORE_PICK_INTERSECTION;
+    requestedProperties += PROP_RENDER_WITH_ZONES;
    requestedProperties += _grabProperties.getEntityProperties(params);

    // Physics
@ -301,6 +302,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
        APPEND_ENTITY_PROPERTY(PROP_RENDER_LAYER, (uint32_t)getRenderLayer());
        APPEND_ENTITY_PROPERTY(PROP_PRIMITIVE_MODE, (uint32_t)getPrimitiveMode());
        APPEND_ENTITY_PROPERTY(PROP_IGNORE_PICK_INTERSECTION, getIgnorePickIntersection());
+        APPEND_ENTITY_PROPERTY(PROP_RENDER_WITH_ZONES, getRenderWithZones());
        withReadLock([&] {
            _grabProperties.appendSubclassData(packetData, params, entityTreeElementExtraEncodeData, requestedProperties,
                propertyFlags, propertiesDidntFit, propertyCount, appendState);
@ -876,6 +878,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
    READ_ENTITY_PROPERTY(PROP_RENDER_LAYER, RenderLayer, setRenderLayer);
    READ_ENTITY_PROPERTY(PROP_PRIMITIVE_MODE, PrimitiveMode, setPrimitiveMode);
    READ_ENTITY_PROPERTY(PROP_IGNORE_PICK_INTERSECTION, bool, setIgnorePickIntersection);
+    READ_ENTITY_PROPERTY(PROP_RENDER_WITH_ZONES, QVector<QUuid>, setRenderWithZones);
    withWriteLock([&] {
        int bytesFromGrab = _grabProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
            propertyFlags, overwriteLocalData,
@ -1355,6 +1358,7 @@ EntityItemProperties EntityItem::getProperties(const EntityPropertyFlags& desire
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(renderLayer, getRenderLayer);
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(primitiveMode, getPrimitiveMode);
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(ignorePickIntersection, getIgnorePickIntersection);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(renderWithZones, getRenderWithZones);
    withReadLock([&] {
        _grabProperties.getProperties(properties);
    });
@ -1504,6 +1508,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(renderLayer, setRenderLayer);
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(primitiveMode, setPrimitiveMode);
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(ignorePickIntersection, setIgnorePickIntersection);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(renderWithZones, setRenderWithZones);
    withWriteLock([&] {
        bool grabPropertiesChanged = _grabProperties.setProperties(properties);
        somethingChanged |= grabPropertiesChanged;
@ -3564,3 +3569,18 @@ void EntityItem::disableGrab(GrabPointer grab) {
        }
    }
 }
+
+void EntityItem::setRenderWithZones(const QVector<QUuid>& renderWithZones) {
+    withWriteLock([&] {
+        if (_renderWithZones != renderWithZones) {
+            _needsZoneOcclusionUpdate = true;
+            _renderWithZones = renderWithZones;
+        }
+    });
+}
+
+QVector<QUuid> EntityItem::getRenderWithZones() const {
+    return resultWithReadLock<QVector<QUuid>>([&] {
+        return _renderWithZones;
+    });
+}
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@ -582,6 +582,11 @@ public:
    bool needsRenderUpdate() const { return resultWithReadLock<bool>([&] { return _needsRenderUpdate; }); }
    void setNeedsRenderUpdate(bool needsRenderUpdate) { withWriteLock([&] { _needsRenderUpdate = needsRenderUpdate; }); }

+    void setRenderWithZones(const QVector<QUuid>& renderWithZones);
+    QVector<QUuid> getRenderWithZones() const;
+    bool needsZoneOcclusionUpdate() const { return _needsZoneOcclusionUpdate; }
+    void resetNeedsZoneOcclusionUpdate() { withWriteLock([&] { _needsZoneOcclusionUpdate = false; }); }
+
 signals:
    void spaceUpdate(std::pair<int32_t, glm::vec4> data);

@ -770,6 +775,9 @@ protected:

    QHash<QUuid, EntityDynamicPointer> _grabActions;

+    QVector<QUuid> _renderWithZones;
+    mutable bool _needsZoneOcclusionUpdate { false };
+
    bool _cullWithParent { false };

    mutable bool _needsRenderUpdate { false };
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@ -431,6 +431,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
    CHECK_PROPERTY_CHANGE(PROP_RENDER_LAYER, renderLayer);
    CHECK_PROPERTY_CHANGE(PROP_PRIMITIVE_MODE, primitiveMode);
    CHECK_PROPERTY_CHANGE(PROP_IGNORE_PICK_INTERSECTION, ignorePickIntersection);
+    CHECK_PROPERTY_CHANGE(PROP_RENDER_WITH_ZONES, renderWithZones);
    changedProperties += _grab.getChangedProperties();

    // Physics
@ -804,6 +805,10 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
 *     avatar entities, <code>false</code> if they won't be.
 * @property {Uuid} cloneOriginID - The ID of the entity that this entity was cloned from.
 *
+ * @property {Uuid[]} renderWithZones=[]] - A list of entity IDs representing with which zones this entity should render.
+ *     If it is empty, this entity will render normally.  Otherwise, this entity will only render if your avatar is within
+ *     one of the zones in this list.
+ *
 * @property {Entities.Grab} grab - The entity's grab-related properties.
 *
 * @property {string} itemName="" - Certifiable name of the Marketplace item.
@ -1596,6 +1601,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
    COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_RENDER_LAYER, renderLayer, getRenderLayerAsString());
    COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_PRIMITIVE_MODE, primitiveMode, getPrimitiveModeAsString());
    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_IGNORE_PICK_INTERSECTION, ignorePickIntersection);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_RENDER_WITH_ZONES, renderWithZones);
    _grab.copyToScriptValue(_desiredProperties, properties, engine, skipDefaults, defaultEntityProperties);

    // Physics
@ -2014,6 +2020,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(renderLayer, RenderLayer);
    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(primitiveMode, PrimitiveMode);
    COPY_PROPERTY_FROM_QSCRIPTVALUE(ignorePickIntersection, bool, setIgnorePickIntersection);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(renderWithZones, qVectorQUuid, setRenderWithZones);
    _grab.copyFromScriptValue(object, _defaultSettings);

    // Physics
@ -2308,6 +2315,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
    COPY_PROPERTY_IF_CHANGED(renderLayer);
    COPY_PROPERTY_IF_CHANGED(primitiveMode);
    COPY_PROPERTY_IF_CHANGED(ignorePickIntersection);
+    COPY_PROPERTY_IF_CHANGED(renderWithZones);
    _grab.merge(other._grab);

    // Physics
@ -2601,6 +2609,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
        ADD_PROPERTY_TO_MAP(PROP_RENDER_LAYER, RenderLayer, renderLayer, RenderLayer);
        ADD_PROPERTY_TO_MAP(PROP_PRIMITIVE_MODE, PrimitiveMode, primitiveMode, PrimitiveMode);
        ADD_PROPERTY_TO_MAP(PROP_IGNORE_PICK_INTERSECTION, IgnorePickIntersection, ignorePickIntersection, bool);
+        ADD_PROPERTY_TO_MAP(PROP_RENDER_WITH_ZONES, RenderWithZones, renderWithZones, QVector<QUuid>);
        { // Grab
            ADD_GROUP_PROPERTY_TO_MAP(PROP_GRAB_GRABBABLE, Grab, grab, Grabbable, grabbable);
            ADD_GROUP_PROPERTY_TO_MAP(PROP_GRAB_KINEMATIC, Grab, grab, GrabKinematic, grabKinematic);
@ -3090,6 +3099,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
            APPEND_ENTITY_PROPERTY(PROP_RENDER_LAYER, (uint32_t)properties.getRenderLayer());
            APPEND_ENTITY_PROPERTY(PROP_PRIMITIVE_MODE, (uint32_t)properties.getPrimitiveMode());
            APPEND_ENTITY_PROPERTY(PROP_IGNORE_PICK_INTERSECTION, properties.getIgnorePickIntersection());
+            APPEND_ENTITY_PROPERTY(PROP_RENDER_WITH_ZONES, properties.getRenderWithZones());
            _staticGrab.setProperties(properties);
            _staticGrab.appendToEditPacket(packetData, requestedProperties, propertyFlags,
                                           propertiesDidntFit, propertyCount, appendState);
@ -3580,6 +3590,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_RENDER_LAYER, RenderLayer, setRenderLayer);
    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_PRIMITIVE_MODE, PrimitiveMode, setPrimitiveMode);
    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_IGNORE_PICK_INTERSECTION, bool, setIgnorePickIntersection);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_RENDER_WITH_ZONES, QVector<QUuid>, setRenderWithZones);
    properties.getGrab().decodeFromEditPacket(propertyFlags, dataAt, processedBytes);

    // Physics
@ -3998,6 +4009,7 @@ void EntityItemProperties::markAllChanged() {
    _renderLayerChanged = true;
    _primitiveModeChanged = true;
    _ignorePickIntersectionChanged = true;
+    _renderWithZonesChanged = true;
    _grab.markAllChanged();

    // Physics
@ -4401,6 +4413,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
    if (ignorePickIntersectionChanged()) {
        out += "ignorePickIntersection";
    }
+    if (renderWithZonesChanged()) {
+        out += "renderWithZones";
+    }
    getGrab().listChangedProperties(out);

    // Physics
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@ -195,6 +195,7 @@ public:
    DEFINE_PROPERTY_REF_ENUM(PROP_RENDER_LAYER, RenderLayer, renderLayer, RenderLayer, RenderLayer::WORLD);
    DEFINE_PROPERTY_REF_ENUM(PROP_PRIMITIVE_MODE, PrimitiveMode, primitiveMode, PrimitiveMode, PrimitiveMode::SOLID);
    DEFINE_PROPERTY(PROP_IGNORE_PICK_INTERSECTION, IgnorePickIntersection, ignorePickIntersection, bool, false);
+    DEFINE_PROPERTY_REF(PROP_RENDER_WITH_ZONES, RenderWithZones, renderWithZones, QVector<QUuid>, QVector<QUuid>());
    DEFINE_PROPERTY_GROUP(Grab, grab, GrabPropertyGroup);

    // Physics
--- a/libraries/entities/src/EntityItemPropertiesMacros.h
+++ b/libraries/entities/src/EntityItemPropertiesMacros.h
@ -119,6 +119,7 @@ inline QScriptValue qVectorVec3Color_convertScriptValue(QScriptEngine* e, const
 inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<glm::quat>& v) {return qVectorQuatToScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<bool>& v) {return qVectorBoolToScriptValue(e, v); }
 inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<float>& v) { return qVectorFloatToScriptValue(e, v); }
+inline QScriptValue convertScriptValue(QScriptEngine* e, const QVector<QUuid>& v) { return qVectorQUuidToScriptValue(e, v); }

 inline QScriptValue convertScriptValue(QScriptEngine* e, const QRect& v) { return qRectToScriptValue(e, v); }

@ -216,6 +217,7 @@ typedef QVector<glm::vec3> qVectorVec3;
 typedef QVector<glm::quat> qVectorQuat;
 typedef QVector<bool> qVectorBool;
 typedef QVector<float> qVectorFloat;
+typedef QVector<QUuid> qVectorQUuid;
 inline float float_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toFloat(&isValid); }
 inline quint64 quint64_convertFromScriptValue(const QScriptValue& v, bool& isValid) { return v.toVariant().toULongLong(&isValid); }
 inline quint32 quint32_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
@ -293,6 +295,11 @@ inline qVectorBool qVectorBool_convertFromScriptValue(const QScriptValue& v, boo
    return qVectorBoolFromScriptValue(v);
 }

+inline qVectorQUuid qVectorQUuid_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
+    isValid = true;
+    return qVectorQUuidFromScriptValue(v);
+}
+
 inline glm::quat quat_convertFromScriptValue(const QScriptValue& v, bool& isValid) {
    isValid = false; /// assume it can't be converted
    QScriptValue x = v.property("x");
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@ -43,6 +43,7 @@ enum EntityPropertyList {
    PROP_RENDER_LAYER,
    PROP_PRIMITIVE_MODE,
    PROP_IGNORE_PICK_INTERSECTION,
+    PROP_RENDER_WITH_ZONES,
    // Grab
    PROP_GRAB_GRABBABLE,
    PROP_GRAB_KINEMATIC,
--- a/libraries/graphics/src/graphics/BufferViewHelpers.cpp
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.cpp
@ -120,50 +120,6 @@ template<> glm::uint32 forEach<glm::vec3>(const gpu::BufferView& view, std::func
    return forEachGlmVec<glm::vec3>(view, func);
 }

-template <typename T>
-QVariant glmVecToVariant(const T& v, bool asArray /*= false*/) {
-    static const auto len = T().length();
-    if (asArray) {
-        QVariantList list;
-        for (int i = 0; i < len ; i++) {
-            list << v[i];
-        }
-        return list;
-    } else {
-        QVariantMap obj;
-        for (int i = 0; i < len ; i++) {
-            obj[XYZW[i]] = v[i];
-        }
-        return obj;
-    }
-}
-
-template <typename T>
-const T glmVecFromVariant(const QVariant& v) {
-    auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
-    static const auto len = T().length();
-    const auto& components = isMap ? XYZW : ZERO123;
-    T result;
-    QVariantMap map;
-    QVariantList list;
-    if (isMap) map = v.toMap(); else list = v.toList();
-    for (int i = 0; i < len ; i++) {
-        float value;
-        if (isMap) {
-            value = map.value(components[i]).toFloat();
-        } else {
-            value = list.value(i).toFloat();
-        }
-#ifdef DEBUG_BUFFERVIEW_HELPERS
-        if (value != value) { // NAN
-            qWarning().nospace()<< "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
-        }
-#endif
-        result[i] = value;
-    }
-    return result;
-}
-
 // QVector<T> => BufferView
 template <typename T>
 gpu::BufferView newFromVector(const QVector<T>& elements, const gpu::Element& elementType) {
--- a/libraries/graphics/src/graphics/BufferViewHelpers.h
+++ b/libraries/graphics/src/graphics/BufferViewHelpers.h
@ -27,8 +27,54 @@ namespace buffer_helpers {
    extern const std::array<const char*, 4> XYZW;
    extern const std::array<const char*, 4> ZERO123;

-    template <typename T> QVariant glmVecToVariant(const T& v, bool asArray = false);
-    template <typename T> const T glmVecFromVariant(const QVariant& v);
+    template <typename T>
+    QVariant glmVecToVariant(const T& v, bool asArray = false) {
+        static const auto len = T().length();
+        if (asArray) {
+            QVariantList list;
+            for (int i = 0; i < len; i++) {
+                list << v[i];
+            }
+            return list;
+        } else {
+            QVariantMap obj;
+            for (int i = 0; i < len; i++) {
+                obj[XYZW[i]] = v[i];
+            }
+            return obj;
+        }
+    }
+
+    template <typename T>
+    const T glmVecFromVariant(const QVariant& v) {
+        auto isMap = v.type() == (QVariant::Type)QMetaType::QVariantMap;
+        static const auto len = T().length();
+        const auto& components = isMap ? XYZW : ZERO123;
+        T result;
+        QVariantMap map;
+        QVariantList list;
+        if (isMap) {
+            map = v.toMap();
+        } else {
+            list = v.toList();
+        }
+        for (int i = 0; i < len; i++) {
+            float value;
+            if (isMap) {
+                value = map.value(components[i]).toFloat();
+            } else {
+                value = list.value(i).toFloat();
+            }
+#ifdef DEBUG_BUFFERVIEW_HELPERS
+            if (value != value) { // NAN
+                qWarning().nospace() << "vec" << len << "." << components[i] << " NAN received from script.... " << v.toString();
+            }
+#endif
+            result[i] = value;
+        }
+        return result;
+    }
+

    glm::uint32 forEachVariant(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const QVariant& value)> func, const char* hint = "");
    template <typename T> glm::uint32 forEach(const gpu::BufferView& view, std::function<bool(glm::uint32 index, const T& value)> func);
@ -36,7 +82,7 @@ namespace buffer_helpers {
    template <typename T> gpu::BufferView newFromVector(const QVector<T>& elements, const gpu::Element& elementType);
    template <typename T> gpu::BufferView newFromVariantList(const QVariantList& list, const gpu::Element& elementType);

-    template <typename T> QVector<T> variantToVector(const QVariant& list);
+    template <typename T> QVector<T> variantToVector(const QVariant& value);
    template <typename T> QVector<T> bufferToVector(const gpu::BufferView& view, const char *hint = "");

    // note: these do value conversions from the underlying buffer type into the template type
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@ -212,10 +212,11 @@ using PacketType = PacketTypeEnum::Value;

 const int NUM_BYTES_MD5_HASH = 16;

-typedef char PacketVersion;
+// NOTE: There is a max limit of 255, hopefully we have a better way to manage this by then.
+typedef uint8_t PacketVersion;

 PacketVersion versionForPacketType(PacketType packetType);
-QByteArray protocolVersionsSignature(); /// returns a unqiue signature for all the current protocols
+QByteArray protocolVersionsSignature(); /// returns a unique signature for all the current protocols
 QString protocolVersionsSignatureBase64();

 #if (PR_BUILD || DEV_BUILD)
@ -226,7 +227,7 @@ uint qHash(const PacketType& key, uint seed);
 QDebug operator<<(QDebug debug, const PacketType& type);

 // Due to the different legacy behaviour, we need special processing for domains that were created before
-// the zone inheritance modes were added.  These have version numbers up to 80
+// the zone inheritance modes were added. These have version numbers up to 80.
 enum class EntityVersion : PacketVersion {
    StrokeColorProperty = 0,
    HasDynamicOwnershipTests,
@ -278,6 +279,7 @@ enum class EntityVersion : PacketVersion {
    TextEntityFonts,
    ScriptServerKinematicMotion,
    ScreenshareZone,
+    ZoneOcclusion,

    // Add new versions above here
    NUM_PACKET_TYPE,
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@ -482,6 +482,19 @@ bool OctreePacketData::appendValue(const QVector<bool>& value) {
    return success;
 }

+bool OctreePacketData::appendValue(const QVector<QUuid>& value) {
+    uint16_t qVecSize = value.size();
+    bool success = appendValue(qVecSize);
+    if (success) {
+        success = append((const unsigned char*)value.constData(), qVecSize * sizeof(QUuid));
+        if (success) {
+            _bytesOfValues += qVecSize * sizeof(QUuid);
+            _totalBytesOfValues += qVecSize * sizeof(QUuid);
+        }
+    }
+    return success;
+}
+
 bool OctreePacketData::appendValue(const glm::quat& value) {
    const size_t VALUES_PER_QUAT = 4;
    const size_t PACKED_QUAT_SIZE = sizeof(uint16_t) * VALUES_PER_QUAT;
@ -774,6 +787,15 @@ int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QVecto
    return (dataBytes - start) + (int)sizeof(uint16_t);
 }

+int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QVector<QUuid>& result) {
+    uint16_t length;
+    memcpy(&length, dataBytes, sizeof(uint16_t));
+    dataBytes += sizeof(length);
+    result.resize(length);
+    memcpy(result.data(), dataBytes, length * sizeof(QUuid));
+    return sizeof(uint16_t) + length * sizeof(QUuid);
+}
+
 int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QByteArray& result) {
    uint16_t length;
    memcpy(&length, dataBytes, sizeof(length));
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@ -186,6 +186,9 @@ public:
    /// appends a QVector of bools to the end of the stream, may fail if new data stream is too long to fit in packet
    bool appendValue(const QVector<bool>& value);

+    /// appends a QVector of QUuids to the end of the stream, may fail if new data stream is too long to fit in packet
+    bool appendValue(const QVector<QUuid>& value);
+
    /// appends a packed quat to the end of the stream, may fail if new data stream is too long to fit in packet
    bool appendValue(const glm::quat& value);

@ -284,6 +287,7 @@ public:
    static int unpackDataFromBytes(const unsigned char* dataBytes, QVector<glm::quat>& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, QVector<float>& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, QVector<bool>& result);
+    static int unpackDataFromBytes(const unsigned char* dataBytes, QVector<QUuid>& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, QByteArray& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, AACube& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, QRect& result);
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@ -55,6 +55,13 @@ template <> const ShapeKey shapeGetShapeKey(const MeshPartPayload::Pointer& payl
 template <> void payloadRender(const MeshPartPayload::Pointer& payload, RenderArgs* args) {
    return payload->render(args);
 }
+
+template <> bool payloadPassesZoneOcclusionTest(const MeshPartPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones) {
+    if (payload) {
+        return payload->passesZoneOcclusionTest(containingZones);
+    }
+    return false;
+}
 }

 MeshPartPayload::MeshPartPayload(const std::shared_ptr<const graphics::Mesh>& mesh, int partIndex, graphics::MaterialPointer material, const uint64_t& created) :
@ -171,10 +178,23 @@ void MeshPartPayload::bindMesh(gpu::Batch& batch) {
    batch.setInputStream(0, _drawMesh->getVertexStream());
 }

- void MeshPartPayload::bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const {
+void MeshPartPayload::bindTransform(gpu::Batch& batch, RenderArgs::RenderMode renderMode) const {
    batch.setModelTransform(_worldFromLocalTransform);
 }

+bool MeshPartPayload::passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const {
+    if (!_renderWithZones.isEmpty()) {
+        if (!containingZones.empty()) {
+            for (auto renderWithZone : _renderWithZones) {
+                if (containingZones.find(renderWithZone) != containingZones.end()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    return true;
+}

 void MeshPartPayload::render(RenderArgs* args) {
    PerformanceTimer perfTimer("MeshPartPayload::render");
@ -246,6 +266,12 @@ template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, Ren
    return payload->render(args);
 }

+template <> bool payloadPassesZoneOcclusionTest(const ModelMeshPartPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones) {
+    if (payload) {
+        return payload->passesZoneOcclusionTest(containingZones);
+    }
+    return false;
+}
 }

 ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, int partIndex, int shapeIndex,
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@ -74,11 +74,15 @@ public:

    void setCullWithParent(bool value) { _cullWithParent = value; }

+    void setRenderWithZones(const QVector<QUuid>& renderWithZones) { _renderWithZones = renderWithZones; }
+    bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const;
+
    static bool enableMaterialProceduralShaders;

 protected:
    render::ItemKey _itemKey{ render::ItemKey::Builder::opaqueShape().build() };
    bool _cullWithParent { false };
+    QVector<QUuid> _renderWithZones;
    uint64_t _created;
 };

@ -87,6 +91,7 @@ namespace render {
    template <> const Item::Bound payloadGetBound(const MeshPartPayload::Pointer& payload);
    template <> const ShapeKey shapeGetShapeKey(const MeshPartPayload::Pointer& payload);
    template <> void payloadRender(const MeshPartPayload::Pointer& payload, RenderArgs* args);
+    template <> bool payloadPassesZoneOcclusionTest(const MeshPartPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones);
 }

 class ModelMeshPartPayload : public MeshPartPayload {
@ -147,6 +152,7 @@ namespace render {
    template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointer& payload);
    template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload);
    template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, RenderArgs* args);
+    template <> bool payloadPassesZoneOcclusionTest(const ModelMeshPartPayload::Pointer& payload, const std::unordered_set<QUuid>& containingZones);
 }

 #endif // hifi_MeshPartPayload_h
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@ -893,7 +893,7 @@ void Model::updateRenderItemsKey(const render::ScenePointer& scene) {
    }
    auto renderItemsKey = _renderItemKeyGlobalFlags;
    render::Transaction transaction;
-    for(auto itemID: _modelMeshRenderItemIDs) {
+    for (auto itemID: _modelMeshRenderItemIDs) {
        transaction.updateItem<ModelMeshPartPayload>(itemID, [renderItemsKey](ModelMeshPartPayload& data) {
            data.updateKey(renderItemsKey);
        });
@ -979,7 +979,7 @@ void Model::setCullWithParent(bool cullWithParent) {

        render::Transaction transaction;
        auto renderItemsKey = _renderItemKeyGlobalFlags;
-        for(auto item : _modelMeshRenderItemIDs) {
+        for (auto item : _modelMeshRenderItemIDs) {
            transaction.updateItem<ModelMeshPartPayload>(item, [cullWithParent, renderItemsKey](ModelMeshPartPayload& data) {
                data.setCullWithParent(cullWithParent);
                data.updateKey(renderItemsKey);
@ -989,6 +989,16 @@ void Model::setCullWithParent(bool cullWithParent) {
    }
 }

+void Model::setRenderWithZones(const QVector<QUuid>& renderWithZones) {
+    render::Transaction transaction;
+    for (auto item : _modelMeshRenderItemIDs) {
+        transaction.updateItem<ModelMeshPartPayload>(item, [renderWithZones](ModelMeshPartPayload& data) {
+            data.setRenderWithZones(renderWithZones);
+        });
+    }
+    AbstractViewStateInterface::instance()->getMain3DScene()->enqueueTransaction(transaction);
+}
+
 const render::ItemKey Model::getRenderItemKeyGlobalFlags() const {
    return _renderItemKeyGlobalFlags;
 }
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@ -131,6 +131,8 @@ public:

    void setCullWithParent(bool value);

+    void setRenderWithZones(const QVector<QUuid>& renderWithZones);
+
    // Access the current RenderItemKey Global Flags used by the model and applied to the render items  representing the parts of the model.
    const render::ItemKey getRenderItemKeyGlobalFlags() const;

--- a/libraries/render/src/render/Args.h
+++ b/libraries/render/src/render/Args.h
@ -13,15 +13,16 @@
 #include <functional>
 #include <memory>
 #include <stack>
+#include <unordered_set>

 #include <GLMHelpers.h>
 #include <ViewFrustum.h>
 #include <StencilMaskMode.h>
+#include <UUIDHasher.h>

 #include <gpu/Forward.h>
 #include "Forward.h"

-
 class AABox;

 namespace render {
@ -142,13 +143,6 @@ namespace render {
        bool _takingSnapshot { false };
        StencilMaskMode _stencilMaskMode { StencilMaskMode::NONE };
        std::function<void(gpu::Batch&)> _stencilMaskOperator;
-
-        float _visionSqueezeX { 0.0f };
-        float _visionSqueezeY { 0.0f };
-        float _visionSqueezeTransition { 0.15f };
-        int _visionSqueezePerEye { 0 };
-        float _visionSqueezeGroundPlaneY { 0.0f };
-        float _visionSqueezeSpotlightSize { 0.02f };
    };

 }
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@ -19,6 +19,9 @@

 using namespace render;

+std::unordered_set<QUuid> CullTest::_containingZones = std::unordered_set<QUuid>();
+std::unordered_set<QUuid> CullTest::_prevContainingZones = std::unordered_set<QUuid>();
+
 CullTest::CullTest(CullFunctor& functor, RenderArgs* pargs, RenderDetails::Item& renderDetails, ViewFrustumPointer antiFrustum) :
    _functor(functor),
    _args(pargs),
@ -64,46 +67,8 @@ bool CullTest::solidAngleTest(const AABox& bound) {
    return true;
 }

-void render::cullItems(const RenderContextPointer& renderContext, const CullFunctor& cullFunctor, RenderDetails::Item& details,
-                       const ItemBounds& inItems, ItemBounds& outItems) {
-    assert(renderContext->args);
-    assert(renderContext->args->hasViewFrustum());
-
-    RenderArgs* args = renderContext->args;
-    const ViewFrustum& frustum = args->getViewFrustum();
-
-    details._considered += (int)inItems.size();
-
-    // Culling / LOD
-    for (auto item : inItems) {
-        if (item.bound.isNull()) {
-            outItems.emplace_back(item); // One more Item to render
-            continue;
-        }
-
-        // TODO: some entity types (like lights) might want to be rendered even
-        // when they are outside of the view frustum...
-        bool inView;
-        {
-            PerformanceTimer perfTimer("boxIntersectsFrustum");
-            inView = frustum.boxIntersectsFrustum(item.bound);
-        }
-        if (inView) {
-            bool bigEnoughToRender;
-            {
-                PerformanceTimer perfTimer("shouldRender");
-                bigEnoughToRender = cullFunctor(args, item.bound);
-            }
-            if (bigEnoughToRender) {
-                outItems.emplace_back(item); // One more Item to render
-            } else {
-                details._tooSmall++;
-            }
-        } else {
-            details._outOfView++;
-        }
-    }
-    details._rendered += (int)outItems.size();
+bool CullTest::zoneOcclusionTest(const render::Item& item) {
+    return item.passesZoneOcclusionTest(_containingZones);
 }

 void FetchNonspatialItems::run(const RenderContextPointer& renderContext, const ItemFilter& filter, ItemBounds& outItems) {
@ -117,7 +82,7 @@ void FetchNonspatialItems::run(const RenderContextPointer& renderContext, const
    outItems.reserve(items.size());
    for (auto& id : items) {
        auto& item = scene->getItem(id);
-        if (filter.test(item.getKey())) {
+        if (filter.test(item.getKey()) && item.passesZoneOcclusionTest(CullTest::_containingZones)) {
            outItems.emplace_back(ItemBound(id, item.getBound()));
        }
    }
@ -126,7 +91,6 @@ void FetchNonspatialItems::run(const RenderContextPointer& renderContext, const
 void FetchSpatialTree::configure(const Config& config) {
    _justFrozeFrustum = _justFrozeFrustum || (config.freezeFrustum && !_freezeFrustum);
    _freezeFrustum = config.freezeFrustum;
-    _lodAngle = config.lodAngle;
 }

 void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemSpatialTree::ItemSelection& outSelection) {
@ -223,7 +187,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("insideFitItems");
                for (auto id : inSelection.insideItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        outItems.emplace_back(itemBound);
                        if (item.getKey().isMetaCullGroup()) {
@ -238,7 +202,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("insideSmallItems");
                for (auto id : inSelection.insideSubcellItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        outItems.emplace_back(itemBound);
                        if (item.getKey().isMetaCullGroup()) {
@ -253,7 +217,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("partialFitItems");
                for (auto id : inSelection.partialItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        outItems.emplace_back(itemBound);
                        if (item.getKey().isMetaCullGroup()) {
@ -268,7 +232,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("partialSmallItems");
                for (auto id : inSelection.partialSubcellItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        outItems.emplace_back(itemBound);
                        if (item.getKey().isMetaCullGroup()) {
@ -285,7 +249,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("insideFitItems");
                for (auto id : inSelection.insideItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        outItems.emplace_back(itemBound);
                        if (item.getKey().isMetaCullGroup()) {
@ -300,7 +264,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("insideSmallItems");
                for (auto id : inSelection.insideSubcellItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        if (test.solidAngleTest(itemBound.bound)) {
                            outItems.emplace_back(itemBound);
@ -317,7 +281,7 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("partialFitItems");
                for (auto id : inSelection.partialItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
                        if (test.frustumTest(itemBound.bound)) {
                            outItems.emplace_back(itemBound);
@ -334,14 +298,12 @@ void CullSpatialSelection::run(const RenderContextPointer& renderContext,
                PerformanceTimer perfTimer("partialSmallItems");
                for (auto id : inSelection.partialSubcellItems) {
                    auto& item = scene->getItem(id);
-                    if (filter.test(item.getKey())) {
+                    if (filter.test(item.getKey()) && test.zoneOcclusionTest(item)) {
                        ItemBound itemBound(id, item.getBound());
-                        if (test.frustumTest(itemBound.bound)) {
-                            if (test.solidAngleTest(itemBound.bound)) {
-                                outItems.emplace_back(itemBound);
-                                if (item.getKey().isMetaCullGroup()) {
-                                    item.fetchMetaSubItemBounds(outItems, (*scene));
-                                }
+                        if (test.frustumTest(itemBound.bound) && test.solidAngleTest(itemBound.bound)) {
+                            outItems.emplace_back(itemBound);
+                            if (item.getKey().isMetaCullGroup()) {
+                                item.fetchMetaSubItemBounds(outItems, (*scene));
                            }
                        }
                    }
@ -452,3 +414,13 @@ void ApplyCullFunctorOnItemBounds::run(const RenderContextPointer& renderContext
        args->popViewFrustum();
    }
 }
+
+void ClearContainingZones::run(const RenderContextPointer& renderContext) {
+    // This is a bit of a hack.  We want to do zone culling as early as possible, so we do it
+    // during the RenderFetchCullSortTask (in CullSpatialSelection and FetchNonspatialItems),
+    // but the zones aren't collected until after (in SetupZones).  To get around this,
+    // we actually use the zones from the previous frame to render, and then clear at the beginning
+    // of the next frame
+    CullTest::_prevContainingZones = CullTest::_containingZones;
+    CullTest::_containingZones.clear();
+}
--- a/libraries/render/src/render/CullTask.h
+++ b/libraries/render/src/render/CullTask.h
@ -19,9 +19,6 @@ namespace render {

    using CullFunctor = std::function<bool(const RenderArgs*, const AABox&)>;

-    void cullItems(const RenderContextPointer& renderContext, const CullFunctor& cullFunctor, RenderDetails::Item& details,
-        const ItemBounds& inItems, ItemBounds& outItems);
-
    // Culling Frustum / solidAngle test helper class
    struct CullTest {
        CullFunctor _functor;
@ -36,6 +33,10 @@ namespace render {
        bool frustumTest(const AABox& bound);
        bool antiFrustumTest(const AABox& bound);
        bool solidAngleTest(const AABox& bound);
+        bool zoneOcclusionTest(const render::Item& item);
+
+        static std::unordered_set<QUuid> _containingZones;
+        static std::unordered_set<QUuid> _prevContainingZones;
    };

    class FetchNonspatialItems {
@ -48,7 +49,6 @@ namespace render {
        Q_OBJECT
        Q_PROPERTY(int numItems READ getNumItems)
        Q_PROPERTY(bool freezeFrustum MEMBER freezeFrustum WRITE setFreezeFrustum)
-        Q_PROPERTY(float LODAngle MEMBER lodAngle NOTIFY dirty)
    
    public:
        int numItems{ 0 };
@ -56,7 +56,6 @@ namespace render {

        bool freezeFrustum{ false };
    
-        float lodAngle{ 2.0 };
    public slots:
        void setFreezeFrustum(bool enabled) { freezeFrustum = enabled; emit dirty(); }

@ -68,7 +67,6 @@ namespace render {
        bool _freezeFrustum{ false }; // initialized by Config
        bool _justFrozeFrustum{ false };
        ViewFrustum _frozenFrustum;
-        float _lodAngle;

    public:
        using Config = FetchSpatialTreeConfig;
@ -159,6 +157,12 @@ namespace render {

        render::CullFunctor _cullFunctor;
    };
+
+    class ClearContainingZones {
+    public:
+        using JobModel = Job::Model<ClearContainingZones>;
+        void run(const RenderContextPointer& renderContext);
+    };
 }

 #endif // hifi_render_CullTask_h;
--- a/libraries/render/src/render/Item.cpp
+++ b/libraries/render/src/render/Item.cpp
@ -154,4 +154,10 @@ namespace render {
        return payload->metaFetchMetaSubItems(subItems);
    }

+    template <> bool payloadPassesZoneOcclusionTest(const PayloadProxyInterface::Pointer& payload, const std::unordered_set<QUuid>& containingZones) {
+        if (!payload) {
+            return false;
+        }
+        return payload->passesZoneOcclusionTest(containingZones);
+    }
 }
--- a/libraries/render/src/render/Item.h
+++ b/libraries/render/src/render/Item.h
@ -436,6 +436,8 @@ public:

        virtual uint32_t fetchMetaSubItems(ItemIDs& subItems) const = 0;

+        virtual bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const = 0;
+
        ~PayloadInterface() {}

        // Status interface is local to the base class
@ -487,6 +489,8 @@ public:
    uint32_t fetchMetaSubItems(ItemIDs& subItems) const { return _payload->fetchMetaSubItems(subItems); }
    uint32_t fetchMetaSubItemBounds(ItemBounds& subItemBounds, Scene& scene) const;

+    bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const { return _payload->passesZoneOcclusionTest(containingZones); }
+
    // Access the status
    const StatusPointer& getStatus() const { return _payload->getStatus(); }

@ -537,6 +541,10 @@ template <class T> const ShapeKey shapeGetShapeKey(const std::shared_ptr<T>& pay
 // Meta items act as the grouping object for several sub items (typically shapes).
 template <class T> uint32_t metaFetchMetaSubItems(const std::shared_ptr<T>& payloadData, ItemIDs& subItems) { return 0; }

+// Zone Occlusion Interface
+// Allows payloads to determine if they should render or not, based on the zones that contain the current camera
+template <class T> bool payloadPassesZoneOcclusionTest(const std::shared_ptr<T>& payloadData, const std::unordered_set<QUuid>& containingZones) { return true; }
+
 // THe Payload class is the real Payload to be used
 // THis allow anything to be turned into a Payload as long as the required interface functions are available
 // When creating a new kind of payload from a new "stuff" class then you need to create specialized version for "stuff"
@ -561,6 +569,8 @@ public:
    // Meta Type Interface
    virtual uint32_t fetchMetaSubItems(ItemIDs& subItems) const override { return metaFetchMetaSubItems<T>(_data, subItems); }

+    virtual bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const override { return payloadPassesZoneOcclusionTest<T>(_data, containingZones); }
+
 protected:
    DataPointer _data;

@ -615,6 +625,7 @@ public:
    virtual Item::Bound getBound() = 0;
    virtual void render(RenderArgs* args) = 0;
    virtual uint32_t metaFetchMetaSubItems(ItemIDs& subItems) const = 0;
+    virtual bool passesZoneOcclusionTest(const std::unordered_set<QUuid>& containingZones) const = 0;
 };

 template <> const ItemKey payloadGetKey(const PayloadProxyInterface::Pointer& payload);
@ -622,7 +633,7 @@ template <> const Item::Bound payloadGetBound(const PayloadProxyInterface::Point
 template <> void payloadRender(const PayloadProxyInterface::Pointer& payload, RenderArgs* args);
 template <> uint32_t metaFetchMetaSubItems(const PayloadProxyInterface::Pointer& payload, ItemIDs& subItems);
 template <> const ShapeKey shapeGetShapeKey(const PayloadProxyInterface::Pointer& payload);
-
+template <> bool payloadPassesZoneOcclusionTest(const PayloadProxyInterface::Pointer& payload, const std::unordered_set<QUuid>& containingZones);

 typedef Item::PayloadPointer PayloadPointer;
 typedef std::vector<PayloadPointer> Payloads;
--- a/libraries/render/src/render/RenderFetchCullSortTask.cpp
+++ b/libraries/render/src/render/RenderFetchCullSortTask.cpp
@ -74,6 +74,7 @@ void RenderFetchCullSortTask::build(JobModel& task, const Varying& input, Varyin
    const auto filteredLayeredOpaque = task.addJob<FilterLayeredItems>("FilterLayeredOpaque", layeredOpaques, ItemKey::Layer::LAYER_1);
    const auto filteredLayeredTransparent = task.addJob<FilterLayeredItems>("FilterLayeredTransparent", layeredTransparents, ItemKey::Layer::LAYER_1);

+    task.addJob<ClearContainingZones>("ClearContainingZones");

    output = Output(BucketList{ opaques, transparents, lights, metas,
                    filteredLayeredOpaque.getN<FilterLayeredItems::Outputs>(0), filteredLayeredTransparent.getN<FilterLayeredItems::Outputs>(0),
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@ -13,6 +13,13 @@ if (ANDROID)
    target_link_libraries(${TARGET_NAME} android)
 endif()

+if (APPLE)
+    find_library(FRAMEWORK_IOKIT IOKit)
+    find_library(CORE_FOUNDATION CoreFoundation)
+    find_library(OpenGL OpenGL)
+    target_link_libraries(${TARGET_NAME} ${FRAMEWORK_IOKIT} ${CORE_FOUNDATION} ${OpenGL})
+endif()
+
 target_zlib()
 target_nsight()
 target_json()
--- a/libraries/shared/src/RegisteredMetaTypes.cpp
+++ b/libraries/shared/src/RegisteredMetaTypes.cpp
@ -36,6 +36,7 @@ int qVectorVec3MetaTypeId = qRegisterMetaType<QVector<glm::vec3>>();
 int qVectorQuatMetaTypeId = qRegisterMetaType<QVector<glm::quat>>();
 int qVectorBoolMetaTypeId = qRegisterMetaType<QVector<bool>>();
 int qVectorGLMUint32MetaTypeId = qRegisterMetaType<QVector<unsigned int>>("QVector<glm::uint32>");
+int qVectorQUuidMetaTypeId = qRegisterMetaType<QVector<QUuid>>();
 int quatMetaTypeId = qRegisterMetaType<glm::quat>();
 int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
 int collisionMetaTypeId = qRegisterMetaType<Collision>();
@ -58,6 +59,7 @@ void registerMetaTypes(QScriptEngine* engine) {
    qScriptRegisterMetaType(engine, qVectorBoolToScriptValue, qVectorBoolFromScriptValue);
    qScriptRegisterMetaType(engine, qVectorFloatToScriptValue, qVectorFloatFromScriptValue);
    qScriptRegisterMetaType(engine, qVectorIntToScriptValue, qVectorIntFromScriptValue);
+    qScriptRegisterMetaType(engine, qVectorQUuidToScriptValue, qVectorQUuidFromScriptValue);

    qScriptRegisterMetaType(engine, qSizeFToScriptValue, qSizeFFromScriptValue);
    qScriptRegisterMetaType(engine, qRectToScriptValue, qRectFromScriptValue);
@ -874,6 +876,22 @@ QVector<float> qVectorFloatFromScriptValue(const QScriptValue& array) {
    return newVector;
 }

+QScriptValue qVectorQUuidToScriptValue(QScriptEngine* engine, const QVector<QUuid>& vector) {
+    QScriptValue array = engine->newArray();
+    for (int i = 0; i < vector.size(); i++) {
+        array.setProperty(i, quuidToScriptValue(engine, vector.at(i)));
+    }
+    return array;
+}
+
+void qVectorQUuidFromScriptValue(const QScriptValue& array, QVector<QUuid>& vector) {
+    int length = array.property("length").toInteger();
+
+    for (int i = 0; i < length; i++) {
+        vector << array.property(i).toVariant().toUuid();
+    }
+}
+
 QVector<QUuid> qVectorQUuidFromScriptValue(const QScriptValue& array) {
    if (!array.isArray()) {
        return QVector<QUuid>(); 
--- a/libraries/shared/src/RegisteredMetaTypes.h
+++ b/libraries/shared/src/RegisteredMetaTypes.h
@ -247,6 +247,8 @@ QVector<float> qVectorFloatFromScriptValue(const QScriptValue& array);
 QScriptValue qVectorIntToScriptValue(QScriptEngine* engine, const QVector<uint32_t>& vector);
 void qVectorIntFromScriptValue(const QScriptValue& array, QVector<uint32_t>& vector);

+QScriptValue qVectorQUuidToScriptValue(QScriptEngine* engine, const QVector<QUuid>& vector);
+void qVectorQUuidFromScriptValue(const QScriptValue& array, QVector<QUuid>& vector);
 QVector<QUuid> qVectorQUuidFromScriptValue(const QScriptValue& array);

 QScriptValue aaCubeToScriptValue(QScriptEngine* engine, const AACube& aaCube);
--- a/prebuild.py
+++ b/prebuild.py
@ -94,6 +94,8 @@ def parse_args():
    parser.add_argument('--force-build', action='store_true')
    parser.add_argument('--release-type', type=str, default="DEV", help="DEV, PR, or PRODUCTION")
    parser.add_argument('--vcpkg-root', type=str, help='The location of the vcpkg distribution')
+    parser.add_argument('--vcpkg-build-type', type=str, help='Could be `release` or `debug`. By default it doesn`t set the build-type')
+    parser.add_argument('--vcpkg-skip-clean', action='store_true', help='Skip the cleanup of vcpkg downloads and packages folders after vcpkg build completition.')
    parser.add_argument('--build-root', required=True, type=str, help='The location of the cmake build')
    parser.add_argument('--ports-path', type=str, default=defaultPortsPath)
    parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None)
@ -113,6 +115,7 @@ def main():
            del os.environ[var]

    args = parse_args()
+    assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')

    if args.ci_build:
        logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO)
@ -125,7 +128,7 @@ def main():
    if 'Windows' == system and 'CI_BUILD' in os.environ and os.environ["CI_BUILD"] == "Github":
        logger.info("Downloading NSIS")
        with timer('NSIS'):
-            hifi_utils.downloadAndExtract('https://athena-public.s3.amazonaws.com/dependencies/NSIS-hifi-plugins-1.0.tgz', "C:/Program Files (x86)")
+            hifi_utils.downloadAndExtract(assets_url + '/dependencies/NSIS-hifi-plugins-1.0.tgz', "C:/Program Files (x86)")

    qtInstallPath = ''
    # If not android, install our Qt build
@ -138,6 +141,11 @@ def main():
                qt.writeConfig()

    pm = hifi_vcpkg.VcpkgRepo(args)
+    if qtInstallPath != '':
+        pm.writeVar('QT_CMAKE_PREFIX_PATH', qtInstallPath)
+
+    # Only allow one instance of the program to run at a time
+
    if qtInstallPath != '':
        pm.writeVar('QT_CMAKE_PREFIX_PATH', qtInstallPath)

@ -160,7 +168,7 @@ def main():
            pm.setupDependencies(qt=qtInstallPath)

        # wipe out the build directories (after writing the tag, since failure 
-        # here shouldn't invalidte the vcpkg install)
+        # here shouldn't invalidate the vcpkg install)
        with timer('Cleaning builds'):
            pm.cleanBuilds()

@ -175,6 +183,13 @@ def main():
            qtPath = os.path.join(pm.androidPackagePath, 'qt')
            hifi_android.QtPackager(appPath, qtPath).bundle()

+        # Fixup the vcpkg cmake to not reset VCPKG_TARGET_TRIPLET
+        pm.fixupCmakeScript()
+
+        if not args.vcpkg_skip_clean:
+            # Cleanup downloads and packages folders in vcpkg to make it smaller for CI
+            pm.cleanupDevelopmentFiles()
+
        # Write the vcpkg config to the build directory last
        with timer('Writing configuration'):
            pm.writeConfig()
--- a/scripts/system/create/entityProperties/html/entityProperties.html
+++ b/scripts/system/create/entityProperties/html/entityProperties.html
@ -1,52 +1,63 @@
 <!--
+//
 //  entityProperties.html
 //
 //  Created by Ryan Huffman on 13 Nov 2014
 //  Copyright 2014 High Fidelity, Inc.
+//  Copyright 2020 Project Athena contributors.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
 -->
 <html>
-
-<head>
-    <title>Properties</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <link rel="stylesheet" type="text/css" href="../../../html/css/edit-style.css">
-    <link rel="stylesheet" type="text/css" href="../../../html/css/colpick.css">
-    <link rel="stylesheet" type="text/css" href="../../../html/css/jsoneditor.css">
-    <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
-    <script src="../../../html/js/jquery-2.1.4.min.js"></script>
-    <script type="text/javascript" src="../../../html/js/colpick.js"></script>
-    <script type="text/javascript" src="../../../html/js/jsoneditor.min.js"></script>
-    <script type="text/javascript" src="../../../html/js/eventBridgeLoader.js"></script>
-    <script type="text/javascript" src="../../../html/js/spinButtons.js"></script>
-    <script type="text/javascript" src="../../../html/js/utils.js"></script>
-    <script type="text/javascript" src="../../../html/js/includes.js"></script>
-    <script type="text/javascript" src="js/underscore-min.js"></script>
-    <script type="text/javascript" src="js/createAppTooltip.js"></script>
-    <script type="text/javascript" src="js/draggableNumber.js"></script>
-    <script type="text/javascript" src="js/entityProperties.js"></script>
-    
-</head>
-
-<body onload='loaded();'>
-    <div id="properties-list">
-        <div class='property container'>
-            <label id='placeholder-property-type'></label>
-            <div class='value'>
-                <div class='row flex-center' style='padding-bottom: 8px;'>
-                    <div id="placeholder-property-name" class="stretch"></div>
-                    <div id="placeholder-property-locked" class="shrink"></div>
-                    <div id="placeholder-property-visible" class="shrink"></div>
-                </div>
-                <div class='row'>
-                    <div id="placeholder-property-id" class="stretch"></div>
+    <head>
+        <title>Properties</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+        <link rel="stylesheet" type="text/css" href="../../../html/css/edit-style.css">
+        <link rel="stylesheet" type="text/css" href="../../../html/css/colpick.css">
+        <link rel="stylesheet" type="text/css" href="../../../html/css/jsoneditor.css">
+        <link rel="stylesheet" type="text/css" href="../../../html/css/tabs.css">    
+        <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
+        <script src="../../../html/js/jquery-2.1.4.min.js"></script>
+        <script type="text/javascript" src="../../../html/js/colpick.js"></script>
+        <script type="text/javascript" src="../../../html/js/jsoneditor.min.js"></script>
+        <script type="text/javascript" src="../../../html/js/eventBridgeLoader.js"></script>
+        <script type="text/javascript" src="../../../html/js/spinButtons.js"></script>
+        <script type="text/javascript" src="../../../html/js/utils.js"></script>
+        <script type="text/javascript" src="../../../html/js/includes.js"></script>
+        <script type="text/javascript" src="js/underscore-min.js"></script>
+        <script type="text/javascript" src="js/createAppTooltip.js"></script>
+        <script type="text/javascript" src="js/draggableNumber.js"></script>
+        <script type="text/javascript" src="js/entityProperties.js"></script>    
+    </head>
+    <body onload='loaded();'>
+        <div id="properties-list">
+            <div class='property container'>
+                <label id='placeholder-property-type'></label>
+                <div class='value'>
+                    <div class='row flex-center' style='padding-bottom: 8px;'>
+                        <div id="placeholder-property-name" class="stretch"></div>
+                        <div id="placeholder-property-locked" class="shrink"></div>
+                        <div id="placeholder-property-visible" class="shrink"></div>
+                    </div>
+                    <div class='row'>
+                        <div id="placeholder-property-id" class="stretch"></div>
+                    </div>
                </div>
            </div>
+            <table class="tabsTableFrame">
+                <tr class="tabsTrFrame">
+                    <td class = "tabsFrame">
+                        <div id="tabs" class="tabsContainer"></div>
+                    </td>
+                    <td class="tabsPropertiesFrame">
+                        <div class="tabsPropertiesPage" id="properties-pages">
+                            <!-- each property is added at runtime in entityProperties -->
+                        </div>
+                    </td>
+                </tr>
+            </table>
        </div>
-        <!-- each property is added at runtime in entityProperties -->
-    </div>
-</body>
-
+    </body>
 </html>
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
--- a/scripts/system/create/entityProperties/html/tabs/base.png
+++ b/scripts/system/create/entityProperties/html/tabs/base.png
--- a/scripts/system/create/entityProperties/html/tabs/behavior.png
+++ b/scripts/system/create/entityProperties/html/tabs/behavior.png
--- a/scripts/system/create/entityProperties/html/tabs/collision.png
+++ b/scripts/system/create/entityProperties/html/tabs/collision.png
--- a/scripts/system/create/entityProperties/html/tabs/grid.png
+++ b/scripts/system/create/entityProperties/html/tabs/grid.png
--- a/scripts/system/create/entityProperties/html/tabs/image.png
+++ b/scripts/system/create/entityProperties/html/tabs/image.png
--- a/scripts/system/create/entityProperties/html/tabs/light.png
+++ b/scripts/system/create/entityProperties/html/tabs/light.png
--- a/scripts/system/create/entityProperties/html/tabs/material.png
+++ b/scripts/system/create/entityProperties/html/tabs/material.png
--- a/scripts/system/create/entityProperties/html/tabs/model.png
+++ b/scripts/system/create/entityProperties/html/tabs/model.png
--- a/scripts/system/create/entityProperties/html/tabs/particles.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_alpha.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_alpha.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_behavior.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_behavior.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_color.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_color.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_constraints.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_constraints.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_emit.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_emit.png
--- a/scripts/system/create/entityProperties/html/tabs/particles_size.png
+++ b/scripts/system/create/entityProperties/html/tabs/particles_size.png
--- a/scripts/system/create/entityProperties/html/tabs/physics.png
+++ b/scripts/system/create/entityProperties/html/tabs/physics.png
--- a/scripts/system/create/entityProperties/html/tabs/scripts.png
+++ b/scripts/system/create/entityProperties/html/tabs/scripts.png
--- a/scripts/system/create/entityProperties/html/tabs/shape.png
+++ b/scripts/system/create/entityProperties/html/tabs/shape.png
--- a/scripts/system/create/entityProperties/html/tabs/spatial.png
+++ b/scripts/system/create/entityProperties/html/tabs/spatial.png
--- a/scripts/system/create/entityProperties/html/tabs/text.png
+++ b/scripts/system/create/entityProperties/html/tabs/text.png
--- a/scripts/system/create/entityProperties/html/tabs/web.png
+++ b/scripts/system/create/entityProperties/html/tabs/web.png
--- a/scripts/system/create/entityProperties/html/tabs/zone.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_ambient_light.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_ambient_light.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_avatar_priority.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_avatar_priority.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_bloom.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_bloom.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_haze.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_haze.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_key_light.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_key_light.png
--- a/scripts/system/create/entityProperties/html/tabs/zone_skybox.png
+++ b/scripts/system/create/entityProperties/html/tabs/zone_skybox.png
--- a/scripts/system/html/css/tabs.css
+++ b/scripts/system/html/css/tabs.css
@ -0,0 +1,77 @@
+/*
+//  tabs.css
+//
+//  Created by Alezia Kurdis on 27 Feb 2020
+//  Copyright 2020 Project Athena contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+*/
+
+div.tabsContainer {
+    float: left;
+    width: 32px;
+    padding: 0px;
+}
+
+.tabsContainer button {
+    padding: 4px;
+    text-align: center;
+    cursor: pointer;
+    transition: 0.4s;
+    font-size: 14px;
+    background-color: #404040;
+    border-color: #404040;
+    border-width: 1px 0px 1px 1px;
+    border-radius: 5px 0px 0px 5px;
+    outline: none;
+}
+
+.tabsContainer button:hover {
+    background-color: #575757;
+}
+
+.tabsContainer button.active {
+    background-color: #2E2E2E;
+}
+
+div.labelTabHeader {
+    font-size: 20px;
+    font-weight: 700;
+    height: 40px;
+    color: #ffffff;
+}
+
+div.tab-section-header {
+    width: 100%;
+    padding: 5px;
+}
+
+table.tabsTableFrame {
+    width: 100%;
+    min-height: 352px;
+    display: block;
+}
+
+tr.tabsTrFrame {
+    width: 100%;
+}
+
+td.tabsFrame {
+    width: 32px;
+    vertical-align: top;
+    background-color: #575757;
+    padding: 0px;
+    border: 0px;
+}
+
+td.tabsPropertiesFrame {
+    width: 100%;
+    vertical-align: top;
+    border: 0px;
+}
+
+div.tabsPropertiesPage {
+    min-height: 352px;
+    display: block;
+}
--- a/tools/ci-scripts/upload_to_publish_server.py
+++ b/tools/ci-scripts/upload_to_publish_server.py
@ -0,0 +1,77 @@
+import os
+import json
+from hashlib import sha256
+import http.client
+from http import HTTPStatus
+import time
+import struct
+import random
+import glob
+
+FILE_READ_BUFFER = 4096
+
+path = os.path.join(os.getcwd(), os.environ['ARTIFACT_PATTERN'])
+files = glob.glob(path, recursive=False)
+uploading_files = []
+for archive_file in files:
+    file = open(archive_file, 'rb')
+    sha256_hash = sha256()
+    file.seek(0, 0)
+    for byte_block in iter(lambda: file.read(FILE_READ_BUFFER), b""):
+        sha256_hash.update(byte_block)
+
+    checksum = sha256_hash.hexdigest()
+
+    uploading_files.append({
+        "filename": os.path.basename(archive_file),
+        "sha256_checksum": checksum,
+        "file_length": file.tell()
+    })
+    file.close()
+
+print("BuildFileHashes: " + json.dumps(uploading_files))
+
+file_contents = []
+file_sizes = []
+
+for archiveFile in files:
+    file = open(archiveFile, 'rb')
+    file_data = file.read()
+    file_sizes.append(len(file_data))
+    file_contents.append(file_data)
+    file.close()
+
+conn = http.client.HTTPSConnection("build-uploader.vircadia.com")
+
+context = json.loads(os.environ['GITHUB_CONTEXT'])
+
+owner_and_repository = context["repository"].split("/")
+owner = owner_and_repository[0]
+repository = owner_and_repository[1]
+
+headers = {
+    "owner": owner,
+    "repo": repository,
+    "commit_hash": context["event"]["pull_request"]["head"]["sha"],
+    "pull_number": context["event"]["number"],
+    "job_name": os.environ["JOB_NAME"],
+    "run_id": context["run_id"],
+    "file_sizes": ','.join(str(e) for e in file_sizes)
+}
+
+concat_file_body = b''.join(file_contents)
+
+print("Total files size: " + str(len(concat_file_body)))
+
+conn.request("PUT", "/", body=concat_file_body, headers=headers)
+response = conn.getresponse()
+
+EXIT_CODE_OK = 0
+EXIT_CODE_ERROR = 1
+
+if (response.status == HTTPStatus.OK):
+    print("response: ",  json.loads(response.read()))
+    exit(EXIT_CODE_OK)
+else:
+    print(response.status, response.reason, response.read())
+    exit(EXIT_CODE_ERROR)