Merge "Add a default root access mode." into cm-10.2