Merged in the master cerad2 branch.