Fixing uplift for patch 872512 to v1.0.1
Merge pull request #9900 from arcturus/fix_uplift_872512

Fixing uplift for patch 872512 to v1.0.1