Updated in line with changes in Common.