Updated in line with changes in Common.
Merge remote-tracking branch 'origin/next' into drive_split