Patch-5.2-changes