Import bug fixes.
permissions
Merge.