Merge updates to PD-classes aside from the versionCode stuff