Merge with recent change by Jason.