ad8bda219e
* commit '64d1f3efd759b70462aecb6cf1d8c733872a8911': DO NOT MERGE - Full (local) restore security changes
* commit '64d1f3efd759b70462aecb6cf1d8c733872a8911': DO NOT MERGE - Full (local) restore security changes