Merge for release 2.0 from master.