Merge branch 'lookup-permissions-cleanup'