Patch-5.2-warriror-changes