Merged in SNOW branch.