Merged with changes for ozone branch.