Merge from CANON changes.