Merging class changes to local.