Patch System Core

Change-Id: Ibe5c73acfb585c9666e7be128e522cdb2d9f0949