am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev

* commit '3f91e43eb00764cebfdffb42a3ddcb723ae439e0':
  Full (local) restore security changes