Merge "patches: linux.system.single fixed upstream"