Merge "Optimize slice permission checks a bit" into pi-dev