Fixing uplift for patch 872512 to v1.0.1

This pr adds the files missing during the uplift.