Integrated Agrabren's Patches into system_core