Merge from TNG branch.