Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c' * commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c': Move all the permissions check up for unmount
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c' * commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c': Move all the permissions check up for unmount