Fixed missing permission check
Merge branch '2.0'