Patch-5.4-class-changes