Merge branch 'restricted-mode'