Merge from EXISCAN branch.