Refreshed patches and removed one backported patch Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>