Patch-5.2-class-changes