Updated for ISCC/ISPPCC merge.