commited patched upstream files