Merging updates to master to 2.0 branch